[Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build

Yann E. MORIN yann.morin.1998 at free.fr
Fri Oct 17 21:32:14 UTC 2014


Danomi, All,

On 2014-10-12 15:30 -0400, Danomi Manchego spake thusly:
> Signed-off-by: Danomi Manchego <danomimanchego123 at gmail.com>
> 
> ---
> 
> v2 -> v3:
>  - Change enable-LGPL option to an enable-GPL, like the ffmpeg
>    option, per recommendation from Luca Ceresoli.
> 
> v1 -> v2:
>  - Move GST_FFMPEG_CONF_OPT adjustment (introduced by this patch)
>    higher in the file, so that GST_FFMPEG_CONF_EXTRA_OPT lines
>    don't get split.
> ---
>  package/gstreamer/gst-ffmpeg/Config.in     | 12 +++++++++++-
>  package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 12 +++++++++++-
>  2 files changed, 22 insertions(+), 2 deletions(-)
> 
> diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in
> index d879f5e..00c3471 100644
> --- a/package/gstreamer/gst-ffmpeg/Config.in
> +++ b/package/gstreamer/gst-ffmpeg/Config.in
> @@ -1,4 +1,4 @@
> -config BR2_PACKAGE_GST_FFMPEG
> +menuconfig BR2_PACKAGE_GST_FFMPEG

NAK.

Although I do like 'menuconfig' much for a better-lookinf layout, this
should not be part of that patch, but separate in its own one.

>  	bool "gst-ffmpeg"
>  	select BR2_PACKAGE_GST_PLUGINS_BASE
>  	depends on BR2_LARGEFILE
> @@ -8,5 +8,15 @@ config BR2_PACKAGE_GST_FFMPEG
>  
>  	  http://gstreamer.freedesktop.org/
>  
> +if BR2_PACKAGE_GST_FFMPEG
> +
> +config BR2_PACKAGE_GST_FFMPEG_GPL
> +	bool "Enable GPL code"
> +	help
> +	  Allow use of GPL code.  The resulting libs and binaries will
> +	  be under GPL.
> +
> +endif
> +
>  comment "gst-ffmpeg needs a toolchain w/ largefile, IPv6"
>  	depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
> diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
> index b94fb0f..af3e880 100644
> --- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
> +++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
> @@ -10,6 +10,16 @@ GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg
>  GST_FFMPEG_INSTALL_STAGING = YES
>  GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base
>  
> +ifeq ($(BR2_PACKAGE_GST_FFMPEG_GPL),y)
> +GST_FFMPEG_CONF_OPTS += --disable-lgpl
> +GST_FFMPEG_LICENSE = GPLv2+ (gst-ffmpeg), GPLv2+/GPL3+ (libav)

Missing 'v': GPLv3+

> +GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3
> +else
> +GST_FFMPEG_CONF_OPTS += --enable-lgpl
> +GST_FFMPEG_LICENSE = LGPL2+ (gst-ffmpeg), LGPLv2.1+/LGPL3+ (libav)

Ditto: LGPLv3+

Regards,
Yann E. MORIN.

> +GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-libs/ext/libav/COPYING.LGPLv3
> +endif
> +
>  GST_FFMPEG_CONF_EXTRA_OPTS = \
>  		--cross-prefix=$(TARGET_CROSS) \
>  		--target-os=linux
> @@ -73,6 +83,6 @@ ifeq ($(BR2_PREFER_STATIC_LIB),)
>  GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic
>  endif
>  
> -GST_FFMPEG_CONF_OPTS = --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)"
> +GST_FFMPEG_CONF_OPTS += --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)"
>  
>  $(eval $(autotools-package))
> -- 
> 1.9.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'


More information about the buildroot mailing list