ffmpeg: add faac and fdk_aac build options (off)

"The licenses of libfaac and libfdk_aac are not compatible with the GPL,
so the GPL does not permit distribution of binaries containing code
licensed under these licenses when GPL-licensed code is also included.
Therefore these encoders have been designated as "non-free", and you
cannot download a pre-built ffmpeg that supports them. This can be
resolved by compiling ffmpeg yourself."

See https://trac.ffmpeg.org/wiki/Encode/AAC.

common/options.description

@@ -11,6 +11,8 @@ desc_option_dri2="Enable support for the DRI2 extension"
 desc_option_dri="Enable support for the DRI extension"
 desc_option_efi="Enable support for EFI"
 desc_option_expat="Enable support for XML via expat"
+desc_option_faac="Enable support for FAAC codec"
+desc_option_fdk_aac="Enable support for Fraunhofer FDK AAC codec"
 desc_option_framebuffer="Enable support for the Framebuffer"
 desc_option_gdk_pixbuf="Enable support to use transparency via gdk-pixbuf"
 desc_option_geoclue2="Enable support for geolocation (v2)"

srcpkgs/ffmpeg/template

@@ -1,7 +1,7 @@
 # Template file for 'ffmpeg'
 pkgname=ffmpeg
 version=2.8.7
-revision=1
+revision=2
 short_desc="Decoding, encoding and streaming software"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-3"
@@ -11,15 +11,15 @@ checksum=8777ce4a335640fdd13680ba423ef6da330ff5071bfbe27cdbb452379167efe5
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
- libXext-devel libXvMC-devel faac-devel faad2-devel lame-devel libtheora-devel
+ libXext-devel libXvMC-devel faad2-devel lame-devel libtheora-devel
  gnutls-devel libvorbis-devel x264-devel xvidcore-devel jack-devel SDL-devel
  libcdio-paranoia-devel libvpx-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"
+ libvidstab-devel $(vopt_if faac faac-devel) $(vopt_if fdk_aac fdk-aac-devel)"
 
-build_options="x265 v4l2 vaapi vdpau nonfree_possible"
+build_options="x265 v4l2 vaapi vdpau faac fdk_aac"
 build_options_default="v4l2"
 
 case "$XBPS_TARGET_MACHINE" in
@@ -48,7 +48,8 @@ do_configure() {
 		--enable-libpulse --enable-libfreetype --enable-libmodplug \
 		--enable-libspeex --enable-libcelt --enable-libass \
 		--enable-libopus --enable-librtmp --enable-libmodplug \
-		$(vopt_if nonfree_possible --enable-libfaac\ --enable-nonfree) \
+		$(vopt_if faac '--enable-nonfree --enable-libfaac') \
+		$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
 		--disable-libopencore_amrnb --disable-libopencore_amrwb \
 		--disable-libschroedinger --disable-libopenjpeg \
 		--enable-postproc --enable-opencl ${_args} \