From 0fa4a8b431a1860fa6ecdd5146677b1b8ccf8c9f Mon Sep 17 00:00:00 2001 From: Owen Rafferty Date: Sun, 17 Feb 2019 04:56:42 -0600 Subject: [PATCH] ffmpeg: make pulseaudio optional build option closes #8835 --- srcpkgs/ffmpeg/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template index 6a0d32bca6b..5a0b53f408f 100644 --- a/srcpkgs/ffmpeg/template +++ b/srcpkgs/ffmpeg/template @@ -16,15 +16,15 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve libXext-devel libXvMC-devel libxcb-devel faad2-devel lame-devel libtheora-devel gnutls-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel libcdio-paranoia-devel librtmp-devel freetype-devel libmodplug-devel - speex-devel celt-devel harfbuzz-devel libass-devel opus-devel pulseaudio-devel + speex-devel celt-devel harfbuzz-devel libass-devel opus-devel $(vopt_if pulseaudio 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) $(vopt_if vpx libvpx-devel) $(vopt_if aom libaom-devel) $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)" -build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio" -build_options_default="x265 v4l2 vpx sndio" +build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio" +build_options_default="x265 v4l2 vpx sndio pulseaudio" case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) build_options_default+=" vaapi vdpau nvenc";; @@ -63,7 +63,7 @@ do_configure() { --enable-libmp3lame --enable-libvorbis --enable-libxvid \ --enable-libx264 $(vopt_enable vpx libvpx) --enable-libtheora \ --enable-shared --enable-static --enable-libxcb \ - --enable-libpulse --enable-libfreetype --enable-libmodplug \ + $(vopt_enable pulseaudio libpulse) --enable-libfreetype --enable-libmodplug \ --enable-libspeex --enable-libcelt --enable-libass \ --enable-libopus --enable-librtmp $(vopt_enable nvenc) \ $(vopt_if faac '--enable-nonfree --enable-libfaac') \