[FFmpeg-cvslog] configure: libnpp is always nonfree, even with LGPL
Ricardo Constantino
git at videolan.org
Thu Mar 16 00:56:19 EET 2017
ffmpeg | branch: master | Ricardo Constantino <wiiaboo at gmail.com> | Wed Mar 15 22:47:58 2017 +0000| [b409d8d4a276490cd67255fd4230ea0954bd8c50] | committer: James Almer
configure: libnpp is always nonfree, even with LGPL
libnpp was erroneously grouped up with libfdk-aac and openssl to check
if --enable-nonfree wasn't passed only with --enable-gpl in
9f28db47accb31bfec40a56dd2dc19ffd366a6be. The latter two are compatible
with LGPL, libnpp is not.
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b409d8d4a276490cd67255fd4230ea0954bd8c50
---
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index e72ee29..ecf67d5 100755
--- a/configure
+++ b/configure
@@ -5173,7 +5173,8 @@ die_license_disabled_gpl() {
map "die_license_disabled gpl" $EXTERNAL_LIBRARY_GPL_LIST $EXTERNAL_LIBRARY_GPLV3_LIST
map "die_license_disabled version3" $EXTERNAL_LIBRARY_VERSION3_LIST $EXTERNAL_LIBRARY_GPLV3_LIST
-enabled gpl && map "die_license_disabled_gpl nonfree" $EXTERNAL_LIBRARY_NONFREE_LIST $HWACCEL_LIBRARY_NONFREE_LIST
+enabled gpl && map "die_license_disabled_gpl nonfree" $EXTERNAL_LIBRARY_NONFREE_LIST
+map "die_license_disabled nonfree" $HWACCEL_LIBRARY_NONFREE_LIST
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
More information about the ffmpeg-cvslog
mailing list