Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[libavif] Remove incorrect CMake config #42151

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ports/libavif/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ vcpkg_from_github(
REPO AOMediaCodec/libavif
REF "v${VERSION}"
SHA512 ba72b8d02b098f361643a073361fccafd22eaac14e46dd06378d5e7acd9853538c5d166473e1de0b020de62dac25be83e42bd57ba51f675d11e2ddf155fbfa21
HEAD_REF master
HEAD_REF main
PATCHES
disable-source-utf8.patch
)
Expand All @@ -19,6 +19,7 @@ vcpkg_cmake_configure(
OPTIONS
-DAVIF_BUILD_APPS=OFF
-DAVIF_BUILD_TESTS=OFF
-DAVIF_BUILD_EXAMPLES=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_libsharpyuv=ON
${FEATURE_OPTIONS}
)
Expand All @@ -33,6 +34,8 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
# Fix pkg-config files
vcpkg_fixup_pkgconfig()

configure_file("${CMAKE_CURRENT_LIST_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" COPYONLY)

# Remove duplicate files
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share")
Expand Down
4 changes: 4 additions & 0 deletions ports/libavif/usage
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
libavif provides pkg-config modules:

# Library for encoding and decoding .avif files
libavif
1 change: 1 addition & 0 deletions ports/libavif/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "libavif",
"version-semver": "1.1.1",
"port-version": 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
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4330,7 +4330,7 @@
},
"libavif": {
"baseline": "1.1.1",
"port-version": 0
"port-version": 1
},
"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": "306ec45371bf5ee5e23a6a73a995fecfce122d33",
"version-semver": "1.1.1",
"port-version": 1
},
{
"git-tree": "ad9d36286110339f45b585a1bbb330273c04edad",
"version-semver": "1.1.1",
Expand Down