⬆️ Update dependencies for libvips 8.10.2

criteo · Nov 26, 2020 · 3528d6f · 3528d6f
1 parent 2dfc3b3
commit 3528d6f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,6 +11,9 @@ find_package(PkgConfig REQUIRED)
 find_package(Java 1.8 REQUIRED)
 include(UseJava)
 
+SET (CMAKE_C_COMPILER_WORKS 1)
+SET (CMAKE_CXX_COMPILER_WORKS 1)
+
 set(CMAKE_C_FLAGS "-std=c99")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS} -g3")
 set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3 -g")

diff --git a/Toolchain-linux.cmake b/Toolchain-linux.cmake
@@ -2,6 +2,7 @@ set(BUILD_TARGET linux)
 
 # the name of the target operating system
 SET(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSTEM_PROCESSOR AMD64)
 
 # which compilers to use for C and C++
 SET(CMAKE_C_COMPILER gcc)

diff --git a/Toolchain-x86_64-w64-mingw32.cmake b/Toolchain-x86_64-w64-mingw32.cmake
@@ -2,6 +2,7 @@ set(BUILD_TARGET w64)
 
 # the name of the target operating system
 SET(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSTEM_PROCESSOR AMD64)
 
 # which compilers to use for C and C++
 SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -92,14 +92,16 @@ endif()
 find_library(LIBJPEG jpeg turbojpeg PATHS "${EXT_INSTALL_DIR}/lib" NO_DEFAULT_PATH)
 if(NOT LIBJPEG)
     ExternalProject_Add(libjpeg
-      URL "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPG_VERSION}.tar.gz"
+      URL "https://sourceforge.net/projects/libjpeg-turbo/files/${JPG_VERSION}/libjpeg-turbo-${JPG_VERSION}.tar.gz/download"
       PREFIX "${CMAKE_CURRENT_BINARY_DIR}/libjpeg-turbo"
-      PATCH_COMMAND autoreconf -fiv
-      CONFIGURE_COMMAND ./configure
-      ${CONFIGURE_VARS}
-      --enable-shared
-      --disable-static
-      --with-jpeg8
+      CMAKE_ARGS
+      -DCMAKE_INSTALL_PREFIX=${EXT_INSTALL_DIR}
+      -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+      -DWITH_TURBOJPEG=ON
+      -DENABLE_SHARED=ON
+      -DENABLE_STATIC=OFF
+      -DWITH_JPEG8=ON
+      -DWITH_SIMD=ON
       BUILD_IN_SOURCE 1
       )
 else()
@@ -235,7 +237,7 @@ endif()
 find_library(LCMS2 lcms2 EXACT PATHS "${EXT_INSTALL_DIR}/lib" NO_DEFAULT_PATH)
 if(NOT LCMS2)
     ExternalProject_Add(lcms2
-      URL "https://github.com/mm2/Little-CMS/archive/lcms${LCMS2_VERSION}.tar.gz"
+      URL "https://sourceforge.net/projects/lcms/files/lcms/${LCMS2_VERSION}/lcms2-${LCMS2_VERSION}.tar.gz/download"
       PREFIX "${CMAKE_CURRENT_BINARY_DIR}/lcms2"
       CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/lcms2/src/lcms2/configure
       ${CONFIGURE_VARS}

diff --git a/lib/VERSIONS b/lib/VERSIONS
@@ -1,11 +1,11 @@
 LIQ_VERSION=2.12.6
 EXIF_VERSION=0.6.22
-JPG_VERSION=1.4.2
-PNG_VERSION=1.6.34
+JPG_VERSION=2.0.5
+PNG_VERSION=1.6.37
 SPNG_VERSION=0.6.0
 GIF_VERSION=5.1.4
-WEBP_VERSION=1.0.2
+WEBP_VERSION=1.1.0
 AOM_VERSION=2.0.0
 HEIF_VERSION=1.9.1
-LCMS2_VERSION=2.9
+LCMS2_VERSION=2.11
 VIPS_VERSION=8.10.2