Skip to content

Commit 7b219fa

Browse files
committed
Update hangover, disable dxvk by default, update bootstrap package
1 parent ed3ec63 commit 7b219fa

File tree

7 files changed

+9
-21
lines changed

7 files changed

+9
-21
lines changed

extra/cross/install-hangover

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ echo "最新版本: $latest_version"
2222
hangover_url="https://github.com/AndreRH/hangover/releases/download/hangover-${latest_version}/hangover_${latest_version}_debian12_bookworm_arm64.tar"
2323

2424
mirror_sites=(
25+
"https://github.akams.cn/"
2526
"https://gh.llkk.cc/"
2627
"https://github.moeyy.xyz/"
2728
"https://mirror.ghproxy.com/"
@@ -65,13 +66,6 @@ tar xvf dxvk-v*.tar.gz
6566
mv dxvk-v*/x32/* /home/tiny/.wine/drive_c/windows/syswow64
6667
mv dxvk-v*/arm64ec/* /home/tiny/.wine/drive_c/windows/system32
6768

68-
echo "自动配置 DLL 覆盖..."
69-
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
70-
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
71-
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
72-
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
73-
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
74-
7569
echo "正在修复字体..."
7670
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
7771

extra/cross/install-hangover-stable

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ echo "正在更新软件包..."
44
sudo apt update
55
sudo apt upgrade -y
66

7-
hangover_url="https://github.com/AndreRH/hangover/releases/download/hangover-10.11/hangover_10.11_debian12_bookworm_arm64.tar"
8-
latest_version="10.11"
7+
hangover_url="https://github.com/AndreRH/hangover/releases/download/hangover-10.14/hangover_10.14_debian12_bookworm_arm64.tar"
8+
latest_version="10.14"
99

1010
mirror_sites=(
11+
"https://github.akams.cn/"
1112
"https://gh.llkk.cc/"
1213
"https://github.moeyy.xyz/"
1314
"https://mirror.ghproxy.com/"
@@ -51,13 +52,6 @@ tar xvf dxvk-v*.tar.gz
5152
mv dxvk-v*/x32/* /home/tiny/.wine/drive_c/windows/syswow64
5253
mv dxvk-v*/arm64ec/* /home/tiny/.wine/drive_c/windows/system32
5354

54-
echo "自动配置 DLL 覆盖..."
55-
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
56-
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
57-
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
58-
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
59-
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
60-
6155
echo "正在修复字体..."
6256
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
6357

lib/l10n/intl_en.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"installHangoverLatest": "Install Hangover Latest (may fail)",
7575
"uninstallHangover": "Uninstall Hangover",
7676
"clearWineData": "Clear Wine Data",
77-
"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",
77+
"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",
7878
"switchToJapanese": "Switch System to Japanese",
7979
"userManual": "User Manual",
8080
"openSourceLicenses": "Open Source Licenses",

lib/l10n/intl_zh.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"installHangoverLatest": "安装Hangover最新版(可能出错)",
7575
"uninstallHangover": "卸载Hangover",
7676
"clearWineData": "清空Wine数据",
77-
"wineCommandsHint": "Wine的常用指令。点击后前往图形界面耐心等待。\n\n注:DXVK默认为开启状态,如程序崩溃可尝试关闭\n\n任意程序启动参考时间:\n虎贲T7510 6GB 超过一分钟\n骁龙870 12GB 约10秒\n",
77+
"wineCommandsHint": "Wine的常用指令。点击后前往图形界面耐心等待。\n\n任意程序启动参考时间:\n虎贲T7510 6GB 超过一分钟\n骁龙870 12GB 约10秒\n",
7878
"switchToJapanese": "切换系统到日语",
7979
"userManual": "使用说明",
8080
"openSourceLicenses": "开源许可",

lib/l10n/intl_zh_Hant.arb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"installHangoverLatest": "安裝 Hangover 最新版(可能有錯誤)",
7575
"uninstallHangover": "解除安裝 Hangover",
7676
"clearWineData": "清除 Wine 資料",
77-
"wineCommandsHint": "Wine 常用指令。點擊後進入圖形介面,請耐心等候。\n\n註:DXVK預設為開啟狀態,如程式崩潰可嘗試關閉\n\n不同裝置啟動程式參考時間:\n虎賁 T7510 6GB 超過一分鐘\n驍龍 870 12GB 約 10 秒\n",
77+
"wineCommandsHint": "Wine 常用指令。點擊後進入圖形介面,請耐心等候。\n\n不同裝置啟動程式參考時間:\n虎賁 T7510 6GB 超過一分鐘\n驍龍 870 12GB 約 10 秒\n",
7878
"switchToJapanese": "切換系統為日語",
7979
"userManual": "使用說明",
8080
"openSourceLicenses": "開源授權",

lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ sed -i -E "s@^(VNC_RESOLUTION)=.*@\\1=${w}x${h}@" \$(command -v startvnc)""");
557557
Text(AppLocalizations.of(context)!.hangoverDescription),
558558
const SizedBox.square(dimension: 8),
559559
Wrap(alignment: WrapAlignment.center, spacing: 4.0, runSpacing: 4.0, children: [
560-
OutlinedButton(style: D.commandButtonStyle, child: Text("${AppLocalizations.of(context)!.installHangoverStable}(10.11)"), onPressed: () async {
560+
OutlinedButton(style: D.commandButtonStyle, child: Text("${AppLocalizations.of(context)!.installHangoverStable}(10.14)"), onPressed: () async {
561561
Util.termWrite("bash ~/.local/share/tiny/extra/install-hangover-stable");
562562
G.pageIndex.value = 0;
563563
}),

lib/workflow.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ ln -sf ../applib/libexec_tar.so \$DATA_DIR/bin/tar
538538
ln -sf ../applib/libexec_virgl_test_server.so \$DATA_DIR/bin/virgl_test_server
539539
ln -sf ../applib/libexec_getifaddrs_bridge_server.so \$DATA_DIR/bin/getifaddrs_bridge_server
540540
ln -sf ../applib/libexec_pulseaudio.so \$DATA_DIR/bin/pulseaudio
541-
ln -sf ../applib/libbusybox.so \$DATA_DIR/lib/libbusybox.so.1.36.1
541+
ln -sf ../applib/libbusybox.so \$DATA_DIR/lib/libbusybox.so.1.37.0
542542
ln -sf ../applib/libtalloc.so \$DATA_DIR/lib/libtalloc.so.2
543543
ln -sf ../applib/libvirglrenderer.so \$DATA_DIR/lib/libvirglrenderer.so
544544
ln -sf ../applib/libepoxy.so \$DATA_DIR/lib/libepoxy.so

0 commit comments

Comments
 (0)