Skip to content

Commit

Permalink
[libavif] Update to 1.1.1 (#41569)
Browse files Browse the repository at this point in the history
Co-authored-by: LilyWangLL <4945507022qq.com>
  • Loading branch information
LilyWangLL authored Oct 16, 2024
1 parent cf806a3 commit b171fee
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 81 deletions.
24 changes: 12 additions & 12 deletions ports/libavif/disable-source-utf8.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d9431c..29d7d60 100644
index baf5964..a28e6c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,8 +161,8 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
# A C4556 warning will be generated on violation.
# Commonly used /utf-8 flag assumes UTF-8 for both source and console, which is usually not the case.
# Warnings can be suppressed but there will still be random characters printed to the console.
- /source-charset:utf-8
- /execution-charset:us-ascii
+ #/source-charset:utf-8
+ #/execution-charset:us-ascii
)
else()
message(FATAL_ERROR "libavif: Unknown compiler, bailing out")
@@ -296,8 +296,8 @@ if(MSVC)
# A C4556 warning will be generated on violation.
# Commonly used /utf-8 flag assumes UTF-8 for both source and console, which is usually not the case.
# Warnings can be suppressed but there will still be random characters printed to the console.
- /source-charset:utf-8
- /execution-charset:us-ascii
+ #/source-charset:utf-8
+ #/execution-charset:us-ascii
>
)
endif()
63 changes: 0 additions & 63 deletions ports/libavif/find-dependency.patch

This file was deleted.

4 changes: 2 additions & 2 deletions ports/libavif/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO AOMediaCodec/libavif
REF "v${VERSION}"
SHA512 37f0de757180c6414778e688006940395960b316c25192d6beb97a07942aff4bd3b712dec2eff52cd26f5d72c352731442175dfeb90e2e1381133539760142b0
SHA512 ba72b8d02b098f361643a073361fccafd22eaac14e46dd06378d5e7acd9853538c5d166473e1de0b020de62dac25be83e42bd57ba51f675d11e2ddf155fbfa21
HEAD_REF master
PATCHES
disable-source-utf8.patch
find-dependency.patch # from https://github.com/AOMediaCodec/libavif/pull/1339
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand All @@ -19,6 +18,7 @@ vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DAVIF_BUILD_APPS=OFF
-DAVIF_BUILD_TESTS=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_libsharpyuv=ON
${FEATURE_OPTIONS}
)
Expand Down
3 changes: 1 addition & 2 deletions ports/libavif/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "libavif",
"version-semver": "1.0.4",
"port-version": 2,
"version-semver": "1.1.1",
"description": "Library for encoding and decoding AVIF files",
"homepage": "https://github.com/AOMediaCodec/libavif",
"license": "BSD-2-Clause AND Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4297,8 +4297,8 @@
"port-version": 0
},
"libavif": {
"baseline": "1.0.4",
"port-version": 2
"baseline": "1.1.1",
"port-version": 0
},
"libb2": {
"baseline": "0.98.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libavif.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ad9d36286110339f45b585a1bbb330273c04edad",
"version-semver": "1.1.1",
"port-version": 0
},
{
"git-tree": "30218a66d9e44d06cd55a1e7d29e501ceeba42da",
"version-semver": "1.0.4",
Expand Down

0 comments on commit b171fee

Please sign in to comment.