From 060bebcd3cbb5fbf6045bd777364947a2d8963d3 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 14 May 2025 11:43:15 +0800 Subject: Revert "Revert to LL's OpenJPEG fork" This reverts commit 3a36cdf6ebd9d2795bdcd14162f38df568d51796. --- indra/media_plugins/cef/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/media_plugins/cef') diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index 99810d77d8..be016eadc4 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -112,6 +112,7 @@ if (DARWIN) add_custom_command(TARGET media_plugin_cef POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL} -change "@executable_path/Chromium Embedded Framework" "@executable_path/../../../../Frameworks/Chromium Embedded Framework.framework/Chromium Embedded Framework" + -change "/opt/local/lib/libopenjp2.7.dylib" "@loader_path/../../Frameworks/libopenjp2.7.dylib" -change "/opt/local/lib/libpng16.16.dylib" "@loader_path/../../Frameworks/libpng16.16.dylib" -change "/opt/local/lib/libjpeg.8.dylib" "@loader_path/../../Frameworks/libjpeg.8.dylib" -change "/opt/local/lib/libfreetype.6.dylib" "@loader_path/../../Frameworks/libfreetype.6.dylib" -- cgit v1.2.3 From e1070f0d1261f794fae4c0e99dcefb0cc64c3855 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Sun, 25 May 2025 07:16:56 +0800 Subject: Install libvk_swiftshader.so to system lib folder Thank you Fritigern Gothly for noticing this lot of GPU/EGL and/or shader related errors. After the Megapahit process have exited, she still saw the system trying to find Vulkan libs in the Megapahit installation folder, [0522/173723.156996:FATAL:gpu_init.cc(500)] Passthrough is not supported, GL is angle, ANGLE is swiftshader Warning: Couldn't load Vulkan. Searched /usr/libexec/megapahit/libvk_swiftshader.so, /usr/lib/x86_64-linux-gnu/libvk_swiftshader.so, /usr/libexec/megapahit/libvk_swiftshader.so, libvk_swiftshader.so. at operator() (../../third_party/dawn/src/dawn/nativWarning: Couldn't load Vulkan. Searched /usr/libexec/megapahit/libvk_swiftshader.so, /usr/lib/x86_64-linux-gnu/libvk_swiftshadere/vulkan/BackendVk.cpp:299) at Initialize (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:310) at Create (..so, /usr/libexec/megapahit/libvk_swiftshader.so, libvk_swiftshader.so. at operator() (../../third_party/dawn/src/dawn/nativ./../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:266) at operator() (../../third_party/dawn/src/dawn/native/vulkane/vulkan/BackendVk.cpp:299) at Initialize (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:310) at Create (./BackendVk.cpp:521) ./../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:266) at operator() (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:521) Warning: Couldn't load Vulkan. Searched /usr/libexec/megapahit/libvk_swiftshader.so, /usr/lib/x86_64-linux-gnu/libvk_swiftshader.so, /usr/libexec/megapahit/libvk_swiftshader.so, libvk_swiftshader.so. at operator() (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:299) at Initialize (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:310) at Create (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:266) at operator() (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:521) Since SwiftShader doesn't seem to be available on Linux distro repos, it's going to have to be bundled and just placed in normal paths since it wouldn't conflict, instead of having some SwiftShader system library being pulled. --- indra/media_plugins/cef/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/media_plugins/cef') diff --git a/indra/media_plugins/cef/CMakeLists.txt b/indra/media_plugins/cef/CMakeLists.txt index be016eadc4..9142a4516a 100644 --- a/indra/media_plugins/cef/CMakeLists.txt +++ b/indra/media_plugins/cef/CMakeLists.txt @@ -180,6 +180,7 @@ if (INSTALL) install( FILES ${ARCH_PREBUILT_DIRS_RELEASE}/libcef.so + ${ARCH_PREBUILT_DIRS_RELEASE}/libvk_swiftshader.so ${AUTOBUILD_INSTALL_DIR}/bin/release/snapshot_blob.bin ${AUTOBUILD_INSTALL_DIR}/bin/release/v8_context_snapshot.bin ${AUTOBUILD_INSTALL_DIR}/resources/chrome_100_percent.pak -- cgit v1.2.3