diff --git a/extra/cross/install-hangover b/extra/cross/install-hangover index b5e90d9..1c6e0d4 100644 --- a/extra/cross/install-hangover +++ b/extra/cross/install-hangover @@ -22,6 +22,7 @@ echo "最新版本: $latest_version" hangover_url="https://github.com/AndreRH/hangover/releases/download/hangover-${latest_version}/hangover_${latest_version}_debian12_bookworm_arm64.tar" mirror_sites=( + "https://github.akams.cn/" "https://gh.llkk.cc/" "https://github.moeyy.xyz/" "https://mirror.ghproxy.com/" @@ -65,13 +66,6 @@ tar xvf dxvk-v*.tar.gz mv dxvk-v*/x32/* /home/tiny/.wine/drive_c/windows/syswow64 mv dxvk-v*/arm64ec/* /home/tiny/.wine/drive_c/windows/system32 -echo "自动配置 DLL 覆盖..." -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d8 /d native /f >/dev/null 2>&1 -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d9 /d native /f >/dev/null 2>&1 -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d10core /d native /f >/dev/null 2>&1 -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d11 /d native /f >/dev/null 2>&1 -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v dxgi /d native /f >/dev/null 2>&1 - echo "正在修复字体..." regedit "Z:\\home\\tiny\\.local\\share\\tiny\\extra\\chn_fonts.reg" && wine reg delete "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes" /va /f diff --git a/extra/cross/install-hangover-stable b/extra/cross/install-hangover-stable index 2fbdc45..3bf1c70 100644 --- a/extra/cross/install-hangover-stable +++ b/extra/cross/install-hangover-stable @@ -4,10 +4,11 @@ echo "正在更新软件包..." sudo apt update sudo apt upgrade -y -hangover_url="https://github.com/AndreRH/hangover/releases/download/hangover-10.11/hangover_10.11_debian12_bookworm_arm64.tar" -latest_version="10.11" +hangover_url="https://github.com/AndreRH/hangover/releases/download/hangover-10.14/hangover_10.14_debian12_bookworm_arm64.tar" +latest_version="10.14" mirror_sites=( + "https://github.akams.cn/" "https://gh.llkk.cc/" "https://github.moeyy.xyz/" "https://mirror.ghproxy.com/" @@ -51,13 +52,6 @@ tar xvf dxvk-v*.tar.gz mv dxvk-v*/x32/* /home/tiny/.wine/drive_c/windows/syswow64 mv dxvk-v*/arm64ec/* /home/tiny/.wine/drive_c/windows/system32 -echo "自动配置 DLL 覆盖..." -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d8 /d native /f >/dev/null 2>&1 -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d9 /d native /f >/dev/null 2>&1 -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d10core /d native /f >/dev/null 2>&1 -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d11 /d native /f >/dev/null 2>&1 -WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v dxgi /d native /f >/dev/null 2>&1 - echo "正在修复字体..." regedit "Z:\\home\\tiny\\.local\\share\\tiny\\extra\\chn_fonts.reg" && wine reg delete "HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes" /va /f diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index 12b777c..eaf38d2 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -74,7 +74,7 @@ "installHangoverLatest": "Install Hangover Latest (may fail)", "uninstallHangover": "Uninstall Hangover", "clearWineData": "Clear Wine Data", - "wineCommandsHint": "Common Wine commands. Click to launch GUI and wait patiently.\n\nNote: DXVK is enabled by default. If the program crashes, try disabling it.\n\nTypical launch times:\nTiger T7510 6GB: over 1 minute\nSnapdragon 870 12GB: ~10 seconds", + "wineCommandsHint": "Common Wine commands. Click to launch GUI and wait patiently.\n\nTypical launch times:\nTiger T7510 6GB: over 1 minute\nSnapdragon 870 12GB: ~10 seconds", "switchToJapanese": "Switch System to Japanese", "userManual": "User Manual", "openSourceLicenses": "Open Source Licenses", diff --git a/lib/l10n/intl_zh.arb b/lib/l10n/intl_zh.arb index e06e79c..389e2e8 100644 --- a/lib/l10n/intl_zh.arb +++ b/lib/l10n/intl_zh.arb @@ -74,7 +74,7 @@ "installHangoverLatest": "安装Hangover最新版（可能出错）", "uninstallHangover": "卸载Hangover", "clearWineData": "清空Wine数据", - "wineCommandsHint": "Wine的常用指令。点击后前往图形界面耐心等待。\n\n注：DXVK默认为开启状态，如程序崩溃可尝试关闭\n\n任意程序启动参考时间：\n虎贲T7510 6GB 超过一分钟\n骁龙870 12GB 约10秒\n", + "wineCommandsHint": "Wine的常用指令。点击后前往图形界面耐心等待。\n\n任意程序启动参考时间：\n虎贲T7510 6GB 超过一分钟\n骁龙870 12GB 约10秒\n", "switchToJapanese": "切换系统到日语", "userManual": "使用说明", "openSourceLicenses": "开源许可", diff --git a/lib/l10n/intl_zh_Hant.arb b/lib/l10n/intl_zh_Hant.arb index 7c45973..6220f86 100644 --- a/lib/l10n/intl_zh_Hant.arb +++ b/lib/l10n/intl_zh_Hant.arb @@ -74,7 +74,7 @@ "installHangoverLatest": "安裝 Hangover 最新版（可能有錯誤）", "uninstallHangover": "解除安裝 Hangover", "clearWineData": "清除 Wine 資料", - "wineCommandsHint": "Wine 常用指令。點擊後進入圖形介面，請耐心等候。\n\n註：DXVK預設為開啟狀態，如程式崩潰可嘗試關閉\n\n不同裝置啟動程式參考時間：\n虎賁 T7510 6GB 超過一分鐘\n驍龍 870 12GB 約 10 秒\n", + "wineCommandsHint": "Wine 常用指令。點擊後進入圖形介面，請耐心等候。\n\n不同裝置啟動程式參考時間：\n虎賁 T7510 6GB 超過一分鐘\n驍龍 870 12GB 約 10 秒\n", "switchToJapanese": "切換系統為日語", "userManual": "使用說明", "openSourceLicenses": "開源授權", diff --git a/lib/main.dart b/lib/main.dart index 668a3f7..850ec1f 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -557,7 +557,7 @@ sed -i -E "s@^(VNC_RESOLUTION)=.*@\\1=${w}x${h}@" \$(command -v startvnc)"""); Text(AppLocalizations.of(context)!.hangoverDescription), const SizedBox.square(dimension: 8), Wrap(alignment: WrapAlignment.center, spacing: 4.0, runSpacing: 4.0, children: [ - OutlinedButton(style: D.commandButtonStyle, child: Text("${AppLocalizations.of(context)!.installHangoverStable}（10.11）"), onPressed: () async { + OutlinedButton(style: D.commandButtonStyle, child: Text("${AppLocalizations.of(context)!.installHangoverStable}（10.14）"), onPressed: () async { Util.termWrite("bash ~/.local/share/tiny/extra/install-hangover-stable"); G.pageIndex.value = 0; }), diff --git a/lib/workflow.dart b/lib/workflow.dart index 144e943..f6ce114 100644 --- a/lib/workflow.dart +++ b/lib/workflow.dart @@ -538,7 +538,7 @@ ln -sf ../applib/libexec_tar.so \$DATA_DIR/bin/tar ln -sf ../applib/libexec_virgl_test_server.so \$DATA_DIR/bin/virgl_test_server ln -sf ../applib/libexec_getifaddrs_bridge_server.so \$DATA_DIR/bin/getifaddrs_bridge_server ln -sf ../applib/libexec_pulseaudio.so \$DATA_DIR/bin/pulseaudio -ln -sf ../applib/libbusybox.so \$DATA_DIR/lib/libbusybox.so.1.36.1 +ln -sf ../applib/libbusybox.so \$DATA_DIR/lib/libbusybox.so.1.37.0 ln -sf ../applib/libtalloc.so \$DATA_DIR/lib/libtalloc.so.2 ln -sf ../applib/libvirglrenderer.so \$DATA_DIR/lib/libvirglrenderer.so ln -sf ../applib/libepoxy.so \$DATA_DIR/lib/libepoxy.so