[v2,1/4] ffmpeg: define license

Submitted by Luca Ceresoli on Feb. 7, 2013, 9:02 p.m.

Details

Message ID 1360270956-8896-1-git-send-email-luca@lucaceresoli.net
State Accepted
Commit a17d8942a4b7247822421946a21584b460ac1650
Headers show

Commit Message

Luca Ceresoli Feb. 7, 2013, 9:02 p.m.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
Changed since v1:
 - automagically add GPL license (Arnout/Peter suggestion).

 package/multimedia/ffmpeg/ffmpeg.mk |    7 +++++++
 1 file changed, 7 insertions(+)

Comments

Luca Ceresoli April 3, 2013, 8:18 a.m.
Ping on this series.
It pretty trivial, and two patches out of four have been reworked
according to discussion on the ML.

It cleanly applies on top of current master.

Luca

Luca Ceresoli wrote:
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> ---
> Changed since v1:
>   - automagically add GPL license (Arnout/Peter suggestion).
>
>   package/multimedia/ffmpeg/ffmpeg.mk |    7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
> index b018ea0..f63eb35 100644
> --- a/package/multimedia/ffmpeg/ffmpeg.mk
> +++ b/package/multimedia/ffmpeg/ffmpeg.mk
> @@ -9,6 +9,13 @@ FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
>   FFMPEG_SITE = http://ffmpeg.org/releases
>   FFMPEG_INSTALL_STAGING = YES
>   
> +FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
> +FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
> +ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
> +FFMPEG_LICENSE += and GPLv2+
> +FFMPEG_LICENSE_FILES += COPYING.GPLv2
> +endif
> +
>   FFMPEG_CONF_OPT = \
>   	--prefix=/usr		\
>   	--disable-avfilter	\
Peter Korsgaard May 2, 2013, 9:54 p.m.
>>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:

 Luca> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>

Committed series, thanks.

Patch hide | download patch | download mbox

diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index b018ea0..f63eb35 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -9,6 +9,13 @@  FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2
 FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES
 
+FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
+FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
+ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
+FFMPEG_LICENSE += and GPLv2+
+FFMPEG_LICENSE_FILES += COPYING.GPLv2
+endif
+
 FFMPEG_CONF_OPT = \
 	--prefix=/usr		\
 	--disable-avfilter	\