diff mbox

[FFmpeg-devel] configure: Fix GPL dependency of avisynth / avxsynth

Message ID 201704010111.24731.cehoyos@ag.or.at
State Accepted
Commit fa0a6ce34d00673c5a6efaf243308a21daa5f8b3
Headers show

Commit Message

Carl Eugen Hoyos March 31, 2017, 11:11 p.m. UTC
Hi!

Attached patch fixes the license requirement for --enable-avisynth.

Please comment, Carl Eugen
From 89f5bdfe5c794451a8261616b9bb7a27d858e04d Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Sat, 1 Apr 2017 01:09:19 +0200
Subject: [PATCH] configure: Fix GPL dependency for avisynth / avxsynth.

---
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Michael Niedermayer April 1, 2017, 12:54 a.m. UTC | #1
On Sat, Apr 01, 2017 at 01:11:24AM +0200, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes the license requirement for --enable-avisynth.
> 
> Please comment, Carl Eugen

>  configure |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 64558e8450f89c703e18215d7e84b4e1dc43bde5  0001-configure-Fix-GPL-dependency-for-avisynth-avxsynth.patch
> From 89f5bdfe5c794451a8261616b9bb7a27d858e04d Mon Sep 17 00:00:00 2001
> From: Carl Eugen Hoyos <cehoyos@ag.or.at>
> Date: Sat, 1 Apr 2017 01:09:19 +0200
> Subject: [PATCH] configure: Fix GPL dependency for avisynth / avxsynth.

LGTM

please do not cherry pick this or anything else to release/3.3
before we know what people want 3.3 to be based on.
Moving the branch point forward is cleaner if nothing else has been
pushed to it

[...]
Stephen Hutchinson April 1, 2017, 1:51 a.m. UTC | #2
On 3/31/2017 7:11 PM, Carl Eugen Hoyos wrote:
> Hi!
>
> Attached patch fixes the license requirement for --enable-avisynth.
>

LGTM.

I'd presume this is because of the weirdly worded exception language
in the Av[i|x]Synth C header?  Trying to wrap my head around what
it was really trying to describe makes my brain hurt, but making
--enable-gpl a requirement is probably the sanest thing to do.
Carl Eugen Hoyos April 1, 2017, 9:08 a.m. UTC | #3
2017-04-01 3:51 GMT+02:00 Stephen Hutchinson <qyot27@gmail.com>:
> On 3/31/2017 7:11 PM, Carl Eugen Hoyos wrote:
>>
>> Hi!
>>
>> Attached patch fixes the license requirement for --enable-avisynth.
>>
>
> LGTM.

Patch applied.

> I'd presume this is because of the weirdly worded exception language
> in the Av[i|x]Synth C header?

No, actually the words above:
"you can redistribute [this software] under the terms of the GPL"

Carl Eugen
diff mbox

Patch

diff --git a/configure b/configure
index 8b4921b..292766a 100755
--- a/configure
+++ b/configure
@@ -1501,6 +1501,7 @@  EXTERNAL_AUTODETECT_LIBRARY_LIST="
 "
 
 EXTERNAL_LIBRARY_GPL_LIST="
+    avisynth
     frei0r
     libcdio
     librubberband
@@ -1533,7 +1534,6 @@  EXTERNAL_LIBRARY_LIST="
     $EXTERNAL_LIBRARY_NONFREE_LIST
     $EXTERNAL_LIBRARY_VERSION3_LIST
     $EXTERNAL_LIBRARY_GPLV3_LIST
-    avisynth
     chromaprint
     crystalhd
     decklink