Merge pull request #851 from Mixaill/webp

[libwebp] update to 0.6.0

4 files changed, 24 insertions, 18 deletions

diff --git a/ports/libwebp/0001-add-install-to-cmake.patch b/ports/libwebp/0001-add-install-to-cmake.patch
index 3f9cfc0c5..206e87fc3 100644
--- a/ports/libwebp/0001-add-install-to-cmake.patch
+++ b/ports/libwebp/0001-add-install-to-cmake.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3cb9c3b..f05800d 100644
+index 0c62dd19..a2f72106 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -276,6 +276,16 @@ foreach(I_FILE RANGE ${WEBP_SIMD_FILES_TO_INCLUDE_RANGE})
+@@ -95,6 +95,16 @@ foreach(I_FILE RANGE ${WEBP_SIMD_FILES_TO_INCLUDE_RANGE})
    )
  endforeach()
  
@@ -17,5 +17,5 @@ index 3cb9c3b..f05800d 100644
 +        ARCHIVE DESTINATION lib)
 +
  # Build the executables if asked for.
- if(WEBP_BUILD_CWEBP OR WEBP_BUILD_DWEBP)
-   # Example utility library.
+ if(WEBP_BUILD_CWEBP OR WEBP_BUILD_DWEBP OR
+    WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
diff --git a/ports/libwebp/0002-add-missing-directory-to-cmake.patch b/ports/libwebp/0002-add-missing-directory-to-cmake.patch
index a1d230479..92c52a9c7 100644
--- a/ports/libwebp/0002-add-missing-directory-to-cmake.patch
+++ b/ports/libwebp/0002-add-missing-directory-to-cmake.patch
@@ -1,12 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9172f66..df46bd1 100644
+index a2f72106..469f03b4 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -249,6 +249,7 @@ parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/dec "${WEBP_SRCS}")
- parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/demux "${WEBP_SRCS}")
- parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/dsp "${WEBP_SRCS}")
- parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/enc "${WEBP_SRCS}")
-+parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "${WEBP_SRCS}")
- parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/utils "${WEBP_SRCS}")
+@@ -68,6 +68,7 @@ parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/dec "WEBP_SRCS")
+ parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/demux "WEBP_SRCS")
+ parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/dsp "WEBP_SRCS")
+ parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/enc "WEBP_SRCS")
++parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_SRCS")
+ parse_Makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/utils "WEBP_SRCS")
  
- # Remove the files specific to SIMD we don't user.
+ # Remove the files specific to SIMD we don't use.
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL
index 608ba2f59..2b3c36554 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,3 +1,3 @@
 Source: libwebp
-Version: 0.5.1-1
+Version: 0.6.0-1
 Description: Lossy compression of digital photographic images.
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index 8b4c653a9..2c70513b8 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -1,9 +1,13 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebp-0.5.1)
+
+set(WEBP_VERSION 0.6.0)
+set(WEBP_HASH 59491b3837c7c96e56407c479722ad48b08b6133b123b61f66c5f0b61a1e8222ed20006b5c6fc708791bed72ac65e707aa25635e07fd11c81f26cc1e23892f48)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebp-${WEBP_VERSION})
+
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/webmproject/libwebp/archive/v0.5.1.zip"
-    FILENAME "libwebp-0.5.1.zip"
-    SHA512 1d9b218e3b6df50e7bc71b1338619b142a9dcd6cb7cbde2e7a4182b12a353f4f1d830b94dbeb7e6e8aac6e6613ec1aa368ce00a6945cdb7686eb94b287b9fd4e
+    URLS "https://github.com/webmproject/libwebp/archive/v${WEBP_VERSION}.zip"
+    FILENAME "libwebp-${WEBP_VERSION}.zip"
+    SHA512 ${WEBP_HASH}
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
@@ -15,11 +19,13 @@ vcpkg_apply_patches(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     # dllexport support seem to be broken
-    OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS:BOOL=ON
+    OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON
             -DCMAKE_DEBUG_POSTFIX=d
 )
 
+vcpkg_build_cmake()
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)