ffmpeg: define license
PATCH 1/5 ffmpeg: define license
---
This patch defines the license in a very simple way.
How about making it more "automagic", such as:
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)FFMPEG_LICENSE = LGPLv2.1+, GPLv2+, libjpeg license FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 elseFFMPEG_LICENSE = LGPLv2.1+, libjpeg license FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 endif
---
package/multimedia/ffmpeg/ffmpeg.mk | 2 ++ 1 file changed, 2 insertions(+)
package/multimedia/ffmpeg/ffmpeg.mk +2 -0
@@ -8,6 +8,8 @@ FFMPEG_VERSION = 0.8.12 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2 FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES +FFMPEG_LICENSE = LGPLv2.1+, GPLv2+ (optional components), libjpeg license +FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 FFMPEG_CONF_OPT = \ --prefix=/usr \
Signature · 1 line
1.7.10.4
PATCH 2/5 omap-u-boot-utils: define license
--- package/omap-u-boot-utils/omap-u-boot-utils.mk | 2 ++ 1 file changed, 2 insertions(+)
package/omap-u-boot-utils/omap-u-boot-utils.mk +2 -0
@@ -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)
Signature · 1 line
1.7.10.4
PATCH 3/5 qt: define license
In reply to Luca Ceresoli--- package/qt/qt.mk | 2 ++ 1 file changed, 2 insertions(+)
package/qt/qt.mk +2 -0
@@ -16,6 +16,8 @@ QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz 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 or commercial +QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3 ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y) QT_CONFIGURE_OPTS += -opensource -confirm-license
Signature · 1 line
1.7.10.4
PATCH 3/5 qt: define license
Dear Luca Ceresoli,
package/qt/qt.mk QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz · line 20
Quoted 2 lines · Luca Ceresoli
package/qt/qt.mk +2
-0+QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 or commercial +QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
If Qt5, I've done:
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license +QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0 +QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +else
+QT5BASE_LICENSE = Commercial license +QT5BASE_REDISTRIBUTE = NO
+endif
Best regards,
Thomas
Signature · 4 lines
Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 3/5 qt: define license
Review
Quoted 12 lines · Thomas Petazzoni
Dear Luca Ceresoli,
package/qt/qt.mk QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz · line 20
Quoted 2 lines · Luca Ceresoli
package/qt/qt.mk +2
-0+QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 or commercial +QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3If Qt5, I've done:
(quoted diff) +3
-0+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license +QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0
Isn't it GPLv3 rather than GPLv3.0?
Review
Quoted 4 lines
(quoted diff) +4
-0+QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +else +QT5BASE_LICENSE = Commercial license +QT5BASE_REDISTRIBUTE = NO
Hm. If LICENSE_APPROVED is not set, it means that the compilation will
stop to ask the user which license s/he wants. That doesn't necessarily imply the commercial license. So I prefer an OR construct here as well. And anyway, even if you hold a commercial license you're still free to distribute it under one of the other licenses.
By the way, I'd also call it "Digia Qt Commercial license" to make it
more explicit. But that's just an opinion.
Regards,
Arnout
Quoted 9 lines
+endif
Best regards,
Thomas
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 3/5 qt: define license
Quoted 16 lines · Arnout Vandecappelle
Review
Quoted 12 lines · Thomas Petazzoni
Dear Luca Ceresoli,
package/qt/qt.mk QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz · line 20
Quoted 2 lines · Luca Ceresoli
package/qt/qt.mk +2
-0+QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 or commercial +QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3If Qt5, I've done:
(quoted diff) +3
-0+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license +QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0Isn't it GPLv3 rather than GPLv3.0?
Quoted 10 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +else +QT5BASE_LICENSE = Commercial license +QT5BASE_REDISTRIBUTE = NOHm. If
LICENSE_APPROVEDis not set, it means that the compilation will
stop to ask the user which license s/he wants. That doesn't necessarily imply the commercial license. So I prefer an OR construct here as well. And anyway, even if you hold a commercial license you're still free to distribute it under one of the other licenses.
How about the following?
QT_LICENSE = LGPLv2.1 with exceptions or GPLv3
ifneq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) QT_LICENSE += or Digia Qt Commercial license
endifQT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
This way we still cannot automatically (and safely) set _REDISTRIBUTE = NO, unless we add an explicit "Use commercial license" knob in menuconfig.
Luca
Quoted 3 lines
By the way, I'd also call it "Digia Qt Commercial license" to make it
more explicit. But that's just an opinion.
PATCH 3/5 qt: define license
Quoted 28 lines · Luca Ceresoli
Quoted 16 lines · Arnout Vandecappelle
Review
Quoted 12 lines · Thomas Petazzoni
Dear Luca Ceresoli,
package/qt/qt.mk QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz · line 20
Quoted 2 lines · Luca Ceresoli
package/qt/qt.mk +2
-0+QT_LICENSE = LGPLv2.1 with exceptions or GPLv3 or commercial +QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3If Qt5, I've done:
(quoted diff) +3
-0+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) +QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license +QT5BASE_LICENSE = LGPLv2.1 or GPLv3.0Isn't it GPLv3 rather than GPLv3.0?
Quoted 10 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+QT5BASE_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt +else +QT5BASE_LICENSE = Commercial license +QT5BASE_REDISTRIBUTE = NOHm. If
LICENSE_APPROVEDis not set, it means that the compilation will
stop to ask the user which license s/he wants. That doesn't necessarily imply the commercial license. So I prefer an OR construct here as well. And anyway, even if you hold a commercial license you're still free to distribute it under one of the other licenses.
Quoted 7 lines
How about the following?
QT_LICENSE= LGPLv2.1 with exceptions or GPLv3
ifneq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)QT_LICENSE+= or Digia Qt Commercial license
endifQT_LICENSE_FILES= LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
Sounds good to me.
Quoted 3 lines
This way we still cannot automatically (and safely) set
_REDISTRIBUTE= NO, unless we add an explicit "Use commercial license" knob in menuconfig.
I don't think that's very important.
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 3/5 qt: define license
Quoted 8 lines · Arnout Vandecappelle
Quoted 7 lines
How about the following?
QT_LICENSE= LGPLv2.1 with exceptions or GPLv3
ifneq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)QT_LICENSE+= or Digia Qt Commercial license
endifQT_LICENSE_FILES= LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
Quoted 8 lines
Sounds good to me.
Quoted 3 lines
This way we still cannot automatically (and safely) set
_REDISTRIBUTE= NO, unless we add an explicit "Use commercial license" knob in menuconfig.I don't think that's very important.
I agree. In fact I did not care about this in the v2 patch I just sent.
Luca
PATCH 4/5 fbset: define license
In reply to Luca Ceresoli--- package/fbset/fbset.mk | 1 + 1 file changed, 1 insertion(+)
package/fbset/fbset.mk +1 -0
@@ -7,6 +7,7 @@ FBSET_VERSION = 2.1 FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev +FBSET_LICENSE = GPL # Make sure full fbset wins over busybox fbset ifeq ($(BR2_PACKAGE_BUSYBOX),y)
Signature · 1 line
1.7.10.4
PATCH 4/5 fbset: define license
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Luca" == Luca Ceresoli <[email protected]> writes:
Luca> Signed-off-by: Luca Ceresoli <[email protected]> Luca> ---
Luca> package/fbset/fbset.mk | 1 +
Luca> 1 file changed, 1 insertion(+)
Luca> diff --git a/package/fbset/fbset.mk b/package/fbset/fbset.mk Luca> index 3423259..85d97d5 100644
Luca> --- a/package/fbset/fbset.mk
Luca> +++ b/package/fbset/fbset.mk
Luca> @@ -7,6 +7,7 @@
Luca> FBSET_VERSION = 2.1 Luca> FBSET_SOURCE = fbset-$(FBSET_VERSION).tar.gz Luca> FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev
Luca> +FBSET_LICENSE = GPL
It's not explicitly said, but considering how much it is linked to the kernel fbdev interface and the references to COPYING in the Linux kernel I think it should be GPLv2.
Committed with that fixed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 5/5 ccache: define license
In reply to Luca Ceresoli--- package/ccache/ccache.mk | 2 ++ 1 file changed, 2 insertions(+)
package/ccache/ccache.mk +2 -0
@@ -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
Signature · 1 line
1.7.10.4
PATCH 1/5 ffmpeg: define license
In reply to Luca CeresoliQuoted 9 lines · Luca Ceresoli
How about making it more "automagic", such as:
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_LICENSE= LGPLv2.1+, GPLv2+, libjpeg licenseFFMPEG_LICENSE_FILES= LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 elseFFMPEG_LICENSE= LGPLv2.1+, libjpeg licenseFFMPEG_LICENSE_FILES= LICENSE COPYING.LGPLv2.1 endif
Sounds good to me!
Regards,
Arnout
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/5 ffmpeg: define license
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Quoted 9 lines · Luca Ceresoli
Quoted 9 lines
How about making it more "automagic", such as:
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_LICENSE= LGPLv2.1+, GPLv2+, libjpeg licenseFFMPEG_LICENSE_FILES= LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 elseFFMPEG_LICENSE= LGPLv2.1+, libjpeg licenseFFMPEG_LICENSE_FILES= LICENSE COPYING.LGPLv2.1 endif
Arnout> Sounds good to me!
Or even better:
FFMPEG_LICENSE = LGPLv2.1+, libjpeg licenseFFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)FFMPEG_LICENSE += GPLv2+FFMPEG_LICENSE += COPYING.GPLv2
endif
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/5 ffmpeg: define license
Quoted 17 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Arnout" == Arnout Vandecappelle <[email protected]> writes:
Quoted 9 lines · Luca Ceresoli
Quoted 9 lines
How about making it more "automagic", such as:
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_LICENSE= LGPLv2.1+, GPLv2+, libjpeg licenseFFMPEG_LICENSE_FILES= LICENSE COPYING.LGPLv2.1 COPYING.GPLv2 elseFFMPEG_LICENSE= LGPLv2.1+, libjpeg licenseFFMPEG_LICENSE_FILES= LICENSE COPYING.LGPLv2.1 endifArnout> Sounds good to me!
Or even better:
Quoted 8 lines
FFMPEG_LICENSE= LGPLv2.1+, libjpeg licenseFFMPEG_LICENSE_FILES= LICENSE COPYING.LGPLv2.1ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_LICENSE+= GPLv2+FFMPEG_LICENSE+= COPYING.GPLv2
endif
Fine, will do and resend.
Luca