[libheif] Update to version 1.14.2 (#28801)

* Update to version 1.14.2

* Remove Empty Folders

* Update libheif.json
This commit is contained in:
Edi61 2023-01-09 10:10:09 +01:00 committed by GitHub
parent 3640e7cb1d
commit 53c1bea0f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 12 deletions

View File

@ -2,24 +2,29 @@ diff --git a/gdk-pixbuf/CMakeLists.txt b/gdk-pixbuf/CMakeLists.txt
index 85ad59708..d6aa4a5f9 100644
--- a/gdk-pixbuf/CMakeLists.txt
+++ b/gdk-pixbuf/CMakeLists.txt
@@ -1,9 +1,9 @@
if(UNIX)
@@ -1,13 +1,10 @@
if(UNIX OR MINGW)
find_package(PkgConfig)
find_package(Threads)
- pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0)
+ pkg_check_modules(GDKPIXBUF2 gdk-pixbuf-2.0 IMPORTED_TARGET)
if(GDKPIXBUF2_FOUND)
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDKPIXBUF2_MODULE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
- execute_process(
- COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir
- --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDKPIXBUF2_MODULE_DIR
- OUTPUT_STRIP_TRAILING_WHITESPACE)
+ pkg_get_variable(GDKPIXBUF2_MODULE_DIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
add_library(pixbufloader-heif MODULE pixbufloader-heif.c)
@@ -13,7 +13,7 @@ if(UNIX)
${GDKPIXBUF2_INCLUDE_DIRS}
${libheif_BINARY_DIR}
${libheif_SOURCE_DIR})
@@ -15,7 +12,7 @@ if(UNIX)
target_link_directories(pixbufloader-heif PRIVATE ${GDKPIXBUF2_LIBRARY_DIRS})
- target_link_libraries(pixbufloader-heif PUBLIC ${GDKPIXBUF2_LIBRARIES} heif)
+ target_link_libraries(pixbufloader-heif PUBLIC PkgConfig::GDKPIXBUF2 heif)
install(TARGETS pixbufloader-heif LIBRARY DESTINATION ${GDKPIXBUF2_MODULE_DIR})
install(TARGETS pixbufloader-heif DESTINATION ${GDKPIXBUF2_MODULE_DIR})
endif()

View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO strukturag/libheif
REF 5fb52b6134d5e034b51637a86c6e8a7418b35df1 #v1.13.0
SHA512 e1ebd5eb7ae436a604ae3bb50ea4d53b8efb97388081a0876c161927a8b31c48c03899075423048d3f10055332bf7f3472bb8a06b6d32312de1d88fbda760421
REF e04d8864b8778605f00e3bf0f2c1cea65abd60f2 #v1.14.2
SHA512 42d10500f7b1176fc6bd6afa783610a9a5b5be3db5c9b4d68b1102823153aee6f22194f8394e6c6a37df75e19f01e301dde783658067f67899410e8de07d19b5
HEAD_REF master
PATCHES
gdk-pixbuf.patch
@ -34,5 +34,6 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libheif/heif.h" "#ifdef LI
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/libheif" "${CURRENT_PACKAGES_DIR}/debug/lib/libheif")
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,6 +1,6 @@
{
"name": "libheif",
"version": "1.13.0",
"version": "1.14.2",
"description": "Open h.265 video codec implementation.",
"homepage": "http://www.libheif.org/",
"license": "LGPL-3.0-only",

View File

@ -3877,7 +3877,7 @@
"port-version": 3
},
"libheif": {
"baseline": "1.13.0",
"baseline": "1.14.2",
"port-version": 0
},
"libhsplasma": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8283de8e2ea762947ac56b69056ee48a620e78f1",
"version": "1.14.2",
"port-version": 0
},
{
"git-tree": "0876b38db237beed53c8edd6ebe83622a3771287",
"version": "1.13.0",