diff --git a/extra/libjpeg-turbo/checksums b/extra/libjpeg-turbo/checksums index efe26630..485efe68 100644 --- a/extra/libjpeg-turbo/checksums +++ b/extra/libjpeg-turbo/checksums @@ -1,2 +1,2 @@ -c3024449279a4adda95c620d4766c64fa8067d7b6a0949ff8437fcda7b03a5ec8e -c3d9309a2c8b77c966232ae5bbf40b69746c0a11f0b984830547c5844edb1229cc +29272eccaa9d0093a6cf80cad86e91f07c201e1b07f4f5e7f868c92f62c5452906 +43f3dc8f7190601b94cfd8015f252db39f6183f23aa7876c90e9bd76dd0fed455c diff --git a/extra/libjpeg-turbo/patches/no-docs.patch b/extra/libjpeg-turbo/patches/no-docs.patch index 0946f55c..8b4f18a0 100644 --- a/extra/libjpeg-turbo/patches/no-docs.patch +++ b/extra/libjpeg-turbo/patches/no-docs.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index efd101a..faa0bfb 100644 +index ff9c9c2..b8a5e56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -173,7 +173,6 @@ message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") +@@ -168,7 +168,6 @@ message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") if(CMAKE_INSTALL_PREFIX STREQUAL "${CMAKE_INSTALL_DEFAULT_PREFIX}") set(CMAKE_INSTALL_DEFAULT_DATAROOTDIR "") @@ -10,7 +10,7 @@ index efd101a..faa0bfb 100644 set(CMAKE_INSTALL_DEFAULT_JAVADIR "/classes") if(UNIX AND NOT APPLE) if(BITS EQUAL 64) -@@ -197,7 +196,7 @@ macro(report_directory var) +@@ -192,7 +191,7 @@ macro(report_directory var) mark_as_advanced(CLEAR CMAKE_INSTALL_${var}) endmacro() @@ -19,9 +19,9 @@ index efd101a..faa0bfb 100644 if(UNIX) list(APPEND DIRLIST "MANDIR") endif() -@@ -1734,18 +1733,6 @@ endif() - - install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +@@ -1778,19 +1777,6 @@ endif() + install(TARGETS rdjpgcom wrjpgcom + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg - ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.c @@ -29,10 +29,11 @@ index efd101a..faa0bfb 100644 - ${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}) +- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} +- COMPONENT doc) -if(WITH_JAVA) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java -- DESTINATION ${CMAKE_INSTALL_DOCDIR}) +- DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc) -endif() - if(UNIX OR MINGW) diff --git a/extra/libjpeg-turbo/sources b/extra/libjpeg-turbo/sources index e4efcde3..6356f554 100644 --- a/extra/libjpeg-turbo/sources +++ b/extra/libjpeg-turbo/sources @@ -1,2 +1,2 @@ -https://github.com/libjpeg-turbo/libjpeg-turbo/archive/3.0.2.tar.gz +https://github.com/libjpeg-turbo/libjpeg-turbo/archive/3.0.3.tar.gz patches/no-docs.patch diff --git a/extra/libjpeg-turbo/version b/extra/libjpeg-turbo/version index b0b71c8f..15049478 100644 --- a/extra/libjpeg-turbo/version +++ b/extra/libjpeg-turbo/version @@ -1 +1 @@ -3.0.2 1 +3.0.3 1