[pkgsrc/trunk]: pkgsrc/multimedia ffmpeg*: Explain more practical concerns wi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/342bb3255259
branches:  trunk
changeset: 429661:342bb3255259
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Apr 23 10:35:40 2020 +0000

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

diffstat:

 multimedia/ffmpeg2/options.mk |  4 ++--
 multimedia/ffmpeg3/options.mk |  4 ++--
 multimedia/ffmpeg4/options.mk |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 186f795e87ed -r 342bb3255259 multimedia/ffmpeg2/options.mk
--- a/multimedia/ffmpeg2/options.mk     Thu Apr 23 10:34:53 2020 +0000
+++ b/multimedia/ffmpeg2/options.mk     Thu Apr 23 10:35:40 2020 +0000
@@ -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 @@
 
 # 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
diff -r 186f795e87ed -r 342bb3255259 multimedia/ffmpeg3/options.mk
--- a/multimedia/ffmpeg3/options.mk     Thu Apr 23 10:34:53 2020 +0000
+++ b/multimedia/ffmpeg3/options.mk     Thu Apr 23 10:35:40 2020 +0000
@@ -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 @@
 
 # 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
diff -r 186f795e87ed -r 342bb3255259 multimedia/ffmpeg4/options.mk
--- a/multimedia/ffmpeg4/options.mk     Thu Apr 23 10:34:53 2020 +0000
+++ b/multimedia/ffmpeg4/options.mk     Thu Apr 23 10:35:40 2020 +0000
@@ -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 @@
 
 # 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