From 5ffcd3dc88892a651fe9a95974280efb85e18a8b Mon Sep 17 00:00:00 2001
From: Rye <rye@alchemyviewer.org>
Date: Thu, 28 Aug 2025 14:09:03 -0400
Subject: Fixes for GHA build

---
 indra/cmake/Audio.cmake        |  2 +-
 indra/cmake/Boost.cmake        |  2 +-
 indra/cmake/OPENAL.cmake       |  4 ++++
 indra/cmake/OpenJPEG.cmake     |  3 +++
 indra/llcommon/llprocessor.cpp | 37 -------------------------------------
 5 files changed, 9 insertions(+), 39 deletions(-)

(limited to 'indra')

diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake
index 6f61b056e0..5a7a7ab0b5 100644
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -33,5 +33,5 @@ find_library(VORBISFILE_LIBRARY
     libvorbisfile.a
     PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
-target_link_libraries(ll::vorbis INTERFACE ${OGG_LIBRARY} ${VORBISENC_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY})
+target_link_libraries(ll::vorbis INTERFACE ${VORBISENC_LIBRARY} ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY} ${OGG_LIBRARY} )
 
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 518e678585..7b3882c936 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -65,8 +65,8 @@ find_library(BOOST_URL_LIBRARY
     PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
 target_link_libraries(ll::boost INTERFACE
-    ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_FIBER_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
     ${BOOST_FILESYSTEM_LIBRARY}
     ${BOOST_PROGRAMOPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
diff --git a/indra/cmake/OPENAL.cmake b/indra/cmake/OPENAL.cmake
index 2566a08189..ab1604aa22 100644
--- a/indra/cmake/OPENAL.cmake
+++ b/indra/cmake/OPENAL.cmake
@@ -26,11 +26,15 @@ if (USE_OPENAL)
       NAMES
       OpenAL32
       openal
+      libopenal.dylib
+      libopenal.so
       PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
   find_library(ALUT_LIBRARY
       NAMES
       alut
+      libalut.dylib
+      libalut.so
       PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
   target_link_libraries(ll::openal INTERFACE ${OPENAL_LIBRARY} ${ALUT_LIBRARY})
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index 33e9cf4898..95e71fd78e 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -12,6 +12,9 @@ use_prebuilt_binary(openjpeg)
 find_library(OPENJPEG_LIBRARY
     NAMES
     openjp2
+    openjp2.lib
+    libopenjp2.a
+    libopenjp2.so
     PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
 
 target_link_libraries(ll::openjpeg INTERFACE ${OPENJPEG_LIBRARY})
diff --git a/indra/llcommon/llprocessor.cpp b/indra/llcommon/llprocessor.cpp
index a6ecad2cf7..718f471321 100644
--- a/indra/llcommon/llprocessor.cpp
+++ b/indra/llcommon/llprocessor.cpp
@@ -640,43 +640,6 @@ public:
     {
         getCPUIDInfo();
         uint64_t frequency = getSysctlInt64("hw.cpufrequency");
-        if(frequency == 0) // Attempt to query IO Services for pcore frequency
-        {
-            CFMutableDictionaryRef arm_io_matching = IOServiceMatching("AppleARMIODevice");
-            io_iterator_t  iter;
-            kern_return_t ret = IOServiceGetMatchingServices(kIOMasterPortDefault, arm_io_matching, &iter);
-            if(ret == KERN_SUCCESS)
-            {
-                io_object_t obj;
-                while ((obj = IOIteratorNext(iter)))
-                {
-                    io_name_t obj_class;
-                    ret = IOObjectGetClass(obj, obj_class);
-                    if(ret == KERN_SUCCESS)
-                    {
-                        io_name_t obj_name;
-                        ret = IORegistryEntryGetName(obj, obj_name);
-                        if(ret == KERN_SUCCESS)
-                        {
-                            if (strncmp(obj_name, "pmgr", sizeof(obj_name)) == 0)
-                            {
-                                CFTypeRef cfData = IORegistryEntryCreateCFProperty(obj, CFSTR("voltage-states5-sram"), kCFAllocatorDefault, 0); // pcore frequency
-                                if(cfData)
-                                {
-                                    CFIndex size = CFDataGetLength((CFDataRef)cfData);
-                                    std::vector<U8> databuf(size);
-                                    CFDataGetBytes((CFDataRef)cfData, CFRangeMake(0, size), databuf.data());
-
-                                    frequency = 0x00000000FFFFFFFF & ((databuf[size-5] << 24) | (databuf[size-6] << 16) | (databuf[size-7] << 8) | (databuf[size-8]));
-                                    CFRelease(cfData);
-                                }
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
         if (frequency == 0) // fallback to clockrate and tbfrequency
         {
             frequency = getSysctlClockrate() * getSysctlInt64("hw.tbfrequency");
-- 
cgit v1.2.3