diff --git a/common/options.description b/common/options.description index ac0f14c084..f9e3d0ce19 100644 --- a/common/options.description +++ b/common/options.description @@ -83,6 +83,7 @@ desc_option_ssl="Enable support for SSL" desc_option_startup_notification="Enable support for desktop notification" desc_option_static="Enable static linking" desc_option_svg="Enable support for SVG images" +desc_option_svtav1="Enable support for the SVT-AV1 Encoder and Decoder" desc_option_tcpwrappers="Enable support for tcpwrappers" desc_option_tiff="Enable support for TIFF images" desc_option_upower="Enable support for UPower" diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index c5929b4582..213aae8bbf 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.1 -revision=1 +revision=2 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned " license="GPL-3.0-or-later" @@ -25,11 +25,11 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel) $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel) $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') - $(vopt_if drm libdrm-devel)" + $(vopt_if drm libdrm-devel) $(vopt_if svtav1 libsvt-av1-devel)" depends="ffplay>=${version}_${revision}" build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio - dav1d zimg webp sofa vulkan drm" + dav1d zimg webp sofa vulkan drm svtav1" build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm" case "$XBPS_TARGET_MACHINE" in @@ -38,6 +38,10 @@ case "$XBPS_TARGET_MACHINE" in mips*) CFLAGS="-mnan=legacy";; esac +if [ "$XBPS_TARGET_WORDSIZE" != "32" ]; then + build_options_default+=" svtav1" +fi + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" fi @@ -102,16 +106,17 @@ do_configure() { --disable-libopencore_amrnb --disable-libopencore_amrwb \ --disable-libopenjpeg \ --enable-postproc --enable-opencl ${_args} \ - $(vopt_if x265 '--enable-libx265' '--disable-libx265') \ - $(vopt_if v4l2 '--enable-libv4l2' '--disable-libv4l2') \ + $(vopt_enable x265 libx265) \ + $(vopt_enable v4l2 libv4l2) \ $(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \ --enable-libbs2b --enable-avresample --enable-libvidstab \ - $(vopt_if dav1d '--enable-libdav1d') \ - $(vopt_if zimg '--enable-libzimg') \ - $(vopt_if webp '--enable-libwebp') \ - $(vopt_if sofa '--enable-libmysofa') \ - $(vopt_if vulkan '--enable-vulkan') \ - $(vopt_if drm '--enable-libdrm') + $(vopt_enable dav1d libdav1d) \ + $(vopt_enable zimg libzimg) \ + $(vopt_enable webp libwebp) \ + $(vopt_enable sofa libmysofa) \ + $(vopt_enable vulkan) \ + $(vopt_enable drm libdrm) \ + $(vopt_enable svtav1 libsvtav1) } do_build() { make ${makejobs}