[libjpeg-turbo] Upgraded to 2.1.0

ports/azure-kinect-sensor-sdk/fix-builds.patch

@@ -35,9 +35,9 @@ index 4f002b5..cef79d6 100644
 +    find_package(gl3w CONFIG REQUIRED)
 +endif()
 +add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic)
-+add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED)
-+set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR})
-+set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES})
++add_library(libjpeg-turbo::libjpeg-turbo ALIAS libjpeg-turbo::jpeg-static)
++
++
 +# add jpeg-turbo library to jpeg libraries.
 +set(JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_TURBO})
 +# Fix embl error

ports/azure-kinect-sensor-sdk/fix-uvc.patch

@@ -14,9 +14,9 @@ index 672f6e2..555cb8f 100644
 +   add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic)
 +   find_package(OpenSSL REQUIRED)
 +   find_package(ZLIB REQUIRED)
-+   add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED)
-+   set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR})
-+   set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES})
++   find_package(libjpeg-turbo CONFIG REQUIRED)
++   add_library(libjpeg-turbo::libjpeg-turbo ALIAS libjpeg-turbo::jpeg-static)
++
 +else()
 +   find_library(LibUSB libusb-1.0 REQUIRED)
 +endif()
@@ -28,9 +28,9 @@ index 672f6e2..555cb8f 100644
      find_package(gl3w CONFIG REQUIRED)
  endif()
 -add_library(libuvc::libuvc ALIAS LibUVC::UVCStatic)
--add_library(libjpeg-turbo::libjpeg-turbo STATIC IMPORTED)
--set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JPEG_INCLUDE_DIR})
--set_property(TARGET libjpeg-turbo::libjpeg-turbo PROPERTY IMPORTED_LOCATION ${JPEG_LIBRARIES})
+-add_library(libjpeg-turbo::libjpeg-turbo ALIAS libjpeg-turbo::jpeg-static)
+-
+-
  # add jpeg-turbo library to jpeg libraries.
  set(JPEG_LIBRARIES ${JPEG_LIBRARIES} ${JPEG_TURBO})
  # Fix embl error

ports/azure-kinect-sensor-sdk/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "azure-kinect-sensor-sdk",
   "version": "1.4.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Azure Kinect SDK is a cross platform (Linux and Windows) user mode SDK to read data from your Azure Kinect device.",
   "homepage": "https://github.com/microsoft/Azure-Kinect-Sensor-SDK",
   "supports": "!osx",

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..68ac5a3 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,62 +15,39 @@ 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,6 +640,7 @@ if(WITH_TURBOJPEG)
          LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}")
      endif()
 
--    add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
--    target_link_libraries(tjunittest turbojpeg)
 +    if(ENABLE_EXECUTABLES)
-+      add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
-+      target_link_libraries(tjunittest turbojpeg)
-
--    add_executable(tjbench tjbench.c tjutil.c)
--    target_link_libraries(tjbench turbojpeg)
--    if(UNIX)
--      target_link_libraries(tjbench m)
--    endif()
-+      add_executable(tjbench tjbench.c tjutil.c)
-+      target_link_libraries(tjbench turbojpeg)
-+      if(UNIX)
-+        target_link_libraries(tjbench m)
-+      endif()
-
--    add_executable(tjexample tjexample.c)
--    target_link_libraries(tjexample turbojpeg)
--  endif()
-+      add_executable(tjexample tjexample.c)
-+        target_link_libraries(tjexample turbojpeg)
-+    endif()
-+   endif()
+     add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c)
+     target_link_libraries(tjunittest turbojpeg)
+
+@@ -646,6 +653,7 @@ if(WITH_TURBOJPEG)
+     add_executable(tjexample tjexample.c)
+     target_link_libraries(tjexample turbojpeg)
+   endif()
++  endif()
 
    if(ENABLE_STATIC)
      add_library(turbojpeg-static STATIC ${JPEG_SOURCES} $<TARGET_OBJECTS:simd>
-@@ -616,14 +624,16 @@ if(WITH_TURBOJPEG)
+@@ -657,6 +665,7 @@ if(WITH_TURBOJPEG)
        set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg)
      endif()
 
--    add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
--      md5/md5hl.c)
--    target_link_libraries(tjunittest-static turbojpeg-static)
 +    if(ENABLE_EXECUTABLES)
-+      add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
-+        md5/md5hl.c)
-+      target_link_libraries(tjunittest-static turbojpeg-static)
-
--    add_executable(tjbench-static tjbench.c tjutil.c)
--    target_link_libraries(tjbench-static turbojpeg-static)
--    if(UNIX)
--      target_link_libraries(tjbench-static m)
-+      add_executable(tjbench-static tjbench.c tjutil.c)
-+      target_link_libraries(tjbench-static turbojpeg-static)
-+      if(UNIX)
-+        target_link_libraries(tjbench-static m)
-+      endif()
+     add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c
+       md5/md5hl.c)
+     target_link_libraries(tjunittest-static turbojpeg-static)
+@@ -666,6 +675,7 @@ if(WITH_TURBOJPEG)
+     if(UNIX)
+       target_link_libraries(tjbench-static m)
      endif()
++    endif()
    endif()
  endif()
-@@ -639,7 +649,7 @@ else()
+
+@@ -680,7 +690,7 @@ else()
    set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
  endif()
 
@@ -79,169 +56,120 @@ 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,11 @@ 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()
+ 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 +1445,10 @@ if(WITH_TURBOJPEG)
        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +    if(ENABLE_EXECUTABLES)
-+      install(TARGETS tjbench
-+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+     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 +1459,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 +1469,17 @@ if(WITH_TURBOJPEG)
          DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE})
      endif()
    endif()
--  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
--    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +  if(INSTALL_HEADERS)
-+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
-+      DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h
+     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +  endif()
  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,8 +1494,11 @@ if(ENABLE_STATIC)
    endif()
  endif()
 
--install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +if(ENABLE_EXECUTABLES)
-+  install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 +endif()
 
--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
--  ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
--  ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
--  ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
--  ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
--if(WITH_JAVA)
--  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
--    DESTINATION ${CMAKE_INSTALL_DOCDIR})
 +if(INSTALL_DOCS)
-+  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
-+    ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt
-+    ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt
-+    ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt
-+    ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
-+  if(WITH_JAVA)
-+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
-+      DESTINATION ${CMAKE_INSTALL_DOCDIR})
-+  endif()
+ 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
+@@ -1492,8 +1510,9 @@ if(WITH_JAVA)
+   install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java
+     DESTINATION ${CMAKE_INSTALL_DOCDIR})
  endif()
++endif()
 
 -if(UNIX OR MINGW)
 +if((UNIX OR MINGW) AND INSTALL_DOCS)
    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)
-
--install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
--  ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
--  ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
--  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+@@ -1511,10 +1530,12 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
+   NAMESPACE ${CMAKE_PROJECT_NAME}::
+   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${CMAKE_PROJECT_NAME})
+
 +if(INSTALL_HEADERS)
-+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
-+    ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
-+    ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
-+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
+   ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
+   ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 +endif()
 
  include(cmakescripts/BuildPackages.cmake)
 
 diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
-index a5c4e39..794c2af 100644
+index 78a2f28..e653b2d 100644
 --- a/sharedlib/CMakeLists.txt
 +++ b/sharedlib/CMakeLists.txt
-@@ -71,27 +71,35 @@ else()
+@@ -71,6 +71,7 @@ else()
    set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c)
  endif()
 
--add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
--  ../rdswitch.c ${CJPEG_BMP_SOURCES})
--set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
--target_link_libraries(cjpeg jpeg)
 +if(ENABLE_EXECUTABLES)
-+  add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
-+    ../rdswitch.c ${CJPEG_BMP_SOURCES})
-+  set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-+  target_link_libraries(cjpeg jpeg)
-
--add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
--  ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES})
--set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
--target_link_libraries(djpeg jpeg)
-+  add_executable(djpeg ../djpeg.c ../cdjpeg.c ../rdcolmap.c ../rdswitch.c
-+    ../wrgif.c ../wrppm.c ${DJPEG_BMP_SOURCES})
-+  set_property(TARGET djpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-+  target_link_libraries(djpeg jpeg)
-
--add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
--target_link_libraries(jpegtran jpeg)
--set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
-+  add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c)
-+  target_link_libraries(jpegtran jpeg)
-+  set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
-
--add_executable(jcstest ../jcstest.c)
--target_link_libraries(jcstest jpeg)
-+  add_executable(jcstest ../jcstest.c)
-+  target_link_libraries(jcstest jpeg)
+ add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c
+   ../rdswitch.c ${CJPEG_BMP_SOURCES})
+ set_property(TARGET cjpeg PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
+@@ -87,14 +88,17 @@ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}")
+
+ add_executable(jcstest ../jcstest.c)
+ 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})
 +if(ENABLE_EXECUTABLES)
-+  install(TARGETS cjpeg djpeg jpegtran
-+    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})
 +endif()
  if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND
    CMAKE_C_LINKER_SUPPORTS_PDB)