From aba3dabcbd56cfd026f1b200877f45dba093889f Mon Sep 17 00:00:00 2001 From: toge Date: Tue, 23 Sep 2025 20:31:28 +0900 Subject: [PATCH] [libjpeg-turbo] update to 3.1.2 (#47437) --- .../add-options-for-docs-headers.patch | 50 ++++ .../add-options-for-exes-docs-headers.patch | 218 ------------------ ports/libjpeg-turbo/portfile.cmake | 12 +- ports/libjpeg-turbo/vcpkg.json | 2 +- .../workaround_cmake_system_processor.patch | 26 +-- versions/baseline.json | 2 +- versions/l-/libjpeg-turbo.json | 5 + 7 files changed, 74 insertions(+), 241 deletions(-) create mode 100644 ports/libjpeg-turbo/add-options-for-docs-headers.patch delete mode 100644 ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch diff --git a/ports/libjpeg-turbo/add-options-for-docs-headers.patch b/ports/libjpeg-turbo/add-options-for-docs-headers.patch new file mode 100644 index 0000000000..6e2edb131e --- /dev/null +++ b/ports/libjpeg-turbo/add-options-for-docs-headers.patch @@ -0,0 +1,50 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9b4281..2b7b7e1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -788,9 +788,6 @@ if(WITH_TURBOJPEG) + target_link_libraries(tjbench m) + endif() + endif() +- +- add_custom_target(tjdoc COMMAND doxygen -s ../doc/doxygen.config +- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src) + endif() + + if(ENABLE_STATIC) +@@ -2060,35 +2057,6 @@ if(WITH_TOOLS) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) + endif() + +-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg +- ${CMAKE_CURRENT_SOURCE_DIR}/README.md +- ${CMAKE_CURRENT_SOURCE_DIR}/src/example.c +- ${CMAKE_CURRENT_SOURCE_DIR}/src/tjcomp.c +- ${CMAKE_CURRENT_SOURCE_DIR}/src/tjdecomp.c +- ${CMAKE_CURRENT_SOURCE_DIR}/src/tjtran.c +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/libjpeg.txt +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/structure.txt +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/usage.txt +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/wizard.txt +- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} +- COMPONENT doc) +-if(WITH_JAVA) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJComp.java +- ${CMAKE_CURRENT_SOURCE_DIR}/java/TJDecomp.java +- ${CMAKE_CURRENT_SOURCE_DIR}/java/TJTran.java +- DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc) +-endif() +- +-if(UNIX OR MINGW) +- if(WITH_TOOLS) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/cjpeg.1 +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/djpeg.1 +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/jpegtran.1 +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/rdjpgcom.1 +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/wrjpgcom.1 +- DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT man) +- endif() +-endif() + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT lib) + if(WITH_TURBOJPEG) diff --git a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch deleted file mode 100644 index 01721f146c..0000000000 --- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch +++ /dev/null @@ -1,218 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ff9c9c27..d3fbad30 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -224,6 +224,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) - boolean_number(ENABLE_SHARED) - option(ENABLE_STATIC "Build static libraries" TRUE) - boolean_number(ENABLE_STATIC) -+option(ENABLE_EXECUTABLES "Build executables" TRUE) -+boolean_number(ENABLE_EXECUTABLES) -+option(INSTALL_DOCS "Install doc files" TRUE) -+boolean_number(INSTALL_DOCS) -+option(INSTALL_HEADERS "Install header files" TRUE) -+boolean_number(INSTALL_HEADERS) - option(REQUIRE_SIMD - "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)" - FALSE) -@@ -734,6 +740,7 @@ if(WITH_TURBOJPEG) - LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}") - endif() - -+ if(ENABLE_EXECUTABLES) - add_executable(tjunittest src/tjunittest.c src/tjutil.c src/md5/md5.c - src/md5/md5hl.c) - target_link_libraries(tjunittest turbojpeg) -@@ -752,9 +759,11 @@ if(WITH_TURBOJPEG) - - add_executable(tjtran src/tjtran.c) - target_link_libraries(tjtran turbojpeg) -- -+ endif() -+ if(INSTALL_DOCS) - add_custom_target(tjdoc COMMAND doxygen -s ../doc/doxygen.config - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src) -+ endif() - endif() - - if(ENABLE_STATIC) -@@ -776,6 +785,7 @@ if(WITH_TURBOJPEG) - set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) - endif() - -+ if(ENABLE_EXECUTABLES) - add_executable(tjunittest-static src/tjunittest.c src/tjutil.c - src/md5/md5.c src/md5/md5hl.c) - target_link_libraries(tjunittest-static turbojpeg-static) -@@ -785,6 +795,7 @@ if(WITH_TURBOJPEG) - if(UNIX) - target_link_libraries(tjbench-static m) - endif() -+ endif() - endif() - endif() - -@@ -803,12 +814,14 @@ if(ENABLE_STATIC) - add_library(cjpeg16-static OBJECT src/rdppm.c) - set_property(TARGET cjpeg16-static PROPERTY COMPILE_FLAGS - "-DBITS_IN_JSAMPLE=16 -DGIF_SUPPORTED -DPPM_SUPPORTED") -+ if(ENABLE_EXECUTABLES) - add_executable(cjpeg-static src/cjpeg.c src/cdjpeg.c src/rdbmp.c src/rdgif.c - src/rdppm.c src/rdswitch.c src/rdtarga.c $ - $) - set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS - ${CDJPEG_COMPILE_FLAGS}) - target_link_libraries(cjpeg-static jpeg-static) -+ endif() - - # Compile a separate version of these source files with 12-bit and 16-bit - # data precision. -@@ -818,6 +831,7 @@ if(ENABLE_STATIC) - add_library(djpeg16-static OBJECT src/wrppm.c) - set_property(TARGET djpeg16-static PROPERTY COMPILE_FLAGS - "-DBITS_IN_JSAMPLE=16 -DPPM_SUPPORTED") -+ if(ENABLE_EXECUTABLES) - add_executable(djpeg-static src/djpeg.c src/cdjpeg.c src/rdcolmap.c - src/rdswitch.c src/wrbmp.c src/wrgif.c src/wrppm.c src/wrtarga.c - $ $) -@@ -832,11 +846,14 @@ if(ENABLE_STATIC) - - add_executable(example-static src/example.c) - target_link_libraries(example-static jpeg-static) -+ endif() - endif() - -+if(ENABLE_EXECUTABLES) - add_executable(rdjpgcom src/rdjpgcom.c) - - add_executable(wrjpgcom src/wrjpgcom.c) -+endif() - - - ############################################################################### -@@ -1971,9 +1988,11 @@ if(WITH_TURBOJPEG) - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib -- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) -+ if(ENABLE_EXECUTABLES) - install(TARGETS tjbench - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) -+ endif() - if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC_LIKE AND - CMAKE_C_LINKER_SUPPORTS_PDB) - install(FILES "$" -@@ -1984,7 +2003,7 @@ if(WITH_TURBOJPEG) - install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib) -- if(NOT ENABLE_SHARED) -+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) - if(GENERATOR_IS_MULTI_CONFIG) - set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") - else() -@@ -1994,15 +2013,17 @@ if(WITH_TURBOJPEG) - DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin RENAME tjbench${EXE}) - endif() - endif() -+ if(INSTALL_HEADERS) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/turbojpeg.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT include) -+ endif() - endif() - - if(ENABLE_STATIC) - install(TARGETS jpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib) -- if(NOT ENABLE_SHARED) -+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) - if(GENERATOR_IS_MULTI_CONFIG) - set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") - else() -@@ -2017,9 +2038,12 @@ if(ENABLE_STATIC) - endif() - endif() - -+if(ENABLE_EXECUTABLES) - install(TARGETS rdjpgcom wrjpgcom - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) -+endif() - -+if(INSTALL_DOCS) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg - ${CMAKE_CURRENT_SOURCE_DIR}/README.md - ${CMAKE_CURRENT_SOURCE_DIR}/src/example.c -@@ -2038,8 +2062,9 @@ if(WITH_JAVA) - ${CMAKE_CURRENT_SOURCE_DIR}/java/TJTran.java - DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc) - endif() -+endif() - --if(UNIX OR MINGW) -+if((UNIX OR MINGW) AND INSTALL_DOCS) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/cjpeg.1 - ${CMAKE_CURRENT_SOURCE_DIR}/doc/djpeg.1 - ${CMAKE_CURRENT_SOURCE_DIR}/doc/jpegtran.1 -@@ -2063,12 +2088,13 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME} - COMPONENT lib) - -+if(INSTALL_HEADERS) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/jerror.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/jmorecfg.h - ${CMAKE_CURRENT_SOURCE_DIR}/src/jpeglib.h - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT include) -- -+endif() - include(cmakescripts/BuildPackages.cmake) - - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in" - -diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt -index eaed9e95..74d53696 100644 ---- a/sharedlib/CMakeLists.txt -+++ b/sharedlib/CMakeLists.txt -@@ -94,12 +94,13 @@ set_property(TARGET cjpeg12 PROPERTY COMPILE_FLAGS - add_library(cjpeg16 OBJECT ../src/rdppm.c) - set_property(TARGET cjpeg16 PROPERTY COMPILE_FLAGS - "-DBITS_IN_JSAMPLE=16 -DGIF_SUPPORTED -DPPM_SUPPORTED") -+if(ENABLE_EXECUTABLES) - add_executable(cjpeg ../src/cjpeg.c ../src/cdjpeg.c ../src/rdbmp.c - ../src/rdgif.c ../src/rdppm.c ../src/rdswitch.c ../src/rdtarga.c - $ $) - set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${CDJPEG_COMPILE_FLAGS}) - target_link_libraries(cjpeg jpeg) -- -+endif() - # Compile a separate version of these source files with 12-bit and 16-bit data - # precision. - add_library(djpeg12 OBJECT ../src/rdcolmap.c ../src/wrgif.c ../src/wrppm.c) -@@ -108,6 +109,7 @@ set_property(TARGET djpeg12 PROPERTY COMPILE_FLAGS - add_library(djpeg16 OBJECT ../src/wrppm.c) - set_property(TARGET djpeg16 PROPERTY COMPILE_FLAGS - "-DBITS_IN_JSAMPLE=16 -DPPM_SUPPORTED") -+if(ENABLE_EXECUTABLES) - add_executable(djpeg ../src/djpeg.c ../src/cdjpeg.c ../src/rdcolmap.c - ../src/rdswitch.c ../src/wrbmp.c ../src/wrgif.c ../src/wrppm.c - ../src/wrtarga.c $ $) -@@ -124,14 +126,16 @@ target_link_libraries(example jpeg) - - add_executable(jcstest ../src/jcstest.c) - target_link_libraries(jcstest jpeg) -- -+endif() - install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets - INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) -+if(ENABLE_EXECUTABLES) - install(TARGETS cjpeg djpeg jpegtran - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) -+endif() - if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC_LIKE AND - CMAKE_C_LINKER_SUPPORTS_PDB) - install(FILES "$" diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index ce2f769a48..c698b7142b 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -8,10 +8,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo REF "${VERSION}" - SHA512 4937b63a27818cdb5087091b2d78837f7f385fd6b4d3e3fcaf4d9ad2944fed4a00020dcacb33e9c2fd4b0f9d9851fb4051ed3da86f606aca5167357262a73e89 + SHA512 91918fe0d6a2f74fa0faf9141a341a18d123684ceef0ec6a18d4b82fd47f13a939c2dd01c511d83567d1397e7344bd323f921ee5a1095cc61542a97b01ae9301 HEAD_REF master PATCHES - add-options-for-exes-docs-headers.patch + add-options-for-docs-headers.patch # workaround for vcpkg bug see #5697 on github for more information workaround_cmake_system_processor.patch ) @@ -39,7 +39,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES jpeg7 WITH_JPEG7 jpeg8 WITH_JPEG8 - tools ENABLE_EXECUTABLES + tools WITH_TOOLS ) vcpkg_cmake_configure( @@ -47,13 +47,9 @@ vcpkg_cmake_configure( OPTIONS -DENABLE_STATIC=${ENABLE_STATIC} -DENABLE_SHARED=${ENABLE_SHARED} - -DINSTALL_DOCS=OFF -DWITH_CRT_DLL=${WITH_CRT_DLL} ${FEATURE_OPTIONS} ${LIBJPEGTURBO_SIMD} - OPTIONS_DEBUG - -DENABLE_EXECUTABLES=OFF - -DINSTALL_HEADERS=OFF MAYBE_UNUSED_VARIABLES WITH_CRT_DLL ) @@ -61,7 +57,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_copy_pdbs() -if(ENABLE_EXECUTABLES) +if(WITH_TOOLS) vcpkg_copy_tools( TOOL_NAMES cjpeg djpeg jpegtran rdjpgcom wrjpgcom AUTO_CLEAN diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json index 17818214c1..0de5d1c7bf 100644 --- a/ports/libjpeg-turbo/vcpkg.json +++ b/ports/libjpeg-turbo/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libjpeg-turbo", - "version": "3.1.1", + "version": "3.1.2", "description": "libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.", "homepage": "https://github.com/libjpeg-turbo/libjpeg-turbo", "license": "BSD-3-Clause", diff --git a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch index 9abe2ce49e..1c0b13884d 100644 --- a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch +++ b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d3fbad30..9cf01cf5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -89,7 +89,7 @@ include(cmakescripts/PackageInfo.cmake) - - # Detect CPU type and whether we're building 64-bit or 32-bit code - math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8") --string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC) -+string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" CMAKE_SYSTEM_PROCESSOR_LC) - set(COUNT 1) - foreach(ARCH ${CMAKE_OSX_ARCHITECTURES}) - if(COUNT GREATER 1) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 55ff716..abad9fa 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -105,7 +105,7 @@ include(cmakescripts/PackageInfo.cmake) + + # Detect CPU type and whether we're building 64-bit or 32-bit code + math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8") +-string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC) ++string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" CMAKE_SYSTEM_PROCESSOR_LC) + set(COUNT 1) + foreach(ARCH ${CMAKE_OSX_ARCHITECTURES}) + if(COUNT GREATER 1) diff --git a/versions/baseline.json b/versions/baseline.json index 038daf7249..8f2078bcf5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4965,7 +4965,7 @@ "port-version": 2 }, "libjpeg-turbo": { - "baseline": "3.1.1", + "baseline": "3.1.2", "port-version": 0 }, "libjuice": { diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 7438714dad..7e0d48dbb6 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "26b02f049c1cbfc9d996c7b56cfd1f4598f6f158", + "version": "3.1.2", + "port-version": 0 + }, { "git-tree": "93acf52ccee5c259cfe37894c9c1f4b9c6f64c67", "version": "3.1.1",