From 060bebcd3cbb5fbf6045bd777364947a2d8963d3 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Wed, 14 May 2025 11:43:15 +0800
Subject: Revert "Revert to LL's OpenJPEG fork"

This reverts commit 3a36cdf6ebd9d2795bdcd14162f38df568d51796.
---
 indra/newview/FixBundle.cmake.in | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/FixBundle.cmake.in')

diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index e2fa244577..829c19e5e4 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -9,6 +9,11 @@ file(CREATE_LINK
     "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/libnghttp2.14.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"
@@ -235,6 +240,9 @@ execute_process(
     COMMAND lipo libopenal.1.24.2.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libopenal.1.24.2.dylib
+    COMMAND lipo libopenjp2.2.5.3.dylib
+        -thin ${CMAKE_OSX_ARCHITECTURES}
+        -output libopenjp2.2.5.3.dylib
     COMMAND lipo libpng16.16.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libpng16.16.dylib
@@ -301,6 +309,7 @@ execute_process(
         Frameworks/libnghttp2.14.dylib
         Frameworks/libogg.0.dylib
         Frameworks/libopenal.1.24.2.dylib
+        Frameworks/libopenjp2.2.5.3.dylib
         Frameworks/libpng16.16.dylib
         Frameworks/libvlc.5.dylib
         Frameworks/libvlccore.9.dylib
-- 
cgit v1.2.3