diff --git a/autobuild.xml b/autobuild.xml index 4c02ecefe6..4140f1cb16 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -959,63 +959,65 @@ name jpegencoderbasic - jpeglib + libjpeg-turbo platforms - darwin64 + windows64 archive hash - 776d114aa1e3455bb13deaacd756deb07b53ecbe + 36144272e381952a7c11f1d593c2916c5c7387d0 hash_algorithm sha1 url - https://github.com/secondlife/3p-jpeglib/releases/download/v8c.7846234/jpeglib-8c.7846234-darwin64-7846234.tar.zst + https://github.com/secondlife/3p-libjpeg-turbo/releases/download/v3.0.3-r1/libjpeg_turbo-3.0.3-windows64-10204037839.tar.zst name - darwin64 + windows64 linux64 archive hash - b4b2278bd2fcae85619e2145a243cca388d760d7 + f853a7d4fe842e7a661dd71a56a51f65b2ec25c7 hash_algorithm sha1 url - https://github.com/secondlife/3p-jpeglib/releases/download/v8c.7846234/jpeglib-8c.7846234-linux64-7846234.tar.zst + https://github.com/secondlife/3p-libjpeg-turbo/releases/download/v3.0.3-r1/libjpeg_turbo-3.0.3-linux64-10204037839.tar.zst name linux64 - windows64 + darwin64 archive hash - d50fcac69eeb9404638da07db96ee3e1191ecf93 + 6fcbc2c3c91b5e9bfbbc57ddf27d2f3698fe7d99 hash_algorithm sha1 url - https://github.com/secondlife/3p-jpeglib/releases/download/v8c.7846234/jpeglib-8c.7846234-windows64-7846234.tar.zst + https://github.com/secondlife/3p-libjpeg-turbo/releases/download/v3.0.3-r1/libjpeg_turbo-3.0.3-darwin64-10204037839.tar.zst name - windows64 + darwin64 license - jpeglib + libjpeg-turbo license_file - LICENSES/jpeglib.txt + LICENSES/libjpeg-turbo.txt copyright - Copyright (C) 1991-2011, Thomas G. Lane, Guido Vollbeding. + Copyright (C)2009-2024 D. R. Commander. All Rights Reserved. Copyright (C)2015 Viktor Szathmáry. All Rights Reserved. version - 8c.7846234 + 3.0.3 name - jpeglib + libjpeg-turbo + canonical_repo + https://github.com/secondlife/3p-libjpeg-turbo description JPEG encoding, decoding library diff --git a/indra/cmake/JPEG.cmake b/indra/cmake/JPEG.cmake index 252d7852d4..ade5a070cc 100644 --- a/indra/cmake/JPEG.cmake +++ b/indra/cmake/JPEG.cmake @@ -7,12 +7,14 @@ include_guard() add_library( ll::libjpeg INTERFACE IMPORTED ) use_system_binary(libjpeg) -use_prebuilt_binary(jpeglib) +use_prebuilt_binary(libjpeg-turbo) if (LINUX) - target_link_libraries( ll::libjpeg INTERFACE jpeg) + target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a) elseif (DARWIN) - target_link_libraries( ll::libjpeg INTERFACE jpeg) + target_link_libraries( ll::libjpeg INTERFACE ${ARCH_PREBUILT_DIRS_RELEASE}/libjpeg.a) elseif (WINDOWS) - target_link_libraries( ll::libjpeg INTERFACE jpeglib) + target_link_libraries( ll::libjpeg INTERFACE + debug ${ARCH_PREBUILT_DIRS_DEBUG}/jpeg.lib + optimized ${ARCH_PREBUILT_DIRS_RELEASE}/jpeg.lib) endif (LINUX) target_include_directories( ll::libjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include)