aboutsummaryrefslogtreecommitdiff
path: root/ports/libwebp
diff options
context:
space:
mode:
authorAndrei Lebedev <lebdron@gmail.com>2019-06-12 08:25:07 +0300
committerAndrei Lebedev <lebdron@gmail.com>2019-06-12 08:25:07 +0300
commit34d19da9ffd0571bf16190ec4a16a04bef265900 (patch)
tree413690269c5f216194b9a0f72f0438b27ccfd68d /ports/libwebp
parentb395438c791ca9f78e383a1d571525eee785e67c (diff)
parent59a8a9c6248ed230b19028a44484ae5f06db697d (diff)
downloadvcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.tar.gz
vcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.zip
Merge branch 'master' into openssl-unix-dynamic
Diffstat (limited to 'ports/libwebp')
-rw-r--r--ports/libwebp/0005-fix-static-build.patch13
-rw-r--r--ports/libwebp/CONTROL2
-rw-r--r--ports/libwebp/portfile.cmake1
3 files changed, 15 insertions, 1 deletions
diff --git a/ports/libwebp/0005-fix-static-build.patch b/ports/libwebp/0005-fix-static-build.patch
new file mode 100644
index 000000000..f17713efd
--- /dev/null
+++ b/ports/libwebp/0005-fix-static-build.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7585fac..83edb3a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -540,7 +540,7 @@ 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)
++ target_link_libraries(vwebp_sdl ${SDL_LIBRARY} imageioutil webp dxguid winmm)
+ 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 11647702d..f4f01570a 100644
--- a/ports/libwebp/CONTROL
+++ b/ports/libwebp/CONTROL
@@ -1,5 +1,5 @@
Source: libwebp
-Version: 1.0.2-3
+Version: 1.0.2-4
Description: Lossy compression of digital photographic images.
Build-Depends: opengl
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake
index f0bd669ee..49590a982 100644
--- a/ports/libwebp/portfile.cmake
+++ b/ports/libwebp/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
0002-cmake-config-add-backwards-compatibility.patch
0003-remove-missing-symbol.patch
0004-add-missing-linked-library.patch
+ 0005-fix-static-build.patch
)
set(WEBP_BUILD_ANIM_UTILS OFF)