diff --git a/media-libs/libavif/libavif1.0-1.1.0.recipe b/media-libs/libavif/libavif1.0-1.3.0.recipe similarity index 79% rename from media-libs/libavif/libavif1.0-1.1.0.recipe rename to media-libs/libavif/libavif1.0-1.3.0.recipe index 62d36b0e3..3e4bc0b44 100644 --- a/media-libs/libavif/libavif1.0-1.1.0.recipe +++ b/media-libs/libavif/libavif1.0-1.3.0.recipe @@ -12,13 +12,18 @@ COPYRIGHT="2019 Joe Drago" LICENSE="BSD (2-clause)" REVISION="1" SOURCE_URI="https://github.com/AOMediaCodec/libavif/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="edb31951005d7a143be1724f24825809599a4832073add50eaf987733defb5c8" +CHECKSUM_SHA256="0a545e953cc049bf5bcf4ee467306a2f113a75110edf59e61248873101cd26c1" SOURCE_DIR="libavif-$portVersion" +PATCHES="libavif1.0-$portVersion.patchset" +srcGitRev2="81998ffafb9c2ac8cf488d31e536a2e6fd6b3fdf" +SOURCE_URI_2="https://github.com/maryla-uc/libargparse/archive/$srcGitRev2.tar.gz" +CHECKSUM_SHA256_2="c26a772ba2cb52829759db4636c67ca318e1dd95c19254488353ed9021f366cc" +SOURCE_DIR_2="libargparse-$srcGitRev2" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libVersion="16.1.0" +libVersion="16.3.0" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -31,6 +36,7 @@ REQUIRES=" lib:librav1e$secondaryArchSuffix lib:libsharpyuv$secondaryArchSuffix lib:libstdc++$secondaryArchSuffix +# lib:libSvtAv1Enc$secondaryArchSuffix " PROVIDES_devel=" @@ -49,6 +55,7 @@ PROVIDES_tools=" libavif1.0${secondaryArchSuffix}_tools = $portVersion cmd:avifdec$secondaryArchSuffix cmd:avifenc$secondaryArchSuffix + cmd:avifgainmaputil$secondaryArchSuffix " REQUIRES_tools=" libavif1.0$secondaryArchSuffix == $portVersion base @@ -72,6 +79,7 @@ BUILD_REQUIRES=" devel:libpng16$secondaryArchSuffix devel:librav1e$secondaryArchSuffix devel:libsharpyuv$secondaryArchSuffix +# devel:libSvtAv1Enc$secondaryArchSuffix devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" @@ -86,13 +94,20 @@ defineDebugInfoPackage libavif1.0$secondaryArchSuffix \ BUILD() { - cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + rm -rf build + + mkdir -p ext/libargparse + cp -R $sourceDir2/* ext/libargparse + + cmake -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ $cmakeDirArgs \ -DAVIF_BUILD_APPS=ON \ - -DAVIF_CODEC_DAV1D=ON \ - -DAVIF_CODEC_RAV1E=ON \ + -DAVIF_CODEC_DAV1D=SYSTEM \ + -DAVIF_CODEC_RAV1E=SYSTEM \ + -DAVIF_CODEC_SVT=OFF \ -DAVIF_LIBSHARPYUV=SYSTEM \ -DAVIF_LIBYUV=OFF + make -C build $jobArgs } diff --git a/media-libs/libavif/patches/libavif1.0-1.3.0.patchset b/media-libs/libavif/patches/libavif1.0-1.3.0.patchset new file mode 100644 index 000000000..321f4059d --- /dev/null +++ b/media-libs/libavif/patches/libavif1.0-1.3.0.patchset @@ -0,0 +1,22 @@ +From 5568d0972309f016e25aebfb2216acc739cd58bd Mon Sep 17 00:00:00 2001 +From: Luc Schrijvers +Date: Sun, 15 Jun 2025 16:04:11 +0200 +Subject: Turn off POSITION_INDEPENDENT_CODE + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 991743c..e23eef3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,7 +141,7 @@ else() + endif() + + # This is also needed to get shared libraries (e.g. pixbufloader-avif) to compile against a static libavif. +-set(CMAKE_POSITION_INDEPENDENT_CODE ON) ++set(CMAKE_POSITION_INDEPENDENT_CODE OFF) + if(BUILD_SHARED_LIBS) + set(AVIF_LIBRARY_PREFIX "${CMAKE_SHARED_LIBRARY_PREFIX}") + else() +-- +2.48.1 +