From ae88eb1a368e833a9491a32b4c05922d9705b42b Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 23 Jan 2017 15:39:53 +0100 Subject: [PATCH] ffmpeg: add vpx build_option libvpx removed support for armv6, this build_option allows building ffmpeg for armv6 without it. --- common/options.description | 1 + srcpkgs/ffmpeg/template | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/common/options.description b/common/options.description index 0d4ad4495f..e66d9b8133 100644 --- a/common/options.description +++ b/common/options.description @@ -79,6 +79,7 @@ desc_option_v4l2="Enable support for V4L2 (Video 4 Linux 2)" desc_option_vaapi="Enable support for VA-API" desc_option_vapoursynth="Enable support for VapourSynth" desc_option_vdpau="Enable support for VDPAU" +desc_option_vpx="Enable support for VP8/VP9 codecs" desc_option_wavpack="Enable support for the Wavpack audio format" desc_option_wayland="Enable support for the Wayland backend" desc_option_x11="Enable support for X11" diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index c597fcb4f1..76dfc6113a 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -13,17 +13,19 @@ hostmakedepends="pkg-config perl yasm" makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel gnutls-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel - libcdio-paranoia-devel libvpx-devel librtmp-devel freetype-devel libmodplug-devel + libcdio-paranoia-devel librtmp-devel freetype-devel libmodplug-devel speex-devel celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel ocl-icd-devel $(vopt_if x265 x265-devel) $(vopt_if vaapi libva-devel) $(vopt_if vdpau libvdpau-devel) $(vopt_if v4l2 v4l-utils-devel) libbs2b-devel - libvidstab-devel $(vopt_if faac faac-devel) $(vopt_if fdk_aac fdk-aac-devel)" + libvidstab-devel $(vopt_if faac faac-devel) $(vopt_if fdk_aac fdk-aac-devel) + $(vopt_if vpx libvpx-devel)" -build_options="x265 v4l2 vaapi vdpau faac fdk_aac" +build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac" build_options_default="v4l2" case "$XBPS_TARGET_MACHINE" in - i686*|x86_64*) build_options_default+=" x265 vaapi vdpau";; + i686*|x86_64*) build_options_default+=" x265 vaapi vdpau vpx";; + armv7*|aarch64*) build_options_default+=" vpx" esac do_configure() { @@ -48,7 +50,7 @@ do_configure() { ./configure --prefix=/usr --disable-debug --enable-gpl --enable-gnutls \ --enable-libcdio --enable-version3 --enable-runtime-cpudetect \ --enable-libmp3lame --enable-libvorbis --enable-libxvid \ - --enable-libx264 --enable-libvpx --enable-libtheora \ + --enable-libx264 $(vopt_if vpx --enable-libvpx) --enable-libtheora \ --enable-shared --enable-static --enable-x11grab \ --enable-libpulse --enable-libfreetype --enable-libmodplug \ --enable-libspeex --enable-libcelt --enable-libass \