[libwebp] update to 0.6.1

4 files changed, 5 insertions, 42 deletions

diff --git a/ports/libwebp/0001-add-install-to-cmake.patch b/ports/libwebp/0001-add-install-to-cmake.patch
deleted file mode 100644
index 206e87fc3..000000000
--- a/ports/libwebp/0001-add-install-to-cmake.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0c62dd19..a2f72106 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -95,6 +95,16 @@ foreach(I_FILE RANGE ${WEBP_SIMD_FILES_TO_INCLUDE_RANGE})
-   )
- endforeach()
- 
-+# Install the headers
-+file(GLOB PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/*.h)
-+install(FILES ${PUBLIC_HEADERS} DESTINATION include/webp)
-+
-+# Install the library
-+install(TARGETS webp
-+        RUNTIME DESTINATION bin
-+        LIBRARY DESTINATION lib
-+        ARCHIVE DESTINATION lib)
-+
- # Build the executables if asked for.
- 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
deleted file mode 100644
index 92c52a9c7..000000000
--- a/ports/libwebp/0002-add-missing-directory-to-cmake.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a2f72106..469f03b4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -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 use.
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL
index e042390f4..0e63f5b39 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,3 +1,3 @@
 Source: libwebp
-Version: 0.6.0-2
+Version: 0.6.1
 Description: Lossy compression of digital photographic images.
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index 2c70513b8..22c028452 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -1,7 +1,7 @@
 include(vcpkg_common_functions)
 
-set(WEBP_VERSION 0.6.0)
-set(WEBP_HASH 59491b3837c7c96e56407c479722ad48b08b6133b123b61f66c5f0b61a1e8222ed20006b5c6fc708791bed72ac65e707aa25635e07fd11c81f26cc1e23892f48)
+set(WEBP_VERSION 0.6.1)
+set(WEBP_HASH f2512db136c9d9a455463134df1aff427f9d603aedd4cabd97ad26f3fa717806427f10a3162a94322900f2457268c867f1b655fc2a6a99d58c4141145979797a)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libwebp-${WEBP_VERSION})
 
 vcpkg_download_distfile(ARCHIVE
@@ -11,12 +11,6 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-add-install-to-cmake.patch
-            ${CMAKE_CURRENT_LIST_DIR}/0002-add-missing-directory-to-cmake.patch
-)
-
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -29,6 +23,8 @@ vcpkg_build_cmake()
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp)