CVS commit: pkgsrc/multimedia/ffmpeg3

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Nov  3 21:25:55 UTC 2016

Modified Files:
        pkgsrc/multimedia/ffmpeg3: buildlink3.mk options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/ffmpeg3/buildlink3.mk \
    pkgsrc/multimedia/ffmpeg3/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg3/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg3/buildlink3.mk:1.3 pkgsrc/multimedia/ffmpeg3/buildlink3.mk:1.4
--- pkgsrc/multimedia/ffmpeg3/buildlink3.mk:1.3 Wed Aug 17 00:06:40 2016
+++ pkgsrc/multimedia/ffmpeg3/buildlink3.mk     Thu Nov  3 21:25:55 2016
@@ -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 @@ pkgbase := ffmpeg3
 .  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
Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.3 pkgsrc/multimedia/ffmpeg3/options.mk:1.4
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.3    Mon Oct 10 23:37:35 2016
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Thu Nov  3 21:25:55 2016
@@ -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+=     --enable-htmlpages
 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