gst1-plugins-bad: rework license type construction
PATCH 1/2 gst1-plugins-bad: rework license type construction
Use "GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct so that the list of licenses is presented as a comma-separated list.
--- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +3 -3
@@ -11,7 +11,7 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES # Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE and # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB -GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+ GST1_PLUGINS_BAD_CONF_OPTS = \ --disable-examples \
@@ -771,13 +771,13 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE += GPL +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif # Add Unknown license if Unknown licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE += UNKNOWN +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN endif # Use the following command to extract license info for plugins.
Signature · 1 line
2.7.4
PATCH 2/2 gst1-plugins-bad: update plugin licenses
Update several of the licenses annotated in the gst1-plugins-bad.mk file.
1. Specify GPL-2.0 in license info.
* All of the *.[ch] that specify GPL also specify version 2 or later.
2. Remove GPL from audiovisualizers.
* Changlog notes move from GPL to LGPL. (2015-04-25)
* docs/plugins/inspect/plugin-audiovisualizers.xml claims "LGPL".
* All *.[ch] files under ./gst/audiovisualizers says "GNU Library General Public License".
3. Add GPL to yadif.
* Changelog notes that yadif is "GPL". (2013-02-07)
* docs/plugins/inspect/plugin-yadif.xml calims "GPL".
* All *.[ch] files under ./gst/yadif says "GNU General Public License" except for one "GNU Library General Public License".
4. Remove UNKNOWN from fdk_aac.
* docs/plugins/inspect/plugin-fdkaac.xml claims "LGPL".
* All *.[ch] files under ./ext/fdkaac says "GNU Lesser" or "GNU Library General Public License".
5. Add BSD-2c to dtls.
* docs/plugins/inspect/plugin-dtls.xml calims "BSD".
* All *.[ch] files under ./gst/dtls has BSD-2c text.
6. Add BSD-2c to openh264.
* Changelog notes that openh264 is "BSD-2". (2014-10-03)
* docs/plugins/inspect/plugin-openh264.xml calims "BSD".
* All *.[ch] files under ./ext/openh264 has BSD-2c text.
--- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +10 -4
@@ -8,7 +8,7 @@ GST1_PLUGINS_BAD_VERSION = 1.12.4 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES -# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE and +# Additional plugin licenses will be appended to GST1_PLUGINS_BAD_LICENSE and # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+
@@ -198,7 +198,6 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers -GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers endif
@@ -514,6 +513,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif +GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif endif
@@ -585,7 +585,6 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac -GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac endif
@@ -632,6 +631,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls GST1_PLUGINS_BAD_DEPENDENCIES += openssl +GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls endif
@@ -682,6 +682,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264 GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264 +GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264 endif
@@ -771,10 +772,15 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif +# Add BSD license if BSD licensed plugins enabled. +ifeq ($(GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE),y) +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), BSD-2-Clause +endif + # Add Unknown license if Unknown licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y) GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN
Signature · 1 line
2.7.4
PATCH 2/2 gst1-plugins-bad: update plugin licenses
Danomi, All,
On 2018-05-06 15:04 -0400, Danomi Manchego spake thusly:
Quoted 9 lines
Update several of the licenses annotated in the gst1-plugins-bad.mk file.
1. Specify GPL-2.0 in license info.
* All of the *.[ch] that specify GPL also specify version 2 or later.2. Remove GPL from audiovisualizers.
* Changlog notes move from GPL to LGPL. (2015-04-25)
*docs/plugins/inspect/plugin-audiovisualizers.xmlclaims "LGPL".
* All *.[ch] files under ./gst/audiovisualizers says "GNU Library General Public License".
s/says/say/ # plural
Quoted 3 lines
3. Add GPL to yadif.
* Changelog notes that yadif is "GPL". (2013-02-07)
*docs/plugins/inspect/plugin-yadif.xmlcalims "GPL".
s/calims/claims/
If it were not for that one, I would have let the others slip through. ;-)
Quoted 1 line
* All *.[ch] files under ./gst/yadif says "GNU General Public License" except for one "GNU Library General Public License".
s/says/say/ # plural
Quoted 3 lines
4. Remove UNKNOWN from
fdk_aac.
*docs/plugins/inspect/plugin-fdkaac.xmlclaims "LGPL".
* All *.[ch] files under ./ext/fdkaac says "GNU Lesser" or "GNU Library General Public License".
s/says/say/ # plural
Quoted 3 lines
5. Add BSD-2c to dtls.
*docs/plugins/inspect/plugin-dtls.xmlcalims "BSD".
* All *.[ch] files under ./gst/dtls has BSD-2c text.
s/has/have/ # plural
Quoted 4 lines
6. Add BSD-2c to openh264.
* Changelog notes that openh264 is "BSD-2". (2014-10-03)
*docs/plugins/inspect/plugin-openh264.xmlcalims "BSD".
* All *.[ch] files under ./ext/openh264 has BSD-2c text.
s/has/have/ # plural
Quoted 1 line
Signed-off-by Danomi Manchego <[email protected]>
Regards,
Yann E. MORIN.
Quoted 81 lines
--- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +10
-4@@ -8,7 +8,7 @@ GST1_PLUGINS_BAD_VERSION = 1.12.4 GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad GST1_PLUGINS_BAD_INSTALL_STAGING = YES -# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE and +# Additional plugin licenses will be appended to GST1_PLUGINS_BAD_LICENSE and # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+@@ -198,7 +198,6 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers -GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers endif@@ -514,6 +513,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif +GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif endif@@ -585,7 +585,6 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac -GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac endif@@ -632,6 +631,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls GST1_PLUGINS_BAD_DEPENDENCIES += openssl +GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls endif@@ -682,6 +682,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264 GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264 +GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE = y else GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264 endif@@ -771,10 +772,15 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL-2.0+ GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif +# Add BSD license if BSD licensed plugins enabled. +ifeq ($(GST1_PLUGINS_BAD_HAS_BSD2C_LICENSE),y) +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), BSD-2-Clause +endif + # Add Unknown license if Unknown licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y) GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWNSignature · 6 lines
2.7.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 2/2 gst1-plugins-bad: update plugin licenses
In reply to Danomi ManchegoQuoted 25 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Danomi" == Danomi Manchego <[email protected]> writes:
Update several of the licenses annotated in the gst1-plugins-bad.mk file.
1. Specify GPL-2.0 in license info.
* All of the *.[ch] that specify GPL also specify version 2 or later.2. Remove GPL from audiovisualizers.
* Changlog notes move from GPL to LGPL. (2015-04-25)
*docs/plugins/inspect/plugin-audiovisualizers.xmlclaims "LGPL".
* All *.[ch] files under ./gst/audiovisualizers says "GNU Library General Public License".3. Add GPL to yadif.
* Changelog notes that yadif is "GPL". (2013-02-07)
*docs/plugins/inspect/plugin-yadif.xmlcalims "GPL".
* All *.[ch] files under ./gst/yadif says "GNU General Public License" except for one "GNU Library General Public License".4. Remove UNKNOWN from
fdk_aac.
*docs/plugins/inspect/plugin-fdkaac.xmlclaims "LGPL".
* All *.[ch] files under ./ext/fdkaac says "GNU Lesser" or "GNU Library General Public License".5. Add BSD-2c to dtls.
*docs/plugins/inspect/plugin-dtls.xmlcalims "BSD".
* All *.[ch] files under ./gst/dtls has BSD-2c text.
Quoted 6 lines
6. Add BSD-2c to openh264.
* Changelog notes that openh264 is "BSD-2". (2014-10-03)
*docs/plugins/inspect/plugin-openh264.xmlcalims "BSD".
* All *.[ch] files under ./ext/openh264 has BSD-2c text.Signed-off-by Danomi Manchego <[email protected]>
Committed to 2018.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/2 gst1-plugins-bad: rework license type construction
In reply to Danomi ManchegoDanomi, All,
On 2018-05-06 15:04 -0400, Danomi Manchego spake thusly:
Quoted 4 lines
Use "
GST1_PLUGINS_BAD_LICENSE:= $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct so that the list of licenses is presented as a comma-separated list.Signed-off-by Danomi Manchego <[email protected]>
Regards,
Yann E. MORIN.
Quoted 40 lines
--- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +3
-3@@ -11,7 +11,7 @@ GST1_PLUGINS_BAD_INSTALL_STAGING = YES # Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE and # GST1_PLUGINS_BAD_LICENSE_FILES if enabled. GST1_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB -GST1_PLUGINS_BAD_LICENSE = LGPL-2.0+, LGPL-2.1+ +GST1_PLUGINS_BAD_LICENSE := LGPL-2.0+, LGPL-2.1+ GST1_PLUGINS_BAD_CONF_OPTS = \ --disable-examples \@@ -771,13 +771,13 @@ endif # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE += GPL +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL GST1_PLUGINS_BAD_LICENSE_FILES += COPYING endif # Add Unknown license if Unknown licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE += UNKNOWN +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), UNKNOWN endif # Use the following command to extract license info for plugins.Signature · 6 lines
2.7.4 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
AppliedPATCH 1/2 gst1-plugins-bad: rework license type construction
In reply to Danomi ManchegoHello,
Quoted 4 lines · Danomi Manchego
Use "
GST1_PLUGINS_BAD_LICENSE:= $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct so that the list of licenses is presented as a comma-separated list.Signed-off-by Danomi Manchego <[email protected]>
I've applied to master, thanks! One comment below though.
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk endif · line 774
Quoted 4 lines
# Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1
-1-GST1_PLUGINS_BAD_LICENSE += GPL +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL
It would be nice to make this vague "GPL" statement a bit clearer. Are we talking about GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+ ? Or a combination of these ?
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/2 gst1-plugins-bad: rework license type construction
Thomas,
Quoted 10 lines · Thomas Petazzoni
Hello,
Quoted 4 lines · Danomi Manchego
Use "
GST1_PLUGINS_BAD_LICENSE:= $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct so that the list of licenses is presented as a comma-separated list.Signed-off-by Danomi Manchego <[email protected]>I've applied to master, thanks! One comment below though.
Quoted 8 lines
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk endif · line 774
Quoted 4 lines
# Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1
-1-GST1_PLUGINS_BAD_LICENSE += GPL +GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPLIt would be nice to make this vague "GPL" statement a bit clearer. Are we talking about GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+ ? Or a combination of these ?
You mentioned this before. I took action in the second patch in this series, http://lists.busybox.net/pipermail/buildroot/2018-May/220939.html
. In that patch, I updated which plugins were GPL, and changed "GPL" to "GPL-2.0+". As Yann mentioned, I have some proof-reading errors in the commit log, so I'll submit a new rev of that second patch.
Danomi -
Quoted 7 lines
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering
https://bootlin.com
PATCH 1/2 gst1-plugins-bad: rework license type construction
Hello,
Quoted 8 lines · Danomi Manchego
Quoted 3 lines
It would be nice to make this vague "GPL" statement a bit clearer. Are we talking about GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+ ? Or a combination of these ?
You mentioned this before. I took action in the second patch in this series, http://lists.busybox.net/pipermail/buildroot/2018-May/220939.html
. In that patch, I updated which plugins were GPL, and changed "GPL" to "GPL-2.0+".
Ah, sorry, didn't look at your second patch yet :-/
Quoted 2 lines
As Yann mentioned, I have some proof-reading errors in
the commit log, so I'll submit a new rev of that second patch.
Yes, I've seen the v2, will have a look. Thanks a lot!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/2 gst1-plugins-bad: rework license type construction
In reply to Danomi ManchegoQuoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Danomi" == Danomi Manchego <[email protected]> writes:
Use "
GST1_PLUGINS_BAD_LICENSE:= $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct so that the list of licenses is presented as a comma-separated list.Signed-off-by Danomi Manchego <[email protected]>
Committed to 2018.02.x, thanks.
Signature · 1 line
Bye, Peter Korsgaard