livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for GHA build

master
Rye 2025-08-28 14:09:03 -04:00
parent d010e55b88
commit 5ffcd3dc88
6 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build.sh
View File

@ -158,6 +158,7 @@ pre_build()
if [[ "$arch" == "Darwin" ]] if [[ "$arch" == "Darwin" ]]
then then
HAVOK=OFF
SIGNING=("-DENABLE_SIGNING:BOOL=YES" \ SIGNING=("-DENABLE_SIGNING:BOOL=YES" \
"-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.") "-DSIGNING_IDENTITY:STRING=Developer ID Application: Linden Research, Inc.")
fi fi
@ -387,7 +388,7 @@ do
if `cat "$build_dir/build_ok"` if `cat "$build_dir/build_ok"`
then then
case "$variant" in case "$variant" in
Release) Release*)
if [ -r "$build_dir/autobuild-package.xml" ] if [ -r "$build_dir/autobuild-package.xml" ]
then then
begin_section "Autobuild metadata" begin_section "Autobuild metadata"

2
indra/cmake/Audio.cmake
View File

@ -33,5 +33,5 @@ find_library(VORBISFILE_LIBRARY
libvorbisfile.a libvorbisfile.a
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) 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} )

2
indra/cmake/Boost.cmake
View File

@ -65,8 +65,8 @@ find_library(BOOST_URL_LIBRARY
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
target_link_libraries(ll::boost INTERFACE target_link_libraries(ll::boost INTERFACE
${BOOST_CONTEXT_LIBRARY}
${BOOST_FIBER_LIBRARY} ${BOOST_FIBER_LIBRARY}
${BOOST_CONTEXT_LIBRARY}
${BOOST_FILESYSTEM_LIBRARY} ${BOOST_FILESYSTEM_LIBRARY}
${BOOST_PROGRAMOPTIONS_LIBRARY} ${BOOST_PROGRAMOPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY} ${BOOST_REGEX_LIBRARY}

4
indra/cmake/OPENAL.cmake
View File

@ -26,11 +26,15 @@ if (USE_OPENAL)
NAMES NAMES
OpenAL32 OpenAL32
openal openal
libopenal.dylib
libopenal.so
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
find_library(ALUT_LIBRARY find_library(ALUT_LIBRARY
NAMES NAMES
alut alut
libalut.dylib
libalut.so
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
target_link_libraries(ll::openal INTERFACE ${OPENAL_LIBRARY} ${ALUT_LIBRARY}) target_link_libraries(ll::openal INTERFACE ${OPENAL_LIBRARY} ${ALUT_LIBRARY})

3
indra/cmake/OpenJPEG.cmake
View File

@ -12,6 +12,9 @@ use_prebuilt_binary(openjpeg)
find_library(OPENJPEG_LIBRARY find_library(OPENJPEG_LIBRARY
NAMES NAMES
openjp2 openjp2
openjp2.lib
libopenjp2.a
libopenjp2.so
PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH) PATHS "${ARCH_PREBUILT_DIRS_RELEASE}" REQUIRED NO_DEFAULT_PATH)
target_link_libraries(ll::openjpeg INTERFACE ${OPENJPEG_LIBRARY}) target_link_libraries(ll::openjpeg INTERFACE ${OPENJPEG_LIBRARY})

37
indra/llcommon/llprocessor.cpp
View File

@ -640,43 +640,6 @@ public:
{ {
getCPUIDInfo(); getCPUIDInfo();
uint64_t frequency = getSysctlInt64("hw.cpufrequency"); 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 if (frequency == 0) // fallback to clockrate and tbfrequency
{ {
frequency = getSysctlClockrate() * getSysctlInt64("hw.tbfrequency"); frequency = getSysctlClockrate() * getSysctlInt64("hw.tbfrequency");