fix libOSMesa loading

reverts convenience name change
SolDev69 · Jan 2, 2024 · 87c5194 · 87c5194
1 parent d6c0dd9
commit 87c5194
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
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
@@ -226,7 +226,7 @@ public static void setJavaEnvironment(Activity activity, String jreHome) throws
                 envMap.put("POJAVEXEC_OSMESA", "libOSMesa_pan.so");
             }
             if(LOCAL_RENDERER.equals("adrhw_freedreno") || LOCAL_RENDERER.equals("swrast") || LOCAL_RENDERER.equals("virgl")) {
-                envMap.put("POJAVEXEC_OSMESA", "libOSMesa.so.8.0.0");
+                envMap.put("POJAVEXEC_OSMESA", "libOSMesa.so");
             }
         }
         if(LauncherPreferences.PREF_BIG_CORE_AFFINITY) envMap.put("POJAV_BIG_CORE_AFFINITY", "1");
@@ -463,7 +463,7 @@ public static String loadGraphicsLibrary(){
             case "swrast":
             case "virgl":
             case "adrhw_freedreno": 
-                renderLibrary = "libOSMesa.so.8.0.0"; break;
+                renderLibrary = "libOSMesa.so"; break;
             case "opengles3_desktopgl_angle_vulkan" : renderLibrary = "libtinywrapper.so"; break;
             case "opengles3_desktopgl_angle_vulkan_new" : renderLibrary = "libtinywrapper_new_angle.so"; break;
             default:

diff --git a/app_pojavlauncher/src/main/jni/ctxbridges/osmesa_loader.c b/app_pojavlauncher/src/main/jni/ctxbridges/osmesa_loader.c
@@ -20,11 +20,11 @@ void (*glReadPixels_p) (GLint x, GLint y, GLsizei width, GLsizei height, GLenum
 
 void dlsym_OSMesa() {
     char* main_osm_libname = getenv("POJAVEXEC_OSMESA");
-    if(main_osm_libname == NULL) main_osm_libname = "libOSMesa.so.8.0.0";
+    if(main_osm_libname == NULL) main_osm_libname = "libOSMesa.so";
     char* main_path = NULL;
     char* alt_path = NULL;
     if(asprintf(&main_path, "%s/%s", getenv("POJAV_NATIVEDIR"), main_osm_libname) == -1 ||
-            asprintf(&alt_path, "%s/libOSMesa.so.8.0.0.8", getenv("POJAV_NATIVEDIR")) == -1) {
+            asprintf(&alt_path, "%s/libOSMesa.so.8", getenv("POJAV_NATIVEDIR")) == -1) {
         abort();
     }
     void* dl_handle = NULL;
@@ -43,4 +43,4 @@ void dlsym_OSMesa() {
     glClear_p = dlsym(dl_handle,"glClear");
     glFinish_p = dlsym(dl_handle,"glFinish");
     glReadPixels_p = dlsym(dl_handle,"glReadPixels");
-}
+}
diff --git a/...main/jniLibs/arm64-v8a/libOSMesa.so.8.0.0 → ...r/src/main/jniLibs/arm64-v8a/libOSMesa.so b/...main/jniLibs/arm64-v8a/libOSMesa.so.8.0.0 → ...r/src/main/jniLibs/arm64-v8a/libOSMesa.so
diff --git a/...in/jniLibs/armeabi-v7a/libOSMesa.so.8.0.0 → ...src/main/jniLibs/armeabi-v7a/libOSMesa.so b/...in/jniLibs/armeabi-v7a/libOSMesa.so.8.0.0 → ...src/main/jniLibs/armeabi-v7a/libOSMesa.so
diff --git a/...rc/main/jniLibs/x86_64/libOSMesa.so.8.0.0 → ...cher/src/main/jniLibs/x86_64/libOSMesa.so b/...rc/main/jniLibs/x86_64/libOSMesa.so.8.0.0 → ...cher/src/main/jniLibs/x86_64/libOSMesa.so