diff options
| author | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-13 23:55:59 -0800 |
|---|---|---|
| committer | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-13 23:55:59 -0800 |
| commit | 2514481b42ebdeec28649582fc666955cf206c84 (patch) | |
| tree | 60c9809a5c3c8adbad240a40b1088a6f8e42c019 /ports/libwebp | |
| parent | b751326c91c9a307aaf5e340b61ab9f2d1ad45a4 (diff) | |
| parent | 28eee51adb36f2165be846e77ef7b3ee5b3f8789 (diff) | |
| download | vcpkg-2514481b42ebdeec28649582fc666955cf206c84.tar.gz vcpkg-2514481b42ebdeec28649582fc666955cf206c84.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi
Diffstat (limited to 'ports/libwebp')
| -rw-r--r-- | ports/libwebp/0007-fix-arm-build.patch | 13 | ||||
| -rw-r--r-- | ports/libwebp/CONTROL | 5 | ||||
| -rw-r--r-- | ports/libwebp/portfile.cmake | 1 |
3 files changed, 16 insertions, 3 deletions
diff --git a/ports/libwebp/0007-fix-arm-build.patch b/ports/libwebp/0007-fix-arm-build.patch new file mode 100644 index 000000000..aae5e3957 --- /dev/null +++ b/ports/libwebp/0007-fix-arm-build.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake +index da9a42a4..ce7a69f3 100644 +--- a/cmake/cpu.cmake ++++ b/cmake/cpu.cmake +@@ -73,7 +73,7 @@ foreach(I_SIMD RANGE ${WEBP_SIMD_FLAGS_RANGE}) + set(CMAKE_REQUIRED_FLAGS ${SIMD_COMPILE_FLAG}) + webp_check_compiler_flag(${WEBP_SIMD_FLAG} ${WEBP_ENABLE_SIMD}) + else() +- if(MSVC) ++ if(MSVC AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM")) + list(GET SIMD_ENABLE_FLAGS ${I_SIMD} SIMD_COMPILE_FLAG) + else() + set(SIMD_COMPILE_FLAG " ") diff --git a/ports/libwebp/CONTROL b/ports/libwebp/CONTROL index 02a65e5c0..8dbe1d0a2 100644 --- a/ports/libwebp/CONTROL +++ b/ports/libwebp/CONTROL @@ -1,9 +1,8 @@ Source: libwebp -Version: 1.0.2-7 +Version: 1.0.2-8 Homepage: https://github.com/webmproject/libwebp Description: Lossy compression of digital photographic images. -Build-Depends: opengl Feature: all Description: enable all webp features -Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows) +Build-Depends: giflib, libjpeg-turbo, zlib, libpng, tiff, freeglut (!osx), sdl1 (windows), opengl diff --git a/ports/libwebp/portfile.cmake b/ports/libwebp/portfile.cmake index 9fb26d532..240aaad5c 100644 --- a/ports/libwebp/portfile.cmake +++ b/ports/libwebp/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_from_github( 0004-add-missing-linked-library.patch 0005-fix-static-build.patch 0006-fix-dependecies-platform.patch + 0007-fix-arm-build.patch ) set(WEBP_BUILD_ANIM_UTILS OFF) |