From eaf8abd2cd0c2c73fa7d1474b18f728fab044f86 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Thu, 25 Apr 2024 23:23:47 +0700 Subject: libraries/libheif: Fix build with libsvtav1 2.0.0. Signed-off-by: Willy Sudiarto Raharjo --- .../a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch | 22 ++++++++++++++++++++++ libraries/libheif/libheif.SlackBuild | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 libraries/libheif/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch (limited to 'libraries/libheif') diff --git a/libraries/libheif/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch b/libraries/libheif/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch new file mode 100644 index 0000000000..e3f337419f --- /dev/null +++ b/libraries/libheif/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch @@ -0,0 +1,22 @@ +From a911b26a902c5f89fee2dc20ac4dfaafcb8144ec Mon Sep 17 00:00:00 2001 +From: Andrey Semashev +Date: Fri, 15 Mar 2024 17:46:48 +0300 +Subject: [PATCH] Fix compilation with libsvtav1 2.0.0. + +--- + libheif/plugins/encoder_svt.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libheif/plugins/encoder_svt.cc b/libheif/plugins/encoder_svt.cc +index 4597d7b8fc..1ff3bce2d5 100644 +--- a/libheif/plugins/encoder_svt.cc ++++ b/libheif/plugins/encoder_svt.cc +@@ -646,7 +646,7 @@ struct heif_error svt_encode_image(void* encoder_raw, const struct heif_image* i + + if (nclx) { + svt_config.color_description_present_flag = true; +-#if SVT_AV1_VERSION_MAJOR == 1 ++#if SVT_AV1_VERSION_MAJOR >= 1 + svt_config.color_primaries = static_cast(nclx->color_primaries); + svt_config.transfer_characteristics = static_cast(nclx->transfer_characteristics); + svt_config.matrix_coefficients = static_cast(nclx->matrix_coefficients); diff --git a/libraries/libheif/libheif.SlackBuild b/libraries/libheif/libheif.SlackBuild index 48456dfbac..b961a74b1e 100644 --- a/libraries/libheif/libheif.SlackBuild +++ b/libraries/libheif/libheif.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=libheif VERSION=${VERSION:-1.17.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -76,6 +76,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/a911b26a902c5f89fee2dc20ac4dfaafcb8144ec.patch + mkdir -p build cd build cmake \ -- cgit v1.2.3-65-gdbad