CVS commit: pkgsrc/multimedia

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Apr 23 10:35:40 UTC 2020

Modified Files:
        pkgsrc/multimedia/ffmpeg2: options.mk
        pkgsrc/multimedia/ffmpeg3: options.mk
        pkgsrc/multimedia/ffmpeg4: options.mk

Log Message:
ffmpeg*: Explain more practical concerns with linking against fdk-aac.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/multimedia/ffmpeg2/options.mk
cvs rdiff -u -r1.17 -r1.18 pkgsrc/multimedia/ffmpeg3/options.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/multimedia/ffmpeg4/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/ffmpeg2/options.mk
diff -u pkgsrc/multimedia/ffmpeg2/options.mk:1.17 pkgsrc/multimedia/ffmpeg2/options.mk:1.18
--- pkgsrc/multimedia/ffmpeg2/options.mk:1.17   Thu Apr 23 10:29:19 2020
+++ pkgsrc/multimedia/ffmpeg2/options.mk        Thu Apr 23 10:35:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2020/04/23 10:29:19 nia Exp $
+# $NetBSD: options.mk,v 1.18 2020/04/23 10:35:40 nia Exp $
 
 # Global and legacy options
 
@@ -81,7 +81,7 @@ CONFIGURE_ARGS+=      --enable-nonfree
 
 # Fraunhofer FDK AAC codec support
 .if !empty(PKG_OPTIONS:Mfdk-aac)
-RESTRICTED=            This software may require the payment of patent royalties
+RESTRICTED=            ffmpeg built with fdk-aac combines GPL and GPL-incompatible code
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 CONFIGURE_ARGS+=       --enable-libfdk_aac

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.17 pkgsrc/multimedia/ffmpeg3/options.mk:1.18
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.17   Thu Apr 23 10:29:19 2020
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Thu Apr 23 10:35:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2020/04/23 10:29:19 nia Exp $
+# $NetBSD: options.mk,v 1.18 2020/04/23 10:35:40 nia Exp $
 
 # Global and legacy options
 
@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=      --disable-htmlpages
 
 # Fraunhofer FDK AAC codec support
 .if !empty(PKG_OPTIONS:Mfdk-aac)
-RESTRICTED=            This software may require the payment of patent royalties
+RESTRICTED=            ffmpeg built with fdk-aac combines GPL and GPL-incompatible code
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 CONFIGURE_ARGS+=       --enable-libfdk_aac

Index: pkgsrc/multimedia/ffmpeg4/options.mk
diff -u pkgsrc/multimedia/ffmpeg4/options.mk:1.12 pkgsrc/multimedia/ffmpeg4/options.mk:1.13
--- pkgsrc/multimedia/ffmpeg4/options.mk:1.12   Thu Apr 23 10:29:19 2020
+++ pkgsrc/multimedia/ffmpeg4/options.mk        Thu Apr 23 10:35:40 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2020/04/23 10:29:19 nia Exp $
+# $NetBSD: options.mk,v 1.13 2020/04/23 10:35:40 nia Exp $
 
 # Global and legacy options
 
@@ -76,7 +76,7 @@ CONFIGURE_ARGS+=      --disable-htmlpages
 
 # Fraunhofer FDK AAC codec support
 .if !empty(PKG_OPTIONS:Mfdk-aac)
-RESTRICTED=            This software may require the payment of patent royalties
+RESTRICTED=            ffmpeg built with fdk-aac combines GPL and GPL-incompatible code
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 CONFIGURE_ARGS+=       --enable-libfdk_aac