diff options
| author | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2020-01-16 19:39:47 +0100 |
|---|---|---|
| committer | Alexander Neumann <Alexander.Neumann@hamburg.de> | 2020-01-16 19:39:47 +0100 |
| commit | af2bf73d302fcfc6650f041e51c6bb32c469d4cd (patch) | |
| tree | 384505fac88798d558cd3dd2b20b5eda2983bba5 | |
| parent | 68d7204560dc0f72c22732a6d840a45edf91531b (diff) | |
| download | vcpkg-af2bf73d302fcfc6650f041e51c6bb32c469d4cd.tar.gz vcpkg-af2bf73d302fcfc6650f041e51c6bb32c469d4cd.zip | |
always build mux library
| -rw-r--r-- | ports/freeimage/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libwebp/0001-build.patch | 2 | ||||
| -rw-r--r-- | ports/libwebp/0003-always-mux.patch | 13 | ||||
| -rw-r--r-- | ports/libwebp/portfile.cmake | 1 |
4 files changed, 16 insertions, 2 deletions
diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index 2335687c8..438960011 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,5 +1,5 @@ Source: freeimage Version: 3.18.0-9 -Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp[img2webp] (!uwp), libraw, jxrlib, openexr +Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp (!uwp), libraw, jxrlib, openexr Homepage: https://sourceforge.net/projects/freeimage/ Description: Support library for graphics image formats diff --git a/ports/libwebp/0001-build.patch b/ports/libwebp/0001-build.patch index 19c28bcca..25166e292 100644 --- a/ports/libwebp/0001-build.patch +++ b/ports/libwebp/0001-build.patch @@ -17,7 +17,7 @@ index 9503daacb..2fb9ef137 100644 ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux_types.h;\ ${CMAKE_CURRENT_SOURCE_DIR}/src/webp/types.h;") - set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux) -+ #set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME webpmux) ++ set_target_properties(libwebpmux PROPERTIES OUTPUT_NAME $<$<PLATFORM_ID:Windows>:lib>webpmux) list(APPEND INSTALLED_LIBRARIES libwebpmux) configure_pkg_config("src/mux/libwebpmux.pc") endif() diff --git a/ports/libwebp/0003-always-mux.patch b/ports/libwebp/0003-always-mux.patch new file mode 100644 index 000000000..1484bc891 --- /dev/null +++ b/ports/libwebp/0003-always-mux.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6f6c8eca2..00366ae53 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -405,7 +405,7 @@ if(WEBP_BUILD_CWEBP) + install(TARGETS cwebp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+
+-if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP)
++if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP OR TRUE)
+ parse_makefile_am(${CMAKE_CURRENT_SOURCE_DIR}/src/mux "WEBP_MUX_SRCS" "")
+ add_library(libwebpmux ${WEBP_MUX_SRCS})
+ target_link_libraries(libwebpmux webp)
diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 74937095b..12e980d42 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( PATCHES 0001-build.patch 0002-cmake-config-add-backwards-compatibility.patch + 0003-always-mux.patch #always build libwebpmux 0004-add-missing-linked-library.patch 0006-fix-dependecies-platform.patch 0007-fix-arm-build.patch |