diff --git a/ports/libwebp/0007-fix-arm-build.patch b/ports/libwebp/0007-fix-arm-build.patch index 909b7c2930..4f0111dcc7 100644 --- a/ports/libwebp/0007-fix-arm-build.patch +++ b/ports/libwebp/0007-fix-arm-build.patch @@ -1,13 +1,22 @@ diff --git a/cmake/cpu.cmake b/cmake/cpu.cmake -index bc0dbc9..381f64a 100644 +index bc0dbc9..f9b7327 100644 --- a/cmake/cpu.cmake +++ b/cmake/cpu.cmake +@@ -48,7 +48,7 @@ if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "MSVC") + if(MSVC_VERSION GREATER_EQUAL 1800 AND NOT CMAKE_C_FLAGS MATCHES "/arch:") + set(SIMD_ENABLE_FLAGS) + else() +- set(SIMD_ENABLE_FLAGS "/arch:AVX;/arch:SSE2;;;;") ++ set(SIMD_ENABLE_FLAGS "/arch:SSE2;;;;;") + endif() + set(SIMD_DISABLE_FLAGS) + else() @@ -97,7 +97,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 AND SIMD_ENABLE_FLAGS) -+ if(MSVC AND SIMD_ENABLE_FLAGS AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM")) ++ if(MSVC AND NOT (CMAKE_GENERATOR_PLATFORM MATCHES "^ARM")) # The detection for SSE2/SSE4 support under MSVC is based on the compiler # version so e.g., clang-cl will require flags to enable the assembly. list(GET SIMD_ENABLE_FLAGS ${I_SIMD} SIMD_COMPILE_FLAG) diff --git a/ports/libwebp/vcpkg.json b/ports/libwebp/vcpkg.json index e59cd8bc92..47d3e45479 100644 --- a/ports/libwebp/vcpkg.json +++ b/ports/libwebp/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libwebp", "version": "1.3.0", + "port-version": 1, "description": "WebP codec: library to encode and decode images in WebP format", "homepage": "https://github.com/webmproject/libwebp", "license": "BSD-3-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index f138f2f3cc..b4daf4e3b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4770,7 +4770,7 @@ }, "libwebp": { "baseline": "1.3.0", - "port-version": 0 + "port-version": 1 }, "libwebsockets": { "baseline": "4.3.2", diff --git a/versions/l-/libwebp.json b/versions/l-/libwebp.json index f6af4d9993..c04afa52f4 100644 --- a/versions/l-/libwebp.json +++ b/versions/l-/libwebp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "519daa6213a5995a860ed724c465adf9ff83b52a", + "version": "1.3.0", + "port-version": 1 + }, { "git-tree": "d11b6a22e2acdba95c761dd4045cd8d66095f42d", "version": "1.3.0",