From d604302d942d26ccfd8e0e5de548fa437d1425d5 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Fri, 30 Aug 2024 22:22:52 +0800
Subject: Fix Error: Dae parsing issue - see log for details

https://megapahit.com/show_bug.cgi?id=76
It seems like we have to use LL's Collada DOM 2.3.
Make sure minizip is installed on macOS.
It should be safe to uninstall your system Collada DOM package now.
The CMake arguments might have to be completed for non-Darwin
platforms in a next commit.
---
 indra/newview/FixBundle.cmake.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in
index 3616d68676..0538918c9e 100644
--- a/indra/newview/FixBundle.cmake.in
+++ b/indra/newview/FixBundle.cmake.in
@@ -121,9 +121,9 @@ execute_process(
     COMMAND lipo libbz2.1.0.8.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libbz2.1.0.8.dylib
-    COMMAND lipo libcollada-dom2.4-dp.2.4.0.dylib
+    COMMAND lipo libcollada14dom.2.3-r4.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
-        -output libcollada-dom2.4-dp.2.4.0.dylib
+        -output libcollada14dom.2.3-r4.dylib
     COMMAND lipo libexpat.1.9.2.dylib
         -thin ${CMAKE_OSX_ARCHITECTURES}
         -output libexpat.1.9.2.dylib
@@ -229,7 +229,7 @@ execute_process(
         Frameworks/libbrotlicommon.1.1.0.dylib
         Frameworks/libbrotlidec.1.1.0.dylib
         Frameworks/libbz2.1.0.8.dylib
-        Frameworks/libcollada-dom2.4-dp.2.4.0.dylib
+        Frameworks/libcollada14dom.2.3-r4.dylib
         Frameworks/libexpat.1.9.2.dylib
         Frameworks/libfreetype.6.dylib
         Frameworks/libhunspell-1.7.0.dylib
-- 
cgit v1.2.3