diff --git a/ports/azure-kinect-sensor-sdk/fix-builds.patch b/ports/azure-kinect-sensor-sdk/fix-builds.patch index 4dbc61b362a5c3..3c4f65498cf122 100644 --- a/ports/azure-kinect-sensor-sdk/fix-builds.patch +++ b/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 diff --git a/ports/azure-kinect-sensor-sdk/fix-uvc.patch b/ports/azure-kinect-sensor-sdk/fix-uvc.patch index d9eaa9c1e06c56..e8acd069706f8d 100644 --- a/ports/azure-kinect-sensor-sdk/fix-uvc.patch +++ b/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 diff --git a/ports/azure-kinect-sensor-sdk/vcpkg.json b/ports/azure-kinect-sensor-sdk/vcpkg.json index 4226c5adf4d6cc..d54e59d4faefbd 100644 --- a/ports/azure-kinect-sensor-sdk/vcpkg.json +++ b/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", diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL deleted file mode 100644 index dd1c189875712c..00000000000000 --- a/ports/libjpeg-turbo/CONTROL +++ /dev/null @@ -1,10 +0,0 @@ -Source: libjpeg-turbo -Version: 2.0.6 -Homepage: https://github.com/libjpeg-turbo/libjpeg-turbo -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. - -Feature: jpeg7 -Description: Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!) - -Feature: jpeg8 -Description: Emulate libjpeg v8 API/ABI (this makes libjpeg-turbo backward-incompatible with libjpeg v6b!) diff --git a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch index 49dc8fe290626d..c8cc84d97311fd 100644 --- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch +++ b/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} $ -@@ -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 "$" -@@ -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) diff --git a/ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch b/ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch deleted file mode 100644 index c0aaf585b216cd..00000000000000 --- a/ports/libjpeg-turbo/fix-incompatibility-for-c11-c17.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tjutil.h b/tjutil.h -index f72840c..a3ae19f 100644 ---- a/tjutil.h -+++ b/tjutil.h -@@ -30,7 +30,7 @@ - #ifndef __MINGW32__ - #include - #define snprintf(str, n, format, ...) \ -- _snprintf_s(str, n, _TRUNCATE, format, __VA_ARGS__) -+ _snprintf_s(str, n, _TRUNCATE, format, ## __VA_ARGS__) - #endif - #define strcasecmp stricmp - #define strncasecmp strnicmp diff --git a/ports/libjpeg-turbo/fix-output-names.patch b/ports/libjpeg-turbo/fix-output-names.patch new file mode 100644 index 00000000000000..47227bb70ed743 --- /dev/null +++ b/ports/libjpeg-turbo/fix-output-names.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e4c6556..4bc92ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,6 +37,7 @@ endif() + message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}") + + message(STATUS "VERSION = ${VERSION}, BUILD = ${BUILD}") ++set(CMAKE_DEBUG_POSTFIX d) + + # Detect CPU type and whether we're building 64-bit or 32-bit code + math(EXPR BITS "${CMAKE_SIZEOF_VOID_P} * 8") +@@ -601,7 +602,7 @@ endif() + if(ENABLE_STATIC) + add_library(jpeg-static STATIC ${JPEG_SOURCES} $ + ${SIMD_OBJS}) +- if(NOT MSVC) ++ if(1) + set_target_properties(jpeg-static PROPERTIES OUTPUT_NAME jpeg) + endif() + endif() +@@ -661,7 +662,7 @@ if(WITH_TURBOJPEG) + rdppm.c wrbmp.c wrppm.c) + set_property(TARGET turbojpeg-static PROPERTY COMPILE_FLAGS + "-DBMP_SUPPORTED -DPPM_SUPPORTED") +- if(NOT MSVC) ++ if(1) + set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) + endif() + diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 302530c38568f7..4e937b7f58b94d 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -5,14 +5,14 @@ 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 + fix-output-names.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 +33,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( @@ -53,39 +54,27 @@ vcpkg_configure_cmake( vcpkg_install_cmake() -# Rename libraries for static builds -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/jpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/lib/turbojpeg-static.lib" "${CURRENT_PACKAGES_DIR}/lib/turbojpeg.lib") - endif() - 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) - endif() -else(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/jpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/jpegd.lib") - file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpeg.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/turbojpegd.lib") - endif() -endif() - set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libjpeg.pc") -if(EXISTS "${_file}" AND VCPKG_TARGET_IS_WINDOWS) +if(EXISTS "${_file}") vcpkg_replace_string("${_file}" "-ljpeg" "-ljpegd") +endif() + +set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libturbojpeg.pc") +if(EXISTS "${_file}") + vcpkg_replace_string("${_file}" "-lturbojpeg" "-lturbojpegd") 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) +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/share/man") -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(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) +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/libjpeg-turbo/vcpkg.json b/ports/libjpeg-turbo/vcpkg.json new file mode 100644 index 00000000000000..6c1ace94964078 --- /dev/null +++ b/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!)" + } + } +} diff --git a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch b/ports/libjpeg-turbo/workaround_cmake_system_processor.patch index 613504dfac9f9d..565a97a4050691 100644 --- a/ports/libjpeg-turbo/workaround_cmake_system_processor.patch +++ b/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) diff --git a/versions/a-/azure-kinect-sensor-sdk.json b/versions/a-/azure-kinect-sensor-sdk.json index 12f10ca85f24fb..7b7f5768da7fbd 100644 --- a/versions/a-/azure-kinect-sensor-sdk.json +++ b/versions/a-/azure-kinect-sensor-sdk.json @@ -1,9 +1,9 @@ { "versions": [ { - "git-tree": "dc7fdf585419fadcd96b13a800c4323b098256cd", + "git-tree": "ba58592f8f5c2e891fd7766e78705e7678a3c5af", "version": "1.4.1", - "port-version": 1 + "port-version": 2 }, { "git-tree": "28c9dbd6d17602e942cd81f9d70aeff80f3d83f0", diff --git a/versions/baseline.json b/versions/baseline.json index 4652e933959066..a0acf877e37dee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -278,7 +278,7 @@ }, "azure-kinect-sensor-sdk": { "baseline": "1.4.1", - "port-version": 1 + "port-version": 2 }, "azure-macro-utils-c": { "baseline": "2020-06-17", @@ -3277,7 +3277,7 @@ "port-version": 0 }, "libjpeg-turbo": { - "baseline": "2.0.6", + "baseline": "2.1.0", "port-version": 0 }, "libjuice": { diff --git a/versions/l-/libjpeg-turbo.json b/versions/l-/libjpeg-turbo.json index 6bcdc411f77f4e..d152847eea6c95 100644 --- a/versions/l-/libjpeg-turbo.json +++ b/versions/l-/libjpeg-turbo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec1a65f9962f76d2ca8021901a6b731eb459d86e", + "version": "2.1.0", + "port-version": 0 + }, { "git-tree": "42aed1a37d04ecdc437a4f52c6dd71740339f478", "version-string": "2.0.6",