From d460eb23e7042718bc627969a1f2ddcbcc17efdf Mon Sep 17 00:00:00 2001 From: q66 Date: Tue, 12 Feb 2019 22:33:11 +0100 Subject: [PATCH] ffmpeg: enable nvenc for x86 only It doesn't seem that cross builds are at fault but rather that nv-codec-headers seems to be written for x86 and nothing else, which is usually a good assumption as the nvidia drivers only really exist for x86 (well, they do exist for ppc64le in the CUDA toolkit but it's more effort to get that working and tested) [ci skip] --- srcpkgs/ffmpeg/template | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 0060aee7694..6a0d32bca6b 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -27,15 +27,11 @@ build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio" build_options_default="x265 v4l2 vpx sndio" case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*|ppc64*) build_options_default+=" vaapi vdpau";; + i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";; + ppc64*) build_options_default+=" vaapi vdpau";; mips*) CFLAGS="-mnan=legacy";; esac -# nvenc support is broken for cross builds -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" nvenc" -fi - do_configure() { # Fix gcc on x86_64-musl only if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then