diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL index fa72d68b0bd113..7671cdd6ae55e8 100644 --- a/ports/libjpeg-turbo/CONTROL +++ b/ports/libjpeg-turbo/CONTROL @@ -1,3 +1,3 @@ Source: libjpeg-turbo -Version: 1.5.3-1 +Version: 2.0.0-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. 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 bd10a21bbf2347..b043cbd610e7b2 100644 --- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch +++ b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch @@ -1,66 +1,74 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 131b437..c29e604 100644 +index 1719522..90fd259 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -62,6 +62,9 @@ option(WITH_JAVA "Build Java wrapper for the TurboJPEG library" FALSE) - option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_SIMD=0 WITH_TURBOJPEG=0 WITH_ARITH_ENC=0 WITH_ARITH_DEC=0)" FALSE) +@@ -145,6 +145,12 @@ option(ENABLE_SHARED "Build shared libraries" TRUE) + boolean_number(ENABLE_SHARED) option(ENABLE_STATIC "Build static libraries" TRUE) - option(ENABLE_SHARED "Build shared libraries" TRUE) + boolean_number(ENABLE_STATIC) +option(ENABLE_EXECUTABLES "Build executables" TRUE) ++boolean_number(ENABLE_EXECUTABLE) +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) + 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) +@@ -591,17 +597,19 @@ if(WITH_TURBOJPEG) + LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}") + endif() - if(WITH_12BIT) - set(WITH_SIMD FALSE) -@@ -279,14 +282,16 @@ if(WITH_TURBOJPEG) - target_link_libraries(turbojpeg jpeg-static) - set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "") - -- add_executable(tjunittest tjunittest.c tjutil.c) +- 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) ++ add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) + target_link_libraries(tjunittest turbojpeg) -- add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c -- wrppm.c) -- target_link_libraries(tjbench turbojpeg jpeg-static) -- set_property(TARGET tjbench PROPERTY COMPILE_FLAGS -- "-DBMP_SUPPORTED -DPPM_SUPPORTED") -+ add_executable(tjbench tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c wrbmp.c -+ wrppm.c) -+ target_link_libraries(tjbench turbojpeg jpeg-static) -+ set_property(TARGET tjbench PROPERTY COMPILE_FLAGS -+ "-DBMP_SUPPORTED -DPPM_SUPPORTED") +- 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) ++ add_executable(tjexample tjexample.c) ++ target_link_libraries(tjexample turbojpeg) + endif() endif() if(ENABLE_STATIC) -@@ -299,14 +304,16 @@ if(WITH_TURBOJPEG) - add_dependencies(turbojpeg-static simd) +@@ -614,14 +622,16 @@ if(WITH_TURBOJPEG) + set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) endif() -- add_executable(tjunittest-static tjunittest.c tjutil.c) +- 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) ++ 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 bmp.c tjutil.c rdbmp.c rdppm.c -- wrbmp.c wrppm.c) -- target_link_libraries(tjbench-static turbojpeg-static jpeg-static) -- set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS -- "-DBMP_SUPPORTED -DPPM_SUPPORTED") -+ add_executable(tjbench-static tjbench.c bmp.c tjutil.c rdbmp.c rdppm.c -+ wrbmp.c wrppm.c) -+ target_link_libraries(tjbench-static turbojpeg-static jpeg-static) -+ set_property(TARGET tjbench-static PROPERTY COMPILE_FLAGS -+ "-DBMP_SUPPORTED -DPPM_SUPPORTED") -+ endif() +- 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() + endif() endif() endif() - -@@ -318,7 +325,7 @@ else() +@@ -637,7 +647,7 @@ else() set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c) endif() @@ -69,96 +77,111 @@ index 131b437..c29e604 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}) -@@ -334,10 +341,11 @@ if(ENABLE_STATIC) - set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "-DUSE_SETMODE") +@@ -653,10 +663,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() - # - # Tests -@@ -917,24 +925,30 @@ add_custom_target(installer + ############################################################################### + # TESTS +@@ -1324,21 +1335,27 @@ set(EXE ${CMAKE_EXECUTABLE_SUFFIX}) if(WITH_TURBOJPEG) if(ENABLE_SHARED) - install(TARGETS turbojpeg tjbench + install(TARGETS turbojpeg - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin) + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + if(ENABLE_EXECUTABLES) + install(TARGETS tjbench + RUNTIME DESTINATION bin) + endif() endif() if(ENABLE_STATIC) - install(TARGETS turbojpeg-static ARCHIVE DESTINATION lib) + install(TARGETS turbojpeg-static ARCHIVE + DESTINATION ${CMAKE_INSTALL_LIBDIR}) - if(NOT ENABLE_SHARED) + if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static.exe - DESTINATION bin RENAME tjbench.exe) + install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/tjbench-static${EXE} + DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME tjbench${EXE}) endif() endif() -- install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include) +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h +- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + if(INSTALL_HEADERS) -+ install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION include) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) + endif() endif() if(ENABLE_STATIC) - install(TARGETS jpeg-static ARCHIVE DESTINATION lib) -- if(NOT ENABLE_SHARED) -+ if(NOT ENABLE_SHARED AND ENABLE_EXECUTABLES) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static.exe - DESTINATION bin RENAME cjpeg.exe) - install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static.exe -@@ -944,17 +958,23 @@ if(ENABLE_STATIC) +@@ -1353,18 +1370,22 @@ if(ENABLE_STATIC) endif() endif() --install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin) +-install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +if(ENABLE_EXECUTABLES) -+ install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION bin) ++ install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() --install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md -- ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt -- ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt -- ${CMAKE_SOURCE_DIR}/wizard.txt -- DESTINATION doc) +-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_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md -+ ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt -+ ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt -+ ${CMAKE_SOURCE_DIR}/wizard.txt -+ DESTINATION doc) -+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}) ++ endif() + endif() --install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h -- ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h -- DESTINATION include) + if(UNIX OR MINGW) +@@ -1378,10 +1399,12 @@ if(UNIX OR MINGW) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + +-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}) +if(INSTALL_HEADERS) -+ install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h -+ ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h -+ DESTINATION include) ++ 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() - configure_file("${CMAKE_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in" - "cmake_uninstall.cmake" IMMEDIATE @ONLY) - + include(cmakescripts/BuildPackages.cmake) + diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt -index d423cce..9da7c6e 100644 +index 2bab832..ae17882 100755 --- a/sharedlib/CMakeLists.txt +++ b/sharedlib/CMakeLists.txt -@@ -50,24 +50,31 @@ else() - set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c) +@@ -70,24 +70,26 @@ else() + set(DJPEG_BMP_SOURCES ../wrbmp.c ../wrtarga.c) endif() -add_executable(cjpeg ../cjpeg.c ../cdjpeg.c ../rdgif.c ../rdppm.c @@ -182,10 +205,10 @@ index d423cce..9da7c6e 100644 -add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c) -target_link_libraries(jpegtran jpeg) --set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "-DUSE_SETMODE") +-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 "-DUSE_SETMODE") ++ set_property(TARGET jpegtran PROPERTY COMPILE_FLAGS "${USE_SETMODE}") -add_executable(jcstest ../jcstest.c) -target_link_libraries(jcstest jpeg) @@ -193,13 +216,12 @@ index d423cce..9da7c6e 100644 + target_link_libraries(jcstest jpeg) -install(TARGETS jpeg cjpeg djpeg jpegtran -+ install(TARGETS cjpeg djpeg jpegtran -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin) +- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} +- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) ++ install(TARGETS jpeg cjpeg djpeg jpegtran ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +endif() -+ -+install(TARGETS jpeg - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin) +\ No newline at end of file diff --git a/ports/libjpeg-turbo/linux-cmake.patch b/ports/libjpeg-turbo/linux-cmake.patch deleted file mode 100644 index 48a04279fd2d5a..00000000000000 --- a/ports/libjpeg-turbo/linux-cmake.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c29e604..6e467be 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,10 +29,6 @@ pad_number(VERSION_MINOR 3) - pad_number(VERSION_REVISION 3) - set(LIBJPEG_TURBO_VERSION_NUMBER ${VERSION_MAJOR}${VERSION_MINOR}${VERSION_REVISION}) - --if(NOT WIN32) -- message(FATAL_ERROR "Platform not supported by this build system. Use autotools instead.") --endif() -- - string(TIMESTAMP BUILD "%Y%m%d") - - # This does nothing except when using MinGW. CMAKE_BUILD_TYPE has no meaning -@@ -166,8 +162,10 @@ endif() - - if(64BIT) - message(STATUS "64-bit build") -+ add_compile_options(-DSIZEOF_SIZE_T=8) - else() - message(STATUS "32-bit build") -+ add_compile_options(-DSIZEOF_SIZE_T=4) - endif() - - if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake index 7f6bc49732d3c8..1260bb6deadf5c 100644 --- a/ports/libjpeg-turbo/portfile.cmake +++ b/ports/libjpeg-turbo/portfile.cmake @@ -2,22 +2,10 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libjpeg-turbo/libjpeg-turbo - REF 1.5.3 - SHA512 0e7a2cd9943b610f49b562c20a5c350a50326a87bce1d39f14fe45760ed2f89a0d2d3e3f0de9f6a7714f566aabadec6b2422b592591ebb98bbad600ea411fea7 + REF 2.0.0 + SHA512 e280d94ed35d41a881dfe78048620ab0345449137237cab3505ca3afed28dd11a9b6cb249406121ab79ad07f12bf4df6d29bfdbe0bb719c2169b5d5ce2aa33d0 HEAD_REF master -) - -vcpkg_download_distfile(GETENV_PATCH - URLS "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff" - FILENAME "libjpeg-turbo-bd96b30b74fe166fc94218cfc64a097fafdcc05f.diff" - SHA512 4cd064521b5e4baba4adf972f9f574f6dd43a2cd3e3ad143ca2cdf0f165024406d4fd2ed094124d0c17c5370394140e82fdd892d3cdc49609acdf8f79db1758c -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/add-options-for-exes-docs-headers.patch" - "${CMAKE_CURRENT_LIST_DIR}/linux-cmake.patch" - "${GETENV_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"))