From 7d52f3736f82782d572f066989d5f11309b67d18 Mon Sep 17 00:00:00 2001 From: dataCobra Date: Mon, 22 Aug 2022 14:33:49 +0200 Subject: [PATCH] ffmpeg: add build_option --enable-nvdec --- srcpkgs/ffmpeg/template | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 63d02eb3af18..289881c886d0 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.2 -revision=2 +revision=3 short_desc="Decoding, encoding and streaming software" maintainer="Orphaned " license="GPL-3.0-or-later" @@ -18,19 +18,20 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel libbs2b-devel libvidstab-devel $(vopt_if pulseaudio pulseaudio-devel) - $(vopt_if x265 x265-devel) $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel) - $(vopt_if v4l2 v4l-utils-devel) $(vopt_if fdk_aac fdk-aac-devel) - $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel) - $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel) + $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel) + $(vopt_if x265 x265-devel) $(vopt_if v4l2 v4l-utils-devel) + $(vopt_if fdk_aac fdk-aac-devel) $(vopt_if vpx libvpx-devel) + $(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 vulkan 'vulkan-loader Vulkan-Headers') $(vopt_if drm libdrm-devel) $(vopt_if svtav1 libsvt-av1-devel) - $(vopt_if srt srt-devel) $(vopt_if rist librist-devel)" + $(vopt_if srt srt-devel) $(vopt_if rist librist-devel) + $(vopt_if vulkan 'vulkan-loader Vulkan-Headers') + $(vopt_if nvenc nv-codec-headers) $(vopt_if nvdec nv-codec-headers)" depends="ffplay>=${version}_${revision}" build_options="x265 v4l2 vaapi vdpau vpx fdk_aac aom nvenc sndio pulseaudio - dav1d zimg webp sofa vulkan drm svtav1 srt rist" + dav1d zimg webp sofa vulkan drm svtav1 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)" desc_option_rist="Enable support for RIST (Reliable Internet Stream Transport)" @@ -38,7 +39,7 @@ desc_option_sofa="Enable support for AES SOFA" desc_option_webp="Enable support for WebP" case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";; + i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc nvdec";; ppc64*) build_options_default+=" vaapi vdpau";; mips*) CFLAGS="-mnan=legacy";; esac @@ -105,7 +106,7 @@ do_configure() { --enable-shared --enable-static --enable-libxcb \ $(vopt_enable pulseaudio libpulse) --enable-libfreetype --enable-libmodplug \ --enable-libspeex --enable-libcelt --enable-libass \ - --enable-libopus --enable-librtmp --enable-libjack $(vopt_enable nvenc) \ + --enable-libopus --enable-librtmp --enable-libjack \ $(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \ --disable-libopencore_amrnb --disable-libopencore_amrwb \ --disable-libopenjpeg \ @@ -122,7 +123,9 @@ do_configure() { $(vopt_enable drm libdrm) \ $(vopt_enable svtav1 libsvtav1) \ $(vopt_enable srt libsrt) \ - $(vopt_enable rist librist) + $(vopt_enable rist librist) \ + $(vopt_if nvenc '--enable-nvenc') \ + $(vopt_if nvdec '--enable-nvdec') } do_build() { make ${makejobs}