[FFmpeg-devel] [PATCH] LICENSE: Complete GPL'd external libraries list

[Timothy Gu]

Also added some more die_license_disabled and a new helper function
die_license_disabled_two_choice to configure corresponding to the changes in
LICENSE.
---
 LICENSE   |  2 ++
 configure | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index a4b4006..a5feca1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -73,7 +73,9 @@ compatible libraries
 --------------------
 
 The following libraries are under GPL:
+    - frei0r
     - libcdio
+    - libfreetype (Or LGPL v3)
     - libutvideo
     - libvidstab
     - libx264
diff --git a/configure b/configure
index 93970a1..9ccd475 100755
--- a/configure
+++ b/configure
@@ -3689,10 +3689,18 @@ die_license_disabled() {
     enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; }
 }
 
+die_license_disabled_two_choices() {
+    enabled $1 || enabled $2 ||
+    { enabled $3 && die "$3 is $1 or $2 and neither --enable-$1 nor --enable-$2 is not specified."; }
+}
+
 die_license_disabled_gpl() {
     enabled $1 || { enabled $2 && die "$2 is incompatible with the gpl and --enable-$1 is not specified."; }
 }
 
+enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
+
+die_license_disabled gpl frei0r
 die_license_disabled gpl libcdio
 die_license_disabled gpl libutvideo
 die_license_disabled gpl libvidstab
@@ -3701,6 +3709,8 @@ die_license_disabled gpl libxavs
 die_license_disabled gpl libxvid
 die_license_disabled gpl x11grab
 
+die_license_disabled_two_choices gpl version3 libfreetype
+
 die_license_disabled nonfree libaacplus
 die_license_disabled nonfree libfaac
 enabled gpl && die_license_disabled_gpl nonfree libfdk_aac
@@ -3711,8 +3721,6 @@ die_license_disabled version3 libopencore_amrwb
 die_license_disabled version3 libvo_aacenc
 die_license_disabled version3 libvo_amrwbenc
 
-enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
-
 disabled optimizations || check_cflags -fomit-frame-pointer
 
 enable_weak_pic() {
-- 
1.8.1.2