diff --git a/extra/libjpeg-turbo/checksums b/extra/libjpeg-turbo/checksums index 7b983acb..2c396943 100644 --- a/extra/libjpeg-turbo/checksums +++ b/extra/libjpeg-turbo/checksums @@ -1,2 +1,2 @@ -78e77f4e1b1658954ee8cb5ddb6f5713b2d0d4d15c5e78d39095802beaaf417498 -7ef8273cce523c281379a593048d568f86cc65de0240afefae726c71342a9e4734 +1f2d7512ae290a567b4dcac824978f20c99a14faa3f1b0d6601fb55caf1ed12820 +c3d9309a2c8b77c966232ae5bbf40b69746c0a11f0b984830547c5844edb1229cc diff --git a/extra/libjpeg-turbo/patches/no-docs.patch b/extra/libjpeg-turbo/patches/no-docs.patch index 41553896..0946f55c 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 10a198f..e9fe1ce 100644 +index efd101a..faa0bfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -119,7 +119,6 @@ message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") +@@ -173,7 +173,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 10a198f..e9fe1ce 100644 set(CMAKE_INSTALL_DEFAULT_JAVADIR "/classes") if(UNIX AND NOT APPLE) if(BITS EQUAL 64) -@@ -143,7 +142,7 @@ macro(report_directory var) +@@ -197,7 +196,7 @@ macro(report_directory var) mark_as_advanced(CLEAR CMAKE_INSTALL_${var}) endmacro() @@ -19,12 +19,12 @@ index 10a198f..e9fe1ce 100644 if(UNIX) list(APPEND DIRLIST "MANDIR") endif() -@@ -1481,18 +1480,6 @@ endif() +@@ -1734,18 +1733,6 @@ endif() install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg -- ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.txt +- ${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 diff --git a/extra/libjpeg-turbo/sources b/extra/libjpeg-turbo/sources index 61fd481d..4b2bdb35 100644 --- a/extra/libjpeg-turbo/sources +++ b/extra/libjpeg-turbo/sources @@ -1,2 +1,2 @@ -https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.1.5.1.tar.gz +https://github.com/libjpeg-turbo/libjpeg-turbo/archive/3.0.0.tar.gz patches/no-docs.patch diff --git a/extra/libjpeg-turbo/version b/extra/libjpeg-turbo/version index 17a58bdb..4fc4c8a7 100644 --- a/extra/libjpeg-turbo/version +++ b/extra/libjpeg-turbo/version @@ -1 +1 @@ -2.1.5.1 1 +3.0.0 1