[libjpeg-turbo] Upgraded to 2.1.0

ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d80af40..361ecae 100644
+index 10a198f..f535cbb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -143,6 +143,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
+@@ -168,6 +168,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE)
  boolean_number(ENABLE_SHARED)
  option(ENABLE_STATIC "Build static libraries" TRUE)
  boolean_number(ENABLE_STATIC)
@@ -15,7 +15,7 @@ index d80af40..361ecae 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)
-@@ -593,18 +599,20 @@ if(WITH_TURBOJPEG)
+@@ -634,17 +640,19 @@ if(WITH_TURBOJPEG)
          LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
      endif()
 
@@ -38,15 +38,13 @@ index d80af40..361ecae 100644
 
 -    add_executable(tjexample tjexample.c)
 -    target_link_libraries(tjexample turbojpeg)
--  endif()
 +      add_executable(tjexample tjexample.c)
-+        target_link_libraries(tjexample turbojpeg)
++      target_link_libraries(tjexample turbojpeg)
 +    endif()
-+   endif()
+   endif()
 
    if(ENABLE_STATIC)
-     add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
-@@ -616,14 +624,16 @@ if(WITH_TURBOJPEG)
+@@ -657,14 +665,16 @@ if(WITH_TURBOJPEG)
        set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
      endif()
 
@@ -70,7 +68,7 @@ index d80af40..361ecae 100644
      endif()
    endif()
  endif()
-@@ -639,7 +649,7 @@ else()
+@@ -680,7 +690,7 @@ else()
    set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
  endif()
 
@@ -79,46 +77,44 @@ index d80af40..361ecae 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})
-@@ -655,9 +665,10 @@ if(ENABLE_STATIC)
+@@ -696,10 +706,10 @@ if(ENABLE_STATIC)
    set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
  endif()
 
 -add_executable(rdjpgcom rdjpgcom.c)
 -
 -add_executable(wrjpgcom wrjpgcom.c)
+-
 +if(ENABLE_EXECUTABLES)
 +  add_executable(rdjpgcom rdjpgcom.c)
 +  add_executable(wrjpgcom wrjpgcom.c)
 +endif()
 
-
  ###############################################################################
-@@ -1337,10 +1348,14 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX})
-
- if(WITH_TURBOJPEG)
-   if(ENABLE_SHARED)
--    install(TARGETS turbojpeg tjbench
-+    install(TARGETS turbojpeg
+ # TESTS
+@@ -1434,8 +1444,10 @@ if(WITH_TURBOJPEG)
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-    install(TARGETS tjbench
+-      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +    if(ENABLE_EXECUTABLES)
 +      install(TARGETS tjbench
 +        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +    endif()
      if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
        CMAKE_C_LINKER_SUPPORTS_PDB)
        install(FILES "$<TARGET_PDB_FILE:turbojpeg>"
-@@ -1350,7 +1365,7 @@ if(WITH_TURBOJPEG)
-   if(ENABLE_STATIC)
-     install(TARGETS turbojpeg-static ARCHIVE
-       DESTINATION ${CMAKE_INSTALL_LIBDIR})
+@@ -1446,7 +1458,7 @@ if(WITH_TURBOJPEG)
+     install(TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
+       INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+       ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 -    if(NOT ENABLE_SHARED)
 +    if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
        if(MSVC_IDE OR XCODE)
          set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
        else()
-@@ -1360,13 +1375,15 @@ if(WITH_TURBOJPEG)
+@@ -1456,15 +1468,17 @@ if(WITH_TURBOJPEG)
          DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
      endif()
    endif()
@@ -131,13 +127,15 @@ index d80af40..361ecae 100644
  endif()
 
  if(ENABLE_STATIC)
-   install(TARGETS jpeg-static ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+   install(TARGETS jpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets
+     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 -  if(NOT ENABLE_SHARED)
 +  if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES)
      if(MSVC_IDE OR XCODE)
        set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}")
      else()
-@@ -1381,21 +1398,25 @@ if(ENABLE_STATIC)
+@@ -1479,21 +1493,25 @@ if(ENABLE_STATIC)
    endif()
  endif()
 
@@ -175,9 +173,9 @@ index d80af40..361ecae 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
-@@ -1406,10 +1427,12 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc
-   ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc
-   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+@@ -1511,10 +1529,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
+   NAMESPACE ${CMAKE_PROJECT_NAME}::
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
 
 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
 -  ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
@@ -193,10 +191,10 @@ index d80af40..361ecae 100644
  include(cmakescripts/BuildPackages.cmake)
 
 diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
-index a5c4e39..794c2af 100644
+index 78a2f28..718339a 100644
 --- a/sharedlib/CMakeLists.txt
 +++ b/sharedlib/CMakeLists.txt
-@@ -71,27 +71,35 @@ else()
+@@ -71,30 +71,34 @@ else()
    set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
  endif()
 
@@ -232,15 +230,15 @@ index a5c4e39..794c2af 100644
 +  target_link_libraries(jcstest jpeg)
 +endif()
 
--install(TARGETS jpeg cjpeg djpeg jpegtran
-+install(TARGETS jpeg
+ install(TARGETS jpeg EXPORT ${CMAKE_PROJECT_NAME}Targets
+   INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+-install(TARGETS cjpeg djpeg jpegtran
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +if(ENABLE_EXECUTABLES)
 +  install(TARGETS cjpeg djpeg jpegtran
-+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 +    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +endif()
  if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND

ports/libjpeg-turbo/portfile.cmake

@@ -5,14 +5,13 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libjpeg-turbo/libjpeg-turbo
-    REF 10ba6ed3365615ed5c2995fe2d240cb2d5000173 # 2.0.6
-    SHA512 219d01907e66dd0fc20ea13cfa51a8efee305810f1245d0648b6ad8ee3cf11bf0bbd43b1ceeeb142a6ebbbfa281ec6a3b4e283b2fc343c360cd3ad29e9d42528
+    REF c23672ce52ae53bd846b555439aa0a070b6d2c07 # 2.1.0
+    SHA512 ae6b442252e4560c3387b4660539973ecc32ddc9425b6cbd5a1dd46e375f01cbdff956a944932f0279b5633c05121716cc6839ca3fe41703c99c9bb4424f2415
     HEAD_REF master
     PATCHES
         add-options-for-exes-docs-headers.patch
         #workaround for vcpkg bug see #5697 on github for more information
         workaround_cmake_system_processor.patch
-        fix-incompatibility-for-c11-c17.patch
 )
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR (VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
@@ -33,8 +32,9 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    jpeg7 WITH_JPEG7
-    jpeg8 WITH_JPEG8
+    FEATURES
+        jpeg7 WITH_JPEG7
+        jpeg8 WITH_JPEG8
 )
 
 vcpkg_configure_cmake(
@@ -62,8 +62,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib")
         file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib")
         file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib")
-
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
     endif()
 else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib")
@@ -78,14 +77,29 @@ if(EXISTS "${_file}" AND VCPKG_TARGET_IS_WINDOWS)
 endif() 
 
 vcpkg_fixup_pkgconfig()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libjpeg-turbo TARGET_PATH share/${PORT})
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/man)
+# Fix library names
+file(GLOB CONFIG_FILES "${CURRENT_PACKAGES_DIR}/share/${PORT}/libjpeg-turboTargets-*.cmake")
+foreach(f ${CONFIG_FILES})
+    file(READ ${f} _contents)
+    string(REPLACE "/debug/lib/jpeg-static.lib" "/debug/lib/jpegd.lib" _contents "${_contents}")
+    string(REPLACE "/debug/lib/jpeg.lib" "/debug/lib/jpegd.lib" _contents "${_contents}")
+    string(REPLACE "/lib/jpeg-static.lib" "/lib/jpeg.lib" _contents "${_contents}")
+    string(REPLACE "/debug/lib/turbojpeg-static.lib" "/debug/lib/turbojpegd.lib" _contents "${_contents}")
+    string(REPLACE "/debug/lib/turbojpeg.lib" "/debug/lib/turbojpegd.lib" _contents "${_contents}")
+    string(REPLACE "/lib/turbojpeg-static.lib" "/lib/turbojpeg.lib" _contents "${_contents}")
+    file(WRITE ${f} "${_contents}")
+endforeach()
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/jpeg)
+file(REMOVE_RECURSE
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/share/man")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.md  DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/jpeg")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
 vcpkg_copy_pdbs()

ports/libjpeg-turbo/vcpkg.json

@@ -0,0 +1,14 @@
+{
+  "name": "libjpeg-turbo",
+  "version": "2.1.0",
+  "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",
+  "features": {
+    "jpeg7": {
+      "description": "Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)"
+    },
+    "jpeg8": {
+      "description": "Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!)"
+    }
+  }
+}

ports/libjpeg-turbo/workaround_cmake_system_processor.patch

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b2f137a..3754095 100644
+index 10a198f..f3252a4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -40,7 +40,7 @@ message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}")
@@ -8,6 +8,6 @@ index b2f137a..3754095 100644
  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)
- if(CMAKE_SYSTEM_PROCESSOR_LC MATCHES "x86_64" OR
-   CMAKE_SYSTEM_PROCESSOR_LC MATCHES "amd64" OR
-   CMAKE_SYSTEM_PROCESSOR_LC MATCHES "i[0-9]86" OR
+ set(COUNT 1)
+ foreach(ARCH ${CMAKE_OSX_ARCHITECTURES})
+   if(COUNT GREATER 1)

versions/baseline.json

@@ -3257,7 +3257,7 @@
       "port-version": 0
     },
     "libjpeg-turbo": {
-      "baseline": "2.0.6",
+      "baseline": "2.1.0",
       "port-version": 0
     },
     "libjuice": {
@@ -3539,8 +3539,8 @@
     "libsigcpp-3": {
       "baseline": "3.0.3",
       "port-version": 1
-    }, 
-	"libsmb2": {
+    },
+    "libsmb2": {
       "baseline": "2021-04-29",
       "port-version": 0
     },

versions/l-/libjpeg-turbo.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "05c65204aab88ca26eed17dff444feb36c4a829a",
+      "version": "2.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "42aed1a37d04ecdc437a4f52c6dd71740339f478",
       "version-string": "2.0.6",