From 3a36cdf6ebd9d2795bdcd14162f38df568d51796 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 17 Sep 2024 14:57:43 +0800 Subject: Revert to LL's OpenJPEG fork System 2.5.2 caused too much rainbow in DeltaFPS. For now, the OpenJPEG listed in autobuild.xml is 2.5.0. However, LL has recently got 2.5.2 too in their OpenJPEG fork repo, but we switch to that once it's the one listed in autobuild.xml. Reverting to the now maintained LL 3p-openjpeg should fix the texture thrashing problem https://megapahit.com/show_bug.cgi?id=1 starting from DeltaFPS. --- indra/newview/FixBundle.cmake.in | 9 --------- 1 file changed, 9 deletions(-) (limited to 'indra/newview/FixBundle.cmake.in') diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 0538918c9e..63b4cceca3 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -16,11 +16,6 @@ file(CREATE_LINK "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libxmlrpc-epi.0.dylib" SYMBOLIC ) -file(CREATE_LINK - "../../../../Frameworks/libopenjp2.7.dylib" - "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libopenjp2.7.dylib" - SYMBOLIC - ) file(CREATE_LINK "../../../../Frameworks/libpng16.16.dylib" "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libpng16.16.dylib" @@ -172,9 +167,6 @@ execute_process( COMMAND lipo libopenal.1.23.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libopenal.1.23.1.dylib - COMMAND lipo libopenjp2.2.5.2.dylib - -thin ${CMAKE_OSX_ARCHITECTURES} - -output libopenjp2.2.5.2.dylib COMMAND lipo libpcre.1.dylib -thin ${CMAKE_OSX_ARCHITECTURES} -output libpcre.1.dylib @@ -246,7 +238,6 @@ execute_process( Frameworks/libnghttp2.14.dylib Frameworks/libogg.0.dylib Frameworks/libopenal.1.23.1.dylib - Frameworks/libopenjp2.2.5.2.dylib Frameworks/libpcre.1.dylib Frameworks/libpcrecpp.0.dylib Frameworks/libpng16.16.dylib -- cgit v1.2.3