3 files changed, 30 insertions, 4 deletions
diff --git a/ports/libwebp/0006-fix-dependecies-platform.patch b/ports/libwebp/0006-fix-dependecies-platform.patch
new file mode 100644
index 000000000..fdb5ec0b3
--- /dev/null
+++ b/ports/libwebp/0006-fix-dependecies-platform.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 83edb3a..f634094 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -540,7 +540,10 @@ if(WEBP_BUILD_EXTRAS)
+   find_package(SDL)
+   if(SDL_FOUND)
+     add_executable(vwebp_sdl ${VWEBP_SDL_SRCS})
+-    target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp dxguid winmm)
++    target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp)
++    if (MSVC)
++        target_link_libraries(vwebp_sdl dxguid winmm)
++    endif()
+     target_include_directories(vwebp_sdl
+                                PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
+                                        ${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL
index a22b389b4..02a65e5c0 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,5 +1,5 @@
 Source: libwebp
-Version: 1.0.2-4
+Version: 1.0.2-7
 Homepage: https://github.com/webmproject/libwebp
 Description: Lossy compression of digital photographic images.
 Build-Depends: opengl
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index 49590a982..9fb26d532 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_from_github(
     0003-remove-missing-symbol.patch
     0004-add-missing-linked-library.patch
     0005-fix-static-build.patch
+    0006-fix-dependecies-platform.patch
 )
 
 set(WEBP_BUILD_ANIM_UTILS OFF)
@@ -37,6 +38,12 @@ if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
     message("WebP currently requires the following library from the system package manager:\n    Xxf86vm\n\nThis can be installed on Ubuntu systems via apt-get install libxxf86vm-dev")
 endif()
 
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(WEBP_BUILD_VWEBP OFF)
+    set(WEBP_BUILD_EXTRAS OFF)
+    message("Due to GLUT Framework problems with CMake, at the moment it's not possible to build VWebP on Mac. It has been disabled together with extras.")
+endif()
+
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
@@ -63,8 +70,12 @@ vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "share/WebP/cmake/" TARGET_PATH "share/WebP/")
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/WebP/cmake)
+
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/WebP)
+file(GLOB CMAKE_FILES ${CURRENT_PACKAGES_DIR}/share/${PORT}/*)
+file(COPY ${CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/webp/)
 
 #somehow the native CMAKE_EXECUTABLE_SUFFIX does not work, so here we emulate it
 if(CMAKE_HOST_WIN32)
@@ -114,5 +125,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
   file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/libwebp/COPYING ${CURRENT_PACKAGES_DIR}/share/libwebp/copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libwebp RENAME copyright)