Merge pull request #1447 from codicodi/libjpeg-turbo-1.5.2

[libjpeg-turbo] update to 1.5.2

3 files changed, 20 insertions, 21 deletions

diff --git a/ports/libjpeg-turbo/CONTROL b/ports/libjpeg-turbo/CONTROL
index d9df1c43d..14dd8ad9b 100644
--- a/ports/libjpeg-turbo/CONTROL
+++ b/ports/libjpeg-turbo/CONTROL
@@ -1,3 +1,3 @@
 Source: libjpeg-turbo
-Version: 1.5.1-1
+Version: 1.5.2
 Description: libjpeg-turbo is a JPEG image codec that uses SIMD instructions (MMX, SSE2, NEON, AltiVec) to accelerate baseline JPEG compression and decompression on x86, x86-64, ARM, and PowerPC systems.
diff --git a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
index 5be2594c7..bd10a21bb 100644
--- a/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
+++ b/ports/libjpeg-turbo/add-options-for-exes-docs-headers.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bfb7661..5373cd7 100644
+index 131b437..c29e604 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -55,6 +55,9 @@ option(WITH_JAVA "Build Java wrapper for the TurboJPEG library" FALSE)
+@@ -62,6 +62,9 @@ option(WITH_JAVA "Build Java wrapper for the TurboJPEG library" FALSE)
  option(WITH_12BIT "Encode/decode JPEG images with 12-bit samples (implies WITH_SIMD=0 WITH_TURBOJPEG=0 WITH_ARITH_ENC=0 WITH_ARITH_DEC=0)" FALSE)
  option(ENABLE_STATIC "Build static libraries" TRUE)
  option(ENABLE_SHARED "Build shared libraries" TRUE)
@@ -12,7 +12,7 @@ index bfb7661..5373cd7 100644
  
  if(WITH_12BIT)
    set(WITH_SIMD FALSE)
-@@ -264,14 +267,16 @@ if(WITH_TURBOJPEG)
+@@ -279,14 +282,16 @@ if(WITH_TURBOJPEG)
      target_link_libraries(turbojpeg jpeg-static)
      set_target_properties(turbojpeg PROPERTIES LINK_INTERFACE_LIBRARIES "")
  
@@ -36,7 +36,7 @@ index bfb7661..5373cd7 100644
    endif()
  
    if(ENABLE_STATIC)
-@@ -284,14 +289,16 @@ if(WITH_TURBOJPEG)
+@@ -299,14 +304,16 @@ if(WITH_TURBOJPEG)
        add_dependencies(turbojpeg-static simd)
      endif()
  
@@ -60,7 +60,7 @@ index bfb7661..5373cd7 100644
    endif()
  endif()
  
-@@ -303,7 +310,7 @@ else()
+@@ -318,7 +325,7 @@ else()
    set(DJPEG_BMP_SOURCES wrbmp.c wrtarga.c)
  endif()
  
@@ -69,7 +69,7 @@ index bfb7661..5373cd7 100644
    add_executable(cjpeg-static cjpeg.c cdjpeg.c rdgif.c rdppm.c rdswitch.c
      ${CJPEG_BMP_SOURCES})
    set_property(TARGET cjpeg-static PROPERTY COMPILE_FLAGS ${COMPILE_FLAGS})
-@@ -319,10 +326,11 @@ if(ENABLE_STATIC)
+@@ -334,10 +341,11 @@ if(ENABLE_STATIC)
    set_property(TARGET jpegtran-static PROPERTY COMPILE_FLAGS "-DUSE_SETMODE")
  endif()
  
@@ -84,7 +84,7 @@ index bfb7661..5373cd7 100644
  
  #
  # Tests
-@@ -880,24 +888,30 @@ add_custom_target(installer
+@@ -917,24 +925,30 @@ add_custom_target(installer
  
  if(WITH_TURBOJPEG)
    if(ENABLE_SHARED)
@@ -119,7 +119,7 @@ index bfb7661..5373cd7 100644
      install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/cjpeg-static.exe
        DESTINATION bin RENAME cjpeg.exe)
      install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/djpeg-static.exe
-@@ -907,14 +921,20 @@ if(ENABLE_STATIC)
+@@ -944,17 +958,23 @@ if(ENABLE_STATIC)
    endif()
  endif()
  
@@ -149,6 +149,10 @@ index bfb7661..5373cd7 100644
 +    ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h
 +    DESTINATION include)
 +endif()
+ 
+ configure_file("${CMAKE_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in"
+   "cmake_uninstall.cmake" IMMEDIATE @ONLY)
+
 diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt
 index d423cce..9da7c6e 100644
 --- a/sharedlib/CMakeLists.txt
diff --git a/ports/libjpeg-turbo/portfile.cmake b/ports/libjpeg-turbo/portfile.cmake
index 995e8e0ee..d1138dbbf 100644
--- a/ports/libjpeg-turbo/portfile.cmake
+++ b/ports/libjpeg-turbo/portfile.cmake
@@ -1,16 +1,12 @@
 include(vcpkg_common_functions)
-
-set(LIBJPEGTURBO_VERSION 1.5.1)
-set(LIBJPEGTURBO_HASH "7b89f3c707daa98b0ed19ec417aab5273a1248ce7f98722a671ea80558a8eb0e73b136ce7be7c059f9f42262e682743abcab64e325f82cd4bd1531e0a4035209")
-
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libjpeg-turbo-${LIBJPEGTURBO_VERSION})
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${LIBJPEGTURBO_VERSION}.zip"
-    FILENAME "libjpeg-turbo-${LIBJPEGTURBO_VERSION}.zip"
-    SHA512 ${LIBJPEGTURBO_HASH}
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libjpeg-turbo/libjpeg-turbo
+    REF 1.5.2
+    SHA512 43f0c3e8c87bef4f0010827fd3c245df2467c0a6c714d2984284d3a64f933d06bbffc9fb893c8f3f2cd7f8fce2702cf39074c34e5bf370d90d1ca0d03c803590
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES "${CMAKE_CURRENT_LIST_DIR}/add-options-for-exes-docs-headers.patch"
@@ -45,7 +41,6 @@ vcpkg_configure_cmake(
     OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
 )
 
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 
 # Rename libraries for static builds