diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-05-21 15:31:48 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 00:31:48 -0700 |
| commit | 51a4dd1442c5689ef2cb4af39ea6a6691479bd42 (patch) | |
| tree | d44e76dff333d504f62e5609ace229daf952578f | |
| parent | 9b5cbe4afe0c3aef46c462bc3c539125fdaab9c0 (diff) | |
| download | vcpkg-51a4dd1442c5689ef2cb4af39ea6a6691479bd42.tar.gz vcpkg-51a4dd1442c5689ef2cb4af39ea6a6691479bd42.zip | |
[vcpkg baseline][libheif] Fix build failure on OSX (#18039)
* [vcpkg baseline][libheif] Fix build failure on OSX
* update version record
| -rw-r--r-- | ports/libheif/disable-depend-dav1d.patch | 14 | ||||
| -rw-r--r-- | ports/libheif/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/libheif/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/l-/libheif.json | 5 |
5 files changed, 25 insertions, 3 deletions
diff --git a/ports/libheif/disable-depend-dav1d.patch b/ports/libheif/disable-depend-dav1d.patch new file mode 100644 index 000000000..88859272e --- /dev/null +++ b/ports/libheif/disable-depend-dav1d.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 05afd5d..1e7f36f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,7 +65,9 @@ if (WITH_AOM) + find_package(LibAOM) + endif() + find_package(Rav1e) ++if (WITH_DAV1D) + find_package(Dav1d) ++endif() + + if (LIBDE265_FOUND) + message("HEIF decoder, libde265: found") diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index a47c59b49..58c50d1de 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -4,7 +4,9 @@ vcpkg_from_github( REF 667eeabb553ce73094eb29faea3f31fb8610fec2 #v1.10.0 SHA512 937290310ec6dda8840262d4bad5e3628033fa2caa6e9cc4a0df7a372cacf38c9b55cf29d2cb7ea2183641e263298fc2e87167c1b0f04f8697023f123d78aa9d HEAD_REF master - PATCHES gdk-pixbuf.patch + PATCHES + gdk-pixbuf.patch + disable-depend-dav1d.patch ) vcpkg_configure_cmake( @@ -12,6 +14,7 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DWITH_EXAMPLES=OFF + -DWITH_DAV1D=OFF ) vcpkg_install_cmake() vcpkg_copy_pdbs() diff --git a/ports/libheif/vcpkg.json b/ports/libheif/vcpkg.json index 7654ac1e3..9b7922ff2 100644 --- a/ports/libheif/vcpkg.json +++ b/ports/libheif/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libheif", "version": "1.10.0", - "port-version": 2, + "port-version": 3, "description": "Open h.265 video codec implementation.", "homepage": "http://www.libheif.org/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 7145894ab..f8612bebf 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3170,7 +3170,7 @@ }, "libheif": { "baseline": "1.10.0", - "port-version": 2 + "port-version": 3 }, "libhsplasma": { "baseline": "2020.08.30", diff --git a/versions/l-/libheif.json b/versions/l-/libheif.json index 6bc4aaab6..5d418b705 100644 --- a/versions/l-/libheif.json +++ b/versions/l-/libheif.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a05aafcbf48befb78710d61cee5d64aa37788a83", + "version": "1.10.0", + "port-version": 3 + }, + { "git-tree": "ba05813e40676056ca9a267270a62c4001635db0", "version": "1.10.0", "port-version": 2 |