Update from upstream

SolDev69 · Jul 17, 2024 · 7168b88 · 7168b88
2 parents e742edf + 9e77841
commit 7168b88
Show file tree

Hide file tree

Showing 33 changed files with 8 additions and 2 deletions.
diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/lwjgl-glfw-classes.jar
diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/version
@@ -1 +1 @@
-1716170694562
+1720909595576
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java
@@ -325,6 +325,9 @@ public static void launchJavaVM(final AppCompatActivity activity, final Runtime
         purgeArg(userArgs, "-XX:+UseTransparentHugePages");
         purgeArg(userArgs, "-XX:+UseLargePagesInMetaspace");
         purgeArg(userArgs, "-XX:+UseLargePages");
+        purgeArg(userArgs, "-Dorg.lwjgl.opengl.libname");
+        // Don't let the user specify a custom Freetype library (as the user is unlikely to specify a version compiled for Android)
+        purgeArg(userArgs, "-Dorg.lwjgl.freetype.libname");
 
         //Add automatically generated args
         if (!isUsingCustomMem(userArgs))
@@ -333,7 +336,10 @@ public static void launchJavaVM(final AppCompatActivity activity, final Runtime
             userArgs.add("-Xmx" + LauncherPreferences.PREF_RAM_ALLOCATION + "M");
         }
 
-        if(LOCAL_RENDERER != null) userArgs.add("-Dorg.lwjgl.opengl.libname=" + graphicsLib);
+        // Force LWJGL to use the Freetype library intended for it, instead of using the one
+        // that we ship with Java (since it may be older than what's needed)
+        userArgs.add("-Dorg.lwjgl.freetype.libname="+ NATIVE_LIB_DIR+"/libfreetype.so");
+
         userArgs.addAll(JVMArgs);
 
         activity.runOnUiThread(() -> Toast.makeText(activity, activity.getString(R.string.autoram_info_msg,getAllocatedMemory(userArgs)), Toast.LENGTH_SHORT).show());

diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libfreetype.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/libfreetype.so
diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl.so
diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_nanovg.so
diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_opengl.so
diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_stb.so
diff --git a/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so b/app_pojavlauncher/src/main/jniLibs/arm64-v8a/liblwjgl_tinyfd.so
diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libfreetype.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/libfreetype.so
diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl.so
diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_nanovg.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_nanovg.so
diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_opengl.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_opengl.so
diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_stb.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_stb.so
diff --git a/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_tinyfd.so b/app_pojavlauncher/src/main/jniLibs/armeabi-v7a/liblwjgl_tinyfd.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86/libfreetype.so b/app_pojavlauncher/src/main/jniLibs/x86/libfreetype.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_nanovg.so b/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_nanovg.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_opengl.so b/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_opengl.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_stb.so b/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_stb.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_tinyfd.so b/app_pojavlauncher/src/main/jniLibs/x86/liblwjgl_tinyfd.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/libfreetype.so b/app_pojavlauncher/src/main/jniLibs/x86_64/libfreetype.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_nanovg.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_nanovg.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_opengl.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_opengl.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_stb.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_stb.so
diff --git a/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_tinyfd.so b/app_pojavlauncher/src/main/jniLibs/x86_64/liblwjgl_tinyfd.so
diff --git a/jre_lwjgl3glfw/libs/lwjgl-freetype.jar b/jre_lwjgl3glfw/libs/lwjgl-freetype.jar
diff --git a/jre_lwjgl3glfw/libs/lwjgl-glfw.jar b/jre_lwjgl3glfw/libs/lwjgl-glfw.jar
diff --git a/jre_lwjgl3glfw/libs/lwjgl-lwjglx.jar b/jre_lwjgl3glfw/libs/lwjgl-lwjglx.jar
diff --git a/jre_lwjgl3glfw/libs/lwjgl-nanovg.jar b/jre_lwjgl3glfw/libs/lwjgl-nanovg.jar
diff --git a/jre_lwjgl3glfw/libs/lwjgl-openal.jar b/jre_lwjgl3glfw/libs/lwjgl-openal.jar
diff --git a/jre_lwjgl3glfw/libs/lwjgl-opengl.jar b/jre_lwjgl3glfw/libs/lwjgl-opengl.jar
diff --git a/jre_lwjgl3glfw/libs/lwjgl.jar b/jre_lwjgl3glfw/libs/lwjgl.jar