diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-02-05 17:52:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-05 17:52:51 -0800 |
| commit | 0ba50612fbbfb9d64f9c60825847c12f956666c6 (patch) | |
| tree | 7a5d2dd43d48b13ecbd7e843934283747f991ca6 /ports/libwebp/0001-build.patch | |
| parent | d3b4a5a307f5b551190543a75f3ea2529aa0f02d (diff) | |
| parent | 3310f8e728e95071943097fe07b4f0135394f4e0 (diff) | |
| download | vcpkg-0ba50612fbbfb9d64f9c60825847c12f956666c6.tar.gz vcpkg-0ba50612fbbfb9d64f9c60825847c12f956666c6.zip | |
Merge pull request #9635 from Neumann-A/improve_libwebp
[libwebp] Update to 1.1.0 and improve portfile
Diffstat (limited to 'ports/libwebp/0001-build.patch')
| -rw-r--r-- | ports/libwebp/0001-build.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/ports/libwebp/0001-build.patch b/ports/libwebp/0001-build.patch new file mode 100644 index 000000000..e95468c32 --- /dev/null +++ b/ports/libwebp/0001-build.patch @@ -0,0 +1,46 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9503daacb..2fb9ef137 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,6 +167,9 @@ add_definitions(-DHAVE_CONFIG_H) + if(MSVC) + # avoid security warnings for e.g., fopen() used in the examples. + add_definitions(-D_CRT_SECURE_NO_WARNINGS) ++ if(BUILD_SHARED_LIBS) ++ add_definitions("-DWEBP_EXTERN=__declspec(dllexport)" "-DWEBP_DLL") ++ endif() + else() + add_definitions(-Wall) + endif() +@@ -420,9 +423,9 @@ if(WEBP_BUILD_GIF2WEBP OR WEBP_BUILD_IMG2WEBP) + "${CMAKE_CURRENT_SOURCE_DIR}/src/webp/mux.h;\ + ${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 $<$<PLATFORM_ID:Windows>:lib>webpmux) + list(APPEND INSTALLED_LIBRARIES libwebpmux) + configure_pkg_config("src/mux/libwebpmux.pc") + endif() + + if(WEBP_BUILD_GIF2WEBP) +@@ -524,7 +528,11 @@ if(WEBP_BUILD_EXTRAS) + + # webp_quality + add_executable(webp_quality ${WEBP_QUALITY_SRCS} ${WEBP_EXTRAS_SRCS}) + target_link_libraries(webp_quality exampleutil imagedec) ++ if(BUILD_SHARED_LIBS) ++ target_link_libraries(webp_quality webpdspdecode) ++ endif() + target_include_directories(webp_quality + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ++ ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_BINARY_DIR}) +@@ -573,7 +573,7 @@ if(WEBP_BUILD_WEBP_JS) + "-s EXPORTED_FUNCTIONS='[\"_WebpToSDL\"]' -s INVOKE_RUN=0 \ + -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]'") + set_target_properties(webp_js PROPERTIES OUTPUT_NAME webp) +- target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL) ++ target_compile_definitions(webp_js PUBLIC EMSCRIPTEN WEBP_HAVE_SDL WEBP_HAVE_JUST_SDL_H) + + # WASM version + add_executable(webp_wasm ${CMAKE_CURRENT_SOURCE_DIR}/extras/webp_to_sdl.c) |