diff options
| author | JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> | 2020-11-21 03:48:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 11:48:17 -0800 |
| commit | e01aec15e6ddf11022bbcf64bd87eb5e9ddcd036 (patch) | |
| tree | ea3b1d15b350d1cb303fb532a72f24b491aa4f22 | |
| parent | 08e297e82d65b6e8362eb5981e418fcda22ce467 (diff) | |
| download | vcpkg-e01aec15e6ddf11022bbcf64bd87eb5e9ddcd036.tar.gz vcpkg-e01aec15e6ddf11022bbcf64bd87eb5e9ddcd036.zip | |
[libheif] update to 1.9.1 (#14648)
* [libheif] update to 1.9.1
* Add example optinos
* Update ports/libheif/CONTROL
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
| -rw-r--r-- | ports/libheif/CONTROL | 3 | ||||
| -rw-r--r-- | ports/libheif/dont_build_examples_and_gdk_pixbuf.patch | 13 | ||||
| -rw-r--r-- | ports/libheif/install-extra-headers.patch | 12 | ||||
| -rw-r--r-- | ports/libheif/portfile.cmake | 10 | ||||
| -rw-r--r-- | ports/libheif/remove_finding_pkgconfig.patch | 18 |
5 files changed, 5 insertions, 51 deletions
diff --git a/ports/libheif/CONTROL b/ports/libheif/CONTROL index c6dc34356..b5f372def 100644 --- a/ports/libheif/CONTROL +++ b/ports/libheif/CONTROL @@ -1,6 +1,5 @@ Source: libheif -Version: 1.7.0 -Port-Version: 1 +Version: 1.9.1 Homepage: http://www.libheif.org/ Description: Open h.265 video codec implementation. Build-Depends: x265, libde265 diff --git a/ports/libheif/dont_build_examples_and_gdk_pixbuf.patch b/ports/libheif/dont_build_examples_and_gdk_pixbuf.patch deleted file mode 100644 index 78bab905a..000000000 --- a/ports/libheif/dont_build_examples_and_gdk_pixbuf.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4463476..3a5cfbc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -80,6 +80,6 @@ configure_file(libheif.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libheif.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libheif.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - --add_subdirectory (examples) -+#add_subdirectory (examples) - add_subdirectory (libheif) --add_subdirectory (gdk-pixbuf) -+#add_subdirectory (gdk-pixbuf) diff --git a/ports/libheif/install-extra-headers.patch b/ports/libheif/install-extra-headers.patch deleted file mode 100644 index eb32ee8a4..000000000 --- a/ports/libheif/install-extra-headers.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/libheif/CMakeLists.txt b/libheif/CMakeLists.txt -index 6d683ec..dc2c4eb 100644 ---- a/libheif/CMakeLists.txt -+++ b/libheif/CMakeLists.txt -@@ -17,6 +17,7 @@ set(libheif_headers - heif_plugin_registry.h - heif_limits.h - heif_plugin.h -+ heif_cxx.h - logging.h - ${CMAKE_CURRENT_BINARY_DIR}/heif_version.h - ) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 97068d449..4c77d6781 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -1,18 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libheif - REF v1.7.0 - SHA512 7da6ab9daf253c2493e0c3960c6f817e0234dfbd0463467cd1e5f11f7d6804735e401b73fb1038b8f81cfc6527fafb6ac7f4668c3de9400a0131c1292bdbe660 + REF 2e218ef40440e258b5da1e513f72c7f3b1611c7c #v1.9.1 + SHA512 78fc62813f088133dfc12799d8e1989580630e80865e33e43450ae4bba0d9ef03fe250dcc734f7905ea1d02dcb7ae77a9b461b25da27fcb2ef98562c69ab0b87 HEAD_REF master - PATCHES - dont_build_examples_and_gdk_pixbuf.patch - remove_finding_pkgconfig.patch - install-extra-headers.patch ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA + OPTIONS + -DWITH_EXAMPLES=OFF ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libheif/) diff --git a/ports/libheif/remove_finding_pkgconfig.patch b/ports/libheif/remove_finding_pkgconfig.patch deleted file mode 100644 index ed8913a22..000000000 --- a/ports/libheif/remove_finding_pkgconfig.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3a5cfbc..9a3046e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -52,10 +52,9 @@ if (has_potentially_evaluated_expression)
- endif()
-
- if (UNIX)
-- find_package(PkgConfig)
-- pkg_check_modules(LIBDE265 libde265)
-- pkg_check_modules(X265 x265)
-- pkg_check_modules(AOM aom)
-+ find_package(libde265)
-+ find_package(x265)
-+ find_package(aom)
- endif()
-
- # Create libheif pkgconfig file
|
