From 057af9df0400be31113f6a65e1f98688a68b08d7 Mon Sep 17 00:00:00 2001 From: zlice Date: Wed, 7 Aug 2024 11:49:29 -0400 Subject: [PATCH] ffmpeg6: revbump for svt-av1 --- srcpkgs/ffmpeg6/template | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template index d79cf2d3dc0..6b12c0b446b 100644 --- a/srcpkgs/ffmpeg6/template +++ b/srcpkgs/ffmpeg6/template @@ -2,7 +2,7 @@ # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! pkgname=ffmpeg6 version=6.1.2 -revision=1 +revision=2 hostmakedepends="pkg-config perl" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel @@ -12,8 +12,7 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel - zimg-devel libmysofa-devel - $(vopt_if svtav1 libsvt-av1-devel) $(vopt_if vaapi libva-devel) + zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel) $(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)" depends="ffplay6>=${version}_${revision}" @@ -25,7 +24,7 @@ changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog" distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz" checksum=3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38 -build_options="vaapi vdpau fdk_aac nvcodec svtav1 onevpl" +build_options="vaapi vdpau fdk_aac nvcodec onevpl" desc_option_sofa="Enable support for AES SOFA" case "$XBPS_TARGET_MACHINE" in @@ -41,10 +40,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)" @@ -102,13 +97,12 @@ do_configure() { --enable-libx265 --enable-libv4l2 --enable-libaom \ --enable-libbs2b --enable-libvidstab --enable-libdav1d \ --enable-libsrt --enable-librist --enable-libwebp \ - --enable-vulkan --enable-libdrm \ + --enable-vulkan --enable-libdrm --enable-libsvtav1 \ $(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \ $(vopt_enable vaapi) $(vopt_enable vdpau) \ $(vopt_enable zimg libzimg) \ $(vopt_enable sofa libmysofa) \ $(vopt_enable onevpl libvpl) \ - $(vopt_enable svtav1 libsvtav1) \ $(vopt_enable nvcodec nvenc) \ $(vopt_enable nvcodec nvdec) }