Skip to content

Commit

Permalink
gst1-plugins-bad: conditionally add gpl license
Browse files Browse the repository at this point in the history
Currently, GST1_PLUGINS_BAD_LICENSE_FILES starts out set to
both the GPL COPYING file and the LGPL COPYING.LIB file, but
the GST1_PLUGINS_BAD_LICENSE handling only claims LGPL, and
then intelligently adds GPL if needed.  This change moves the
GPL file addition to the same conditional clause so that the
GPL file is included in the legal-info location only if GPL
code is actually used.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
  • Loading branch information
danomimanchego123 authored and tpetazzoni committed May 3, 2018
1 parent bbe5c6d commit 2bbb6b8
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ 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
GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB
# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if
# enabled.
# 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_CONF_OPTS = \
Expand Down Expand Up @@ -772,6 +772,7 @@ 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_FILES += COPYING
endif

# Add Unknown license if Unknown licensed plugins enabled.
Expand Down

0 comments on commit 2bbb6b8

Please sign in to comment.