diff options
| -rw-r--r-- | tools/depends/native/libjpeg-turbo/01-disable-executables.patch | 24 | ||||
| -rw-r--r-- | tools/depends/native/libjpeg-turbo/LIBJPEG-TURBO-VERSION | 4 | ||||
| -rw-r--r-- | tools/depends/native/libjpeg-turbo/Makefile | 14 |
3 files changed, 19 insertions, 23 deletions
diff --git a/tools/depends/native/libjpeg-turbo/01-disable-executables.patch b/tools/depends/native/libjpeg-turbo/01-disable-executables.patch index 0753718d9c..8a672b2159 100644 --- a/tools/depends/native/libjpeg-turbo/01-disable-executables.patch +++ b/tools/depends/native/libjpeg-turbo/01-disable-executables.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -203,6 +203,9 @@ +@@ -211,6 +211,9 @@ boolean_number(WITH_TURBOJPEG) option(WITH_FUZZ "Build fuzz targets" FALSE) @@ -10,7 +10,7 @@ macro(report_option var desc) if(${var}) message(STATUS "${desc} enabled (${var} = ${${var}})") -@@ -646,6 +649,7 @@ +@@ -634,6 +637,7 @@ LINK_FLAGS "${TJMAPFLAG}${TJMAPFILE}") endif() @@ -18,7 +18,7 @@ add_executable(tjunittest tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) target_link_libraries(tjunittest turbojpeg) -@@ -657,6 +661,7 @@ +@@ -645,6 +649,7 @@ add_executable(tjexample tjexample.c) target_link_libraries(tjexample turbojpeg) @@ -26,7 +26,7 @@ endif() if(ENABLE_STATIC) -@@ -668,7 +673,7 @@ +@@ -656,7 +661,7 @@ if(NOT MSVC) set_target_properties(turbojpeg-static PROPERTIES OUTPUT_NAME turbojpeg) endif() @@ -35,7 +35,7 @@ add_executable(tjunittest-static tjunittest.c tjutil.c md5/md5.c md5/md5hl.c) target_link_libraries(tjunittest-static turbojpeg-static) -@@ -678,6 +683,7 @@ +@@ -666,6 +671,7 @@ if(UNIX) target_link_libraries(tjbench-static m) endif() @@ -43,7 +43,7 @@ endif() endif() -@@ -692,6 +698,7 @@ +@@ -680,6 +686,7 @@ set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c) endif() @@ -51,7 +51,7 @@ if(ENABLE_STATIC) add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c ${CJPEG_BMP_SOURCES}) -@@ -711,11 +718,12 @@ +@@ -699,11 +706,12 @@ add_executable(rdjpgcom rdjpgcom.c) add_executable(wrjpgcom wrjpgcom.c) @@ -65,7 +65,7 @@ if(WITH_FUZZ) add_subdirectory(fuzz) -@@ -1431,7 +1439,7 @@ +@@ -1419,7 +1427,7 @@ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tjbenchtest) endif() endif() @@ -74,7 +74,7 @@ ############################################################################### # INSTALLATION -@@ -1446,8 +1454,10 @@ +@@ -1434,8 +1442,10 @@ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) @@ -85,7 +85,7 @@ if(NOT CMAKE_VERSION VERSION_LESS "3.1" AND MSVC AND CMAKE_C_LINKER_SUPPORTS_PDB) install(FILES "$<TARGET_PDB_FILE:turbojpeg>" -@@ -1464,8 +1474,10 @@ +@@ -1452,8 +1462,10 @@ else() set(DIR ${CMAKE_CURRENT_BINARY_DIR}) endif() @@ -96,7 +96,7 @@ endif() endif() install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h -@@ -1476,6 +1488,7 @@ +@@ -1464,6 +1476,7 @@ install(TARGETS jpeg-static EXPORT ${CMAKE_PROJECT_NAME}Targets INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) @@ -104,7 +104,7 @@ if(NOT ENABLE_SHARED) if(MSVC_IDE OR XCODE) set(DIR "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}") -@@ -1490,8 +1503,11 @@ +@@ -1478,8 +1491,11 @@ DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME jpegtran${EXE}) endif() endif() diff --git a/tools/depends/native/libjpeg-turbo/LIBJPEG-TURBO-VERSION b/tools/depends/native/libjpeg-turbo/LIBJPEG-TURBO-VERSION new file mode 100644 index 0000000000..61eb00828e --- /dev/null +++ b/tools/depends/native/libjpeg-turbo/LIBJPEG-TURBO-VERSION @@ -0,0 +1,4 @@ +LIBNAME=libjpeg-turbo +VERSION=2.1.4 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=d3e92d614168355827e0ed884ff847cc7df8f6f1fb7b673c6c99afdf61fdfc0372afe5d30fdbf5e743335e2a7a27ca9f510c67d213e5cb2315a8d946e9414575 diff --git a/tools/depends/native/libjpeg-turbo/Makefile b/tools/depends/native/libjpeg-turbo/Makefile index bfbae212ed..26a1323168 100644 --- a/tools/depends/native/libjpeg-turbo/Makefile +++ b/tools/depends/native/libjpeg-turbo/Makefile @@ -1,15 +1,8 @@ -include ../../Makefile.include +include ../../Makefile.include LIBJPEG-TURBO-VERSION ../../download-files.include PREFIX=$(NATIVEPREFIX) PLATFORM=$(NATIVEPLATFORM) -DEPS = ../../Makefile.include Makefile 01-disable-executables.patch ../../download-files.include - -# lib name, version -LIBNAME=libjpeg-turbo -VERSION=2.1.1 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz -SHA512=9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673 -include ../../download-files.include +DEPS = ../../Makefile.include LIBJPEG-TURBO-VERSION Makefile ../../download-files.include \ + 01-disable-executables.patch CMAKE_OPTIONS := -DCMAKE_TOOLCHAIN_FILE= \ -DCMAKE_ASM_NASM_COMPILER:FILEPATH=$(NATIVEPREFIX)/bin/nasm \ @@ -24,7 +17,6 @@ LIBDYLIB=$(PLATFORM)/build/libjpeg.a all: .installed-$(PLATFORM) - $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) |