diff --git a/extra/libjpeg-turbo/checksums b/extra/libjpeg-turbo/checksums index 34bc85b5..06d80a52 100644 --- a/extra/libjpeg-turbo/checksums +++ b/extra/libjpeg-turbo/checksums @@ -1,2 +1,2 @@ -3e2bc34658ffb966cf99b5fcc1a20451c6c9077d95e6f77676f31001d9eddcdb53 -43f3dc8f7190601b94cfd8015f252db39f6183f23aa7876c90e9bd76dd0fed455c +a3ceb19a16b04b3f27d1c5c0f0f4caab4d6d5ff3f3c30edfdd088b5d9d50c2b647 +691c8e121b029dc8b04c62047269c7e5a047710394dca8c7b04d232b410162d481 diff --git a/extra/libjpeg-turbo/patches/no-docs.patch b/extra/libjpeg-turbo/patches/no-docs.patch index 8b4f18a0..3c5af58a 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 ff9c9c2..b8a5e56 100644 +index 9c4e5e2..b150641 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -168,7 +168,6 @@ message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") +@@ -175,7 +175,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 ff9c9c2..b8a5e56 100644 set(CMAKE_INSTALL_DEFAULT_JAVADIR "/classes") if(UNIX AND NOT APPLE) if(BITS EQUAL 64) -@@ -192,7 +191,7 @@ macro(report_directory var) +@@ -199,7 +198,7 @@ macro(report_directory var) mark_as_advanced(CLEAR CMAKE_INSTALL_${var}) endmacro() @@ -19,23 +19,29 @@ index ff9c9c2..b8a5e56 100644 if(UNIX) list(APPEND DIRLIST "MANDIR") endif() -@@ -1778,19 +1777,6 @@ endif() +@@ -2020,25 +2019,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 -- ${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}/README.md +- ${CMAKE_CURRENT_SOURCE_DIR}/src/example.c +- ${CMAKE_CURRENT_SOURCE_DIR}/src/tjcomp.c +- ${CMAKE_CURRENT_SOURCE_DIR}/src/tjdecomp.c +- ${CMAKE_CURRENT_SOURCE_DIR}/src/tjtran.c +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/libjpeg.txt +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/structure.txt +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/usage.txt +- ${CMAKE_CURRENT_SOURCE_DIR}/doc/wizard.txt - ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${CMAKE_INSTALL_DOCDIR} - COMPONENT doc) -if(WITH_JAVA) -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJExample.java +- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/java/TJComp.java +- ${CMAKE_CURRENT_SOURCE_DIR}/java/TJDecomp.java +- ${CMAKE_CURRENT_SOURCE_DIR}/java/TJTran.java - DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT doc) -endif() - if(UNIX OR MINGW) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1 - ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1 + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/cjpeg.1 + ${CMAKE_CURRENT_SOURCE_DIR}/doc/djpeg.1 diff --git a/extra/libjpeg-turbo/sources b/extra/libjpeg-turbo/sources index 11fcd937..e3470f2e 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.4.tar.gz +https://github.com/libjpeg-turbo/libjpeg-turbo/archive/3.1.0.tar.gz patches/no-docs.patch diff --git a/extra/libjpeg-turbo/version b/extra/libjpeg-turbo/version index aba54801..980778df 100644 --- a/extra/libjpeg-turbo/version +++ b/extra/libjpeg-turbo/version @@ -1 +1 @@ -3.0.4 1 +3.1.0 1