diff --git a/extra/libjpeg-turbo/build b/extra/libjpeg-turbo/build index 650b25f5..9fabf405 100755 --- a/extra/libjpeg-turbo/build +++ b/extra/libjpeg-turbo/build @@ -2,6 +2,8 @@ export DESTDIR="$1" +patch -p1 < no-docs.patch + cmake -B build \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ diff --git a/extra/libjpeg-turbo/checksums b/extra/libjpeg-turbo/checksums index 29007f85..f257f3e9 100644 --- a/extra/libjpeg-turbo/checksums +++ b/extra/libjpeg-turbo/checksums @@ -1 +1,2 @@ d6b7790927d658108dfd3bee2f0c66a2924c51ee7f9dc930f62c452f4a638c52 +65b93fadb0074502c3e0d17a2d57609b5cbcfddf29112450410374853278b4a6 diff --git a/extra/libjpeg-turbo/patches/no-docs.patch b/extra/libjpeg-turbo/patches/no-docs.patch new file mode 100644 index 00000000..41553896 --- /dev/null +++ b/extra/libjpeg-turbo/patches/no-docs.patch @@ -0,0 +1,40 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 10a198f..e9fe1ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -119,7 +119,6 @@ message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") + + if(CMAKE_INSTALL_PREFIX STREQUAL "${CMAKE_INSTALL_DEFAULT_PREFIX}") + set(CMAKE_INSTALL_DEFAULT_DATAROOTDIR "") +- set(CMAKE_INSTALL_DEFAULT_DOCDIR "/doc") + set(CMAKE_INSTALL_DEFAULT_JAVADIR "/classes") + if(UNIX AND NOT APPLE) + if(BITS EQUAL 64) +@@ -143,7 +142,7 @@ macro(report_directory var) + mark_as_advanced(CLEAR CMAKE_INSTALL_${var}) + endmacro() + +-set(DIRLIST "BINDIR;DATAROOTDIR;DOCDIR;INCLUDEDIR;LIBDIR") ++set(DIRLIST "BINDIR;DATAROOTDIR;INCLUDEDIR;LIBDIR") + if(UNIX) + list(APPEND DIRLIST "MANDIR") + endif() +@@ -1481,18 +1480,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}/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() +- + if(UNIX OR MINGW) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1 + ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1 diff --git a/extra/libjpeg-turbo/sources b/extra/libjpeg-turbo/sources index 80e0a267..7ba3be89 100644 --- a/extra/libjpeg-turbo/sources +++ b/extra/libjpeg-turbo/sources @@ -1 +1,2 @@ https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.1.0.tar.gz +patches/no-docs.patch