Fix QQ, remove static elf, downgrade hangover, add dxvk, update dependencies, update code to 1.0.23

Author: Cateners

.gitignore

@@ -48,5 +48,10 @@ app.*.map.json
 /backup
 
 assets/xa*
+assets/patch.tar.gz
+
+android/app/src/main/jniLibs/*
+
+devtools_options.yaml
 
 lib/l10n/app_localizations*

android/app/src/main/AndroidManifest.xml

@@ -22,7 +22,8 @@
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true"
         android:launchMode="singleInstance"
-        android:theme="@style/App.Theme">
+        android:theme="@style/App.Theme"
+        android:extractNativeLibs="true">
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -47,8 +48,8 @@
         <activity android:name="com.example.tiny_computer.Signal9Activity" />
         <activity-alias
             android:name="com.gaurav.avnc.UriReceiverActivity"
-            android:targetActivity="com.gaurav.avnc.ui.vnc.IntentReceiverActivity">
-
+            android:targetActivity="com.gaurav.avnc.ui.vnc.IntentReceiverActivity"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -100,7 +101,8 @@
             android:name="com.termux.x11.LoriePreferences"
             android:supportsPictureInPicture="false"
             android:resizeableActivity="true"
-            android:process=":x11">
+            android:process=":x11"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
                 <action android:name="android.intent.action.MAIN" />

android/app/src/main/java/com/termux/x11/CmdEntryPoint.java

@@ -234,7 +234,8 @@ public static Context createContext() {
         String libPath = res != null ? res.getFile().replace("file:", "") : null;
         if (libPath != null) {
             try {
-                System.load(libPath);
+                //System.load(libPath);
+                System.loadLibrary("Xlorie");
             } catch (Exception e) {
                 Log.e("CmdEntryPoint", "Failed to dlopen " + libPath, e);
                 System.err.println("Failed to load native library. Did you install the right apk? Try the universal one.");

android/app/src/main/kotlin/com/example/tiny_computer/MainActivity.kt

@@ -66,6 +66,9 @@ class MainActivity: FlutterActivity() {
                     startActivity(Intent(this, com.termux.x11.MainActivity::class.java))
                     result.success(0)
                 }
+                "getNativeLibraryPath" -> {
+                    result.success(getApplicationInfo().nativeLibraryDir)
+                }
                 else -> {
                     // 不支持的方法名
                     result.notImplemented()

assets/assets.zip

@@ -49,7 +49,7 @@ done
 
 echo "正在安装Hangover..."
 tar xvf hangover.tar
-sudo apt install -y ./hangover-wine_${latest_version}~bookworm_arm64.deb ./hangover-libarm64ecfex_${latest_version}_arm64.deb
+sudo apt install -y ./hangover*.deb
 if [ $? -ne 0 ]; then
     cd /tmp
     rm -rf /tmp/hangover
@@ -60,6 +60,19 @@ fi
 echo "正在初始化Wine..."
 wineboot --init
 
+echo "正在安装DXVK..."
+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,d3d10=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,d3d10=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,d3d10=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d10 /d native /f >/dev/null 2>&1
+WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10=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,d3d10=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,d3d10=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
 

assets/busybox

@@ -5,7 +5,7 @@ sudo apt update
 sudo apt upgrade -y
 
 hangover_url="https://github.com/AndreRH/hangover/releases/download/hangover-9.20.1/hangover_9.20.1_debian12_bookworm_arm64.tar"
-latest_version="10.9"
+latest_version="10.6.1"
 
 mirror_sites=(
     "https://gh.llkk.cc/"
@@ -35,7 +35,7 @@ done
 
 echo "正在安装Hangover..."
 tar xvf hangover.tar
-sudo apt install -y ./hangover-wine_${latest_version}~bookworm_arm64.deb ./hangover-libarm64ecfex_${latest_version}_arm64.deb
+sudo apt install -y ./hangover*.deb
 if [ $? -ne 0 ]; then
     cd /tmp
     rm -rf /tmp/hangover
@@ -46,6 +46,19 @@ fi
 echo "正在初始化Wine..."
 wineboot --init
 
+echo "正在安装DXVK..."
+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,d3d10=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,d3d10=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,d3d10=n,d3d10core=n,d3d11=n,dxgi=n" wine reg add 'HKEY_CURRENT_USER\Software\Wine\DllOverrides' /v d3d10 /d native /f >/dev/null 2>&1
+WINEDLLOVERRIDES="d3d8=n,d3d9=n,d3d10=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,d3d10=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,d3d10=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
 

assets/patch.tar.gz

@@ -3,7 +3,6 @@
 ### assets.zip中的文件：
 
 - [busybox](https://github.com/meefik/busybox)
-- [mediamtx相关](https://github.com/bluenviron/mediamtx)
 - [tar](https://github.com/Rprop/tar-android-static)
 - [Xserver XSDL, pulseaudio相关文件](https://github.com/pelya/commandergenius/tree/sdl_android/project/jni/application/xserver)
 - [virgl](https://github.com/termux/termux-packages/tree/master/x11-packages/virglrenderer-android)