[Buildroot] [PATCH v2 1/4] ffmpeg: define license

[Buildroot] [PATCH v2 1/4] ffmpeg: define license

[Luca Ceresoli]

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	\
-- 
1.7.10.4

[Buildroot] [PATCH v2 2/4] omap-u-boot-utils: define license

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
No change since v1.

 package/omap-u-boot-utils/omap-u-boot-utils.mk |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/omap-u-boot-utils/omap-u-boot-utils.mk b/package/omap-u-boot-utils/omap-u-boot-utils.mk
index bb894a5..8615fdb 100644
--- a/package/omap-u-boot-utils/omap-u-boot-utils.mk
+++ b/package/omap-u-boot-utils/omap-u-boot-utils.mk
@@ -6,6 +6,8 @@
 
 OMAP_U_BOOT_UTILS_VERSION = 8aff852
 OMAP_U_BOOT_UTILS_SITE = http://github.com/nmenon/omap-u-boot-utils/tarball/master
+OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+
+OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING
 
 define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS
 	$(MAKE) -C $(@D)
-- 
1.7.10.4

[Buildroot] [PATCH v2 3/4] qt: define license

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
Changed since v1:
 - automagically add commercial license (Thomas/Arnout suggestion).

 package/qt/qt.mk |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index ee1a88b..2838070 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -17,6 +17,12 @@ QT_SITE    = http://releases.qt-project.org/qt4/source
 QT_DEPENDENCIES = host-pkgconf
 QT_INSTALL_STAGING = YES
 
+QT_LICENSE = LGPLv2.1 with exceptions or GPLv3
+ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
+QT_LICENSE += or Digia Qt Commercial license
+endif
+QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
+
 ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
 QT_CONFIGURE_OPTS += -opensource -confirm-license
 endif
-- 
1.7.10.4

[Buildroot] [PATCH v2 4/4] ccache: define license

[Luca Ceresoli]

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
---
No change since v1.

 package/ccache/ccache.mk |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/ccache/ccache.mk b/package/ccache/ccache.mk
index 1cbad6e..faa7c9f 100644
--- a/package/ccache/ccache.mk
+++ b/package/ccache/ccache.mk
@@ -7,6 +7,8 @@
 CCACHE_VERSION = 3.1.8
 CCACHE_SITE    = http://samba.org/ftp/ccache
 CCACHE_SOURCE  = ccache-$(CCACHE_VERSION).tar.bz2
+CCACHE_LICENSE = GPLv3+, others
+CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt
 
 # When ccache is being built for the host, ccache is not yet
 # available, so we have to use the special C compiler without the
-- 
1.7.10.4

[Buildroot] [PATCH v2 1/4] ffmpeg: define license

[Luca Ceresoli]

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	\

[Buildroot] [PATCH v2 1/4] ffmpeg: define license

[Peter Korsgaard]

>>>>> "Luca" == Luca Ceresoli <luca@lucaceresoli.net> writes:

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

Committed series, thanks.

-- 
Bye, Peter Korsgaard