From patchwork Mon May 14 02:12:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danomi Manchego X-Patchwork-Id: 912653 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40kkjh6CrQz9s0q for ; Mon, 14 May 2018 12:12:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C38B62A1B3; Mon, 14 May 2018 02:12:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zd1zdpg25aV6; Mon, 14 May 2018 02:12:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7197B2C803; Mon, 14 May 2018 02:12:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E0DDD1BF20F for ; Mon, 14 May 2018 02:12:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id DBCC02C803 for ; Mon, 14 May 2018 02:12:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NfZxKLLoBCAX for ; Mon, 14 May 2018 02:12:17 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from resqmta-ch2-07v.sys.comcast.net (resqmta-ch2-07v.sys.comcast.net [69.252.207.39]) by silver.osuosl.org (Postfix) with ESMTPS id 9FADF2A1B3 for ; Mon, 14 May 2018 02:12:17 +0000 (UTC) Received: from resomta-ch2-20v.sys.comcast.net ([69.252.207.116]) by resqmta-ch2-07v.sys.comcast.net with ESMTP id I2mUfMUPzO8f7I2yGfKtH9; Mon, 14 May 2018 02:12:16 +0000 Received: from dmocelo-Aspire-E5-575G.hsd1.nj.comcast.net ([IPv6:2601:87:c480:4d8f:a370:1318:5844:fc41]) by resomta-ch2-20v.sys.comcast.net with ESMTPSA id I2yAfEW658pOfI2yGfgPyN; Mon, 14 May 2018 02:12:16 +0000 From: Danomi Manchego To: buildroot@buildroot.org Date: Sun, 13 May 2018 22:12:08 -0400 Message-Id: <1526263928-5540-1-git-send-email-danomimanchego123@gmail.com> X-Mailer: git-send-email 2.7.4 X-CMAE-Envelope: MS4wfIHKzXwS+dNeqlKdjn2Rbt96W4rDQoa8M6q2Q+kOXggOZdPHDnndbBbLZCM5XZZlLTh8QUkRzFQN6zLlbEGFkN+BcyluW80Z7xRdJzmnCdkfMtS6nAqK oiMDl7FaPxw6Yq8NMI63nVE3tQAyFYRRk+37oVoHCfy+jFn79m2mISzkS4F8NHTBceoVk2flnFOxMoMpH4UL5WV7UwkmNeSS+sKvmKEOByvHoVmudacCzha/ pTY9YhRonZznh4755nsgO0L8d4ZHl7WJq73SXO4QreT9vUoTtKdUSBAq7+XYwR693j6pILSSn1aiisjZ61kmsyv+oqHGFGJQeOkU+DlhVedYFoCLX4Ly9Sw1 tl1zJqs+ Subject: [Buildroot] [PATCH v2 1/1] gst1-plugins-bad: update plugin licenses X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adam Duskett MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 say "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 claims "GPL". * All *.[ch] files under ./gst/yadif say "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 say "GNU Lesser" or "GNU Library General Public License". 5. Add BSD-2c to dtls. * docs/plugins/inspect/plugin-dtls.xml claims "BSD". * All *.[ch] files under ./gst/dtls have 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 claims "BSD". * All *.[ch] files under ./ext/openh264 have BSD-2c text. Signed-off-by: Danomi Manchego Reviewed-by: "Yann E. MORIN" --- Changes v1 -> v2 - Fix spelling and subject/verb-agreement in commit log, per feedback from Yann E. MORIN. - Add Reviewed-by: "Yann E. MORIN" --- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index b001c33..90e2209 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -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