[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg3 faac support was removed in 3.2, re...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1da27a02694c
branches:  trunk
changeset: 354592:1da27a02694c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Nov 03 21:25:55 2016 +0000

description:
faac support was removed in 3.2, remove option and bl3.mk chunk.
default-off, so no PKGREVISION bump necessary

diffstat:

 multimedia/ffmpeg3/buildlink3.mk |   6 +-----
 multimedia/ffmpeg3/options.mk    |  14 ++------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diffs (52 lines):

diff -r cd791170759d -r 1da27a02694c multimedia/ffmpeg3/buildlink3.mk
--- a/multimedia/ffmpeg3/buildlink3.mk  Thu Nov 03 15:06:53 2016 +0000
+++ b/multimedia/ffmpeg3/buildlink3.mk  Thu Nov 03 21:25:55 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2016/08/17 00:06:40 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2016/11/03 21:25:55 wiz Exp $
 
 BUILDLINK_TREE+=       ffmpeg3
 
@@ -34,10 +34,6 @@
 .  include "../../multimedia/x264-devel/buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mfaac)
-.  include "../../audio/faac/buildlink3.mk"
-.endif
-
 .if !empty(PKG_BUILD_OPTIONS.ffmpeg3:Mlibvpx)
 .  include "../../multimedia/libvpx/buildlink3.mk"
 .endif
diff -r cd791170759d -r 1da27a02694c multimedia/ffmpeg3/options.mk
--- a/multimedia/ffmpeg3/options.mk     Thu Nov 03 15:06:53 2016 +0000
+++ b/multimedia/ffmpeg3/options.mk     Thu Nov 03 21:25:55 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.3 2016/10/10 23:37:35 tnn Exp $
+# $NetBSD: options.mk,v 1.4 2016/11/03 21:25:55 wiz Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg3
-PKG_SUPPORTED_OPTIONS= ass doc ebur128 faac fdk-aac fontconfig freetype \
+PKG_SUPPORTED_OPTIONS= ass doc ebur128 fdk-aac fontconfig freetype \
                        gnutls lame libvpx opencore-amr openssl theora vorbis \
                        x264 x265 xcb xvid
 PKG_SUGGESTED_OPTIONS= lame ass freetype fontconfig libvpx openssl \
@@ -71,16 +71,6 @@
 CONFIGURE_ARGS+=       --disable-htmlpages
 .endif
 
-# faac option
-.if !empty(PKG_OPTIONS:Mfaac)
-RESTRICTED=            This software may require the payment of patent royalties
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_BIN_ON_FTP=         ${RESTRICTED}
-CONFIGURE_ARGS+=       --enable-libfaac
-CONFIGURE_ARGS+=       --enable-nonfree
-.include "../../audio/faac/buildlink3.mk"
-.endif
-
 # Fraunhofer FDK AAC codec support
 .if !empty(PKG_OPTIONS:Mfdk-aac)
 RESTRICTED=            This software may require the payment of patent royalties