From d2606e46c1865442de5160aa575cdbdb50fe415b Mon Sep 17 00:00:00 2001 From: zlice Date: Wed, 7 Aug 2024 11:49:43 -0400 Subject: [PATCH] ffmpeg: revbump for svt-av1 --- srcpkgs/ffmpeg/template | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 13799f87366..6b36bcfc981 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg version=4.4.4 -revision=9 +revision=10 build_style=meta short_desc="Decoding, encoding and streaming software (transitional dummy package)" maintainer="Orphaned " @@ -26,7 +26,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve $(vopt_if aom libaom-devel) $(vopt_if sndio sndio-devel) $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel) $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel) - $(vopt_if drm libdrm-devel) $(vopt_if svtav1 libsvt-av1-devel) + $(vopt_if drm libdrm-devel) libsvt-av1-devel $(vopt_if srt srt-devel) $(vopt_if rist librist-devel) $(vopt_if vulkan 'vulkan-loader-devel') $(vopt_if nvenc nv-codec-headers) $(vopt_if nvdec nv-codec-headers)" @@ -34,7 +34,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve depends="ffmpeg6" build_options="x265 v4l2 vaapi vdpau vpx fdk_aac aom nvenc sndio pulseaudio - dav1d zimg webp sofa vulkan drm svtav1 srt rist nvdec" + dav1d zimg webp sofa vulkan drm srt rist nvdec" build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm srt rist" desc_option_srt="Enable support for SRT (Secure, Reliable, Transport)" @@ -51,10 +51,6 @@ case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-mnan=legacy";; esac -if [ "$XBPS_TARGET_WORDSIZE" != "32" ]; then - build_options_default+=" svtav1" -fi - _apply_patch() { local args="$1" pname="$(basename $2)" @@ -114,7 +110,7 @@ do_configure() { --enable-libopus --enable-librtmp --enable-libjack \ $(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \ --disable-libopencore_amrnb --disable-libopencore_amrwb \ - --disable-libopenjpeg --enable-libbluray \ + --disable-libopenjpeg --enable-libbluray --enable-libsvtav1 \ --enable-postproc --enable-opencl --enable-libvmaf ${_args} \ $(vopt_enable x265 libx265) \ $(vopt_enable v4l2 libv4l2) \ @@ -126,7 +122,6 @@ do_configure() { $(vopt_enable sofa libmysofa) \ $(vopt_enable vulkan) \ $(vopt_enable drm libdrm) \ - $(vopt_enable svtav1 libsvtav1) \ $(vopt_enable srt libsrt) \ $(vopt_enable rist librist) \ $(vopt_if nvenc '--enable-nvenc') \