[libjpeg-turbo] Update to 2.1.5.1. (#29781)

* update libjpeg-turbo * update version * Undo rxcpp changes * update patch * update version --------- Co-authored-by: MonicaLiu <v-liumonica@microsoft.com> Co-authored-by: Javier Matos Denizac <javier.matosd@gmail.com>
2025-01-19 04:43:02 +08:00 · 2023-02-28 03:57:38 +08:00 · 2023-02-28 03:57:38 +08:00 · 14f7d2896e
commit 14f7d2896e
parent 8c9e975171
6 changed files with 26 additions and 22 deletions
--- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
+++ b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3730326..f5958eb 100644
+index c384aae..c9a15a0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -194,6 +194,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
@ -15,7 +15,7 @@ index 3730326..f5958eb 100644
 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)
 boolean_number(REQUIRE_SIMD)
 option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_ARITH_DEC=0 WITH_ARITH_ENC=0 WITH_JAVA=0 WITH_SIMD=0 WITH_TURBOJPEG=0 )" FALSE)
-@@ -664,6 +670,7 @@ if(WITH_TURBOJPEG)
+@@ -662,6 +668,7 @@ if(WITH_TURBOJPEG)
         LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
     endif()
 
@ -23,15 +23,15 @@ index 3730326..f5958eb 100644
     add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
     target_link_libraries(tjunittest turbojpeg)
 
-@@ -676,6 +683,7 @@ if(WITH_TURBOJPEG)
+@@ -673,6 +680,7 @@ if(WITH_TURBOJPEG)
+ 
     add_executable(tjexample tjexample.c)
     target_link_libraries(tjexample turbojpeg)
+    endif()
   endif()
-+  endif()
 
   if(ENABLE_STATIC)
-     add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
-@@ -687,6 +695,7 @@ if(WITH_TURBOJPEG)
+@@ -685,6 +693,7 @@ if(WITH_TURBOJPEG)
       set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
     endif()
 
@ -39,7 +39,7 @@ index 3730326..f5958eb 100644
     add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
       md5/md5hl.c)
     target_link_libraries(tjunittest-static turbojpeg-static)
-@@ -696,6 +705,7 @@ if(WITH_TURBOJPEG)
+@@ -694,6 +703,7 @@ if(WITH_TURBOJPEG)
     if(UNIX)
       target_link_libraries(tjbench-static m)
     endif()
@ -47,7 +47,7 @@ index 3730326..f5958eb 100644
   endif()
 endif()
 
-@@ -710,7 +720,7 @@ else()
+@@ -708,7 +718,7 @@ else()
   set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
 endif()
 
@ -56,7 +56,7 @@ index 3730326..f5958eb 100644
   add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c
     ${CJPEG_BMP_SOURCES})
   set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-@@ -726,10 +736,11 @@ if(ENABLE_STATIC)
+@@ -724,9 +734,11 @@ if(ENABLE_STATIC)
   set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
 endif()
 
@ -64,12 +64,11 @@ index 3730326..f5958eb 100644
 add_executable(rdjpgcom rdjpgcom.c)
 
 add_executable(wrjpgcom wrjpgcom.c)
-
 +endif()
 
+ 
 ###############################################################################
- # TESTS
-@@ -1466,8 +1477,10 @@ if(WITH_TURBOJPEG)
+@@ -1464,8 +1476,10 @@ if(WITH_TURBOJPEG)
       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
       LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
       RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@ -80,7 +79,7 @@ index 3730326..f5958eb 100644
     if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
       CMAKE_C_LINKER_SUPPORTS_PDB)
       install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
-@@ -1478,7 +1491,7 @@ if(WITH_TURBOJPEG)
+@@ -1476,7 +1490,7 @@ if(WITH_TURBOJPEG)
     install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
       INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
@ -89,7 +88,7 @@ index 3730326..f5958eb 100644
       if(GENERATOR_IS_MULTI_CONFIG)
         set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
       else()
-@@ -1488,15 +1501,17 @@ if(WITH_TURBOJPEG)
+@@ -1486,15 +1500,17 @@ if(WITH_TURBOJPEG)
         DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
     endif()
   endif()
@ -108,7 +107,7 @@ index 3730326..f5958eb 100644
     if(GENERATOR_IS_MULTI_CONFIG)
       set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
     else()
-@@ -1511,8 +1526,11 @@ if(ENABLE_STATIC)
+@@ -1509,8 +1525,11 @@ if(ENABLE_STATIC)
   endif()
 endif()
 
@ -120,7 +119,7 @@ index 3730326..f5958eb 100644
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg
   ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/tjexample.c
-@@ -1524,8 +1542,9 @@ if(WITH_JAVA)
+@@ -1522,8 +1541,9 @@ if(WITH_JAVA)
   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
     DESTINATION ${CMAKE_INSTALL_DOCDIR})
 endif()
@ -131,7 +130,7 @@ index 3730326..f5958eb 100644
   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1
     ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1
     ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1
-@@ -1546,10 +1565,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
+@@ -1544,10 +1564,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
   NAMESPACE ${CMAKE_PROJECT_NAME}::
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
 
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@ -6,7 +6,7 @@ vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO libjpeg-turbo/libjpeg-turbo
    REF "${VERSION}"
-    SHA512 20036303fbe5703a5742dc3778cc5deb2eb98d00a9852e7e80ba73c195bba011ec206c090589c482f1153f74505c3fe06d96af00f6beaa65a7fcf7ffaf626fc2
+    SHA512 bcd946eed0fb3712eae2485d300d5e2b84596b1c8cfd4e944902bb141125d411b727024f054e2ad6c23855d06a02dcb926696f05cb107869a7b81814d4cfcaeb
    HEAD_REF master
    PATCHES
        add-options-for-exes-docs-headers.patch
--- a/ports/libjpeg-turbo/vcpkg.json
+++ b/ports/libjpeg-turbo/vcpkg.json
@ -1,6 +1,6 @@
 {
  "name": "libjpeg-turbo",
-  "version": "2.1.5",
+  "version": "2.1.5.1",
  "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",
--- a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch
+++ b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch
@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6dd83d3a..5cd717f5 100644
+index 3730326..0c2b87c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -54,7 +54,7 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}")
+@@ -66,7 +66,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")
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -4029,7 +4029,7 @@
      "port-version": 6
    },
    "libjpeg-turbo": {
-      "baseline": "2.1.5",
+      "baseline": "2.1.5.1",
      "port-version": 0
    },
    "libjuice": {
--- a/versions/l-/libjpeg-turbo.json
+++ b/versions/l-/libjpeg-turbo.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "2b3b3fe0c258463586c0e421a2665ca1d2df9b4d",
+      "version": "2.1.5.1",
+      "port-version": 0
+    },
    {
      "git-tree": "8ddeeba46c059986db83de51ec72b4ff587f0dcc",
      "version": "2.1.5",