Skip to content
Draft
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
19 changes: 15 additions & 4 deletions ports/libheif/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO strukturag/libheif
REF "v${VERSION}"
SHA512 a7b4a7ecc093f6b453939e093abef391f88bb371303183a91e431cba8f4b590131c05cc80a28733ac4822cce4a69ca1475251b2d4679890330a603de04c6c77c
SHA512 60a3b974a6c8d2d053098bc3cd36da78c6aa1d4d3282ce0055263fb4120e8390316d63bc3f2312f20c5d97f1cc35afaf89fa7321c0cb163c778883bae6dbb5e6
HEAD_REF master
PATCHES
cxx-linkage-pkgconfig.diff
Expand All @@ -16,6 +16,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
aom WITH_AOM_DECODER
aom WITH_AOM_ENCODER
aom VCPKG_LOCK_FIND_PACKAGE_AOM
dav1d WITH_DAV1D
dav1d VCPKG_LOCK_FIND_PACKAGE_DAV1D
gdk-pixbuf WITH_GDK_PIXBUF
hevc WITH_X265
hevc VCPKG_LOCK_FIND_PACKAGE_X265
Expand All @@ -24,11 +26,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
jpeg WITH_JPEG_DECODER
jpeg WITH_JPEG_ENCODER
jpeg VCPKG_LOCK_FIND_PACKAGE_JPEG
libde265 WITH_LIBDE265
libde265 VCPKG_LOCK_FIND_PACKAGE_LIBDE265
openjpeg WITH_OpenJPEG_DECODER
openjpeg WITH_OpenJPEG_ENCODER
openjpeg VCPKG_LOCK_FIND_PACKAGE_OpenJPEG
uvg266 WITH_UVG266
uvg266 VCPKG_LOCK_FIND_PACKAGE_UVG266
vvdec WITH_VVDEC
vvdec VCPKG_LOCK_FIND_PACKAGE_vvdec
vvenc WITH_VVENC
vvenc VCPKG_LOCK_FIND_PACKAGE_vvenc
x264 WITH_X264
h264-decoder WITH_OpenH264_DECODER
h264-decoder VCPKG_LOCK_FIND_PACKAGE_OpenH264
Expand All @@ -53,13 +61,10 @@ vcpkg_cmake_configure(
-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF
"-DCMAKE_PROJECT_INCLUDE=${CURRENT_PORT_DIR}/cmake-project-include.cmake"
-DPLUGIN_DIRECTORY= # empty
-DWITH_DAV1D=OFF
-DWITH_EXAMPLES=OFF
-DWITH_EXAMPLE_HEIF_THUMB=OFF
-DWITH_EXAMPLE_HEIF_VIEW=OFF
-DWITH_LIBSHARPYUV=OFF
-DVCPKG_LOCK_FIND_PACKAGE_PNG=OFF
-DVCPKG_LOCK_FIND_PACKAGE_TIFF=OFF
-DVCPKG_LOCK_FIND_PACKAGE_ZLIB=${VCPKG_LOCK_FIND_PACKAGE_ZLIB}
-DVCPKG_LOCK_FIND_PACKAGE_Brotli=${VCPKG_LOCK_FIND_PACKAGE_Brotli}
${FEATURE_OPTIONS}
Expand All @@ -85,6 +90,12 @@ set(config_dependencies "include(CMakeFindDependencyMacro)\n")
if ("aom" IN_LIST FEATURES)
string(APPEND config_dependencies "find_dependency(AOM CONFIG)\n")
endif()
if ("vvdec" IN_LIST FEATURES)
string(APPEND config_dependencies "find_dependency(vvdec CONFIG)\n")
endif()
if ("vvenc" IN_LIST FEATURES)
string(APPEND config_dependencies "find_dependency(vvenc CONFIG)\n")
endif()
if (("header-compression" IN_LIST FEATURES) OR ("iso23001-17" IN_LIST FEATURES))
string(APPEND config_dependencies "find_dependency(ZLIB)\n")
endif()
Expand Down
33 changes: 30 additions & 3 deletions ports/libheif/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
{
"name": "libheif",
"version": "1.23.5",
"version": "1.23.6",
"description": "libheif is an HEIF and AVIF file format decoder and encoder.",
"homepage": "http://www.libheif.org/",
"license": "LGPL-3.0-only AND MIT",
"supports": "!xbox",
"dependencies": [
"libde265",
{
"name": "vcpkg-cmake",
"host": true
Expand All @@ -17,7 +16,8 @@
}
],
"default-features": [
"hevc"
"hevc",
"libde265"
],
"features": {
"aom": {
Expand All @@ -27,6 +27,13 @@
"aom"
]
},
"dav1d": {
"description": "AVIF decoding via dav1d",
"license": "BSD-2-Clause",
"dependencies": [
"dav1d"
]
},
"gdk-pixbuf": {
"description": "Plugin for gdk-pixbuf",
"supports": "!windows | mingw",
Expand Down Expand Up @@ -71,6 +78,12 @@
"libjpeg-turbo"
]
},
"libde265": {
"description": "libde265 HEVC decoder",
"dependencies": [
"libde265"
]
},
"openjpeg": {
"description": "JPEG-2000 decoding and encoding via OpenJPEG",
"license": "BSD-2-Clause",
Expand All @@ -86,6 +99,20 @@
"uvg266"
]
},
"vvdec": {
"description": "vvdec VVC decoder",
"license": "BSD-3-Clause-Clear",
"dependencies": [
"vvdec"
]
},
"vvenc": {
"description": "vvenc VVC decoder",
"license": "BSD-3-Clause-Clear",
"dependencies": [
"vvenc"
]
},
"x264": {
"description": "x264 AVC encoder",
"license": "GPL-2.0-or-later",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5189,7 +5189,7 @@
"port-version": 6
},
"libheif": {
"baseline": "1.23.5",
"baseline": "1.23.6",
"port-version": 0
},
"libhsplasma": {
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libheif.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e09c512edbfcd839182d4f4b96d581d20ff47bdb",
"version": "1.23.6",
"port-version": 0
},
{
"git-tree": "43556691564c77399737293f554294710dfc36c0",
"version": "1.23.5",
Expand Down
Loading