* [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build
@ 2014-10-12 19:30 Danomi Manchego
2014-10-12 19:30 ` [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options Danomi Manchego
` (3 more replies)
0 siblings, 4 replies; 14+ messages in thread
From: Danomi Manchego @ 2014-10-12 19:30 UTC (permalink / raw)
To: buildroot
Signed-off-by: Danomi Manchego <danomimanchego123@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
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)
+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)
+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
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options
2014-10-12 19:30 [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build Danomi Manchego
@ 2014-10-12 19:30 ` Danomi Manchego
2014-10-13 13:37 ` Luca Ceresoli
2014-10-17 21:24 ` Yann E. MORIN
2014-10-12 19:30 ` [Buildroot] [PATCH v3 3/3] gst-ffmpeg: expand package description to describe libav usage Danomi Manchego
` (2 subsequent siblings)
3 siblings, 2 replies; 14+ messages in thread
From: Danomi Manchego @ 2014-10-12 19:30 UTC (permalink / raw)
To: buildroot
The internal copy of libav in gst-ffmpeg does not understand the
PKG_CONFIG env variable, so it throws a line like this at the end
of its configuration:
WARNING: .../output/host/usr/bin/i686-pc-linux-gnu-pkg-config not found, library detection may fail.
This patch adds the --pkg-config to let libav know where it is.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
This is basically the same problem suffered by ffmpeg, fixed in
commit a9a5a8159937cbc5e472cbd0b144d596b85a3386.
---
package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
index af3e880..11f28dc 100644
--- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
+++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
@@ -22,7 +22,8 @@ endif
GST_FFMPEG_CONF_EXTRA_OPTS = \
--cross-prefix=$(TARGET_CROSS) \
- --target-os=linux
+ --target-os=linux \
+ --pkg-config='$(PKG_CONFIG_HOST_BINARY)'
ifeq ($(BR2_PACKAGE_ZLIB),y)
GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread* [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options
2014-10-12 19:30 ` [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options Danomi Manchego
@ 2014-10-13 13:37 ` Luca Ceresoli
2014-10-13 16:26 ` Danomi Manchego
2014-10-17 21:24 ` Yann E. MORIN
1 sibling, 1 reply; 14+ messages in thread
From: Luca Ceresoli @ 2014-10-13 13:37 UTC (permalink / raw)
To: buildroot
Dear Danomi,
Danomi Manchego wrote:
> The internal copy of libav in gst-ffmpeg does not understand the
> PKG_CONFIG env variable, so it throws a line like this at the end
> of its configuration:
>
> WARNING: .../output/host/usr/bin/i686-pc-linux-gnu-pkg-config not found, library detection may fail.
I tried to reproduce the issue, but the message didn't show up.
Can you chare a defconfig to reproduce the issue?
Thanks.
--
Luca
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options
2014-10-13 13:37 ` Luca Ceresoli
@ 2014-10-13 16:26 ` Danomi Manchego
2014-10-14 8:59 ` Luca Ceresoli
0 siblings, 1 reply; 14+ messages in thread
From: Danomi Manchego @ 2014-10-13 16:26 UTC (permalink / raw)
To: buildroot
Luca,
On Mon, Oct 13, 2014 at 9:37 AM, Luca Ceresoli <luca@lucaceresoli.net> wrote:
> Dear Danomi,
>
> Danomi Manchego wrote:
>>
>> The internal copy of libav in gst-ffmpeg does not understand the
>> PKG_CONFIG env variable, so it throws a line like this at the end
>> of its configuration:
>>
>> WARNING: .../output/host/usr/bin/i686-pc-linux-gnu-pkg-config not found,
>> library detection may fail.
>
>
> I tried to reproduce the issue, but the message didn't show up.
> Can you chare a defconfig to reproduce the issue?
I've seen this in a few different configurations, so I didn't think
that you needed anything special. But anyway, here is one possible
defconfig:
BR2_arm=y
BR2_cortex_a8=y
BR2_ARM_FPU_NEON=y
BR2_ENABLE_DEBUG=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_PACKAGE_GSTREAMER=y
BR2_PACKAGE_GST_FFMPEG=y
# BR2_TARGET_ROOTFS_TAR is not set
Look at the very end of the configure step, just before the build step:
License: GPL version 2 or later
Creating config.mak and config.h...
WARNING: xxxx/output/host/usr/bin/arm-none-linux-gnueabi-pkg-config
not found, library detection may fail.
configure: WARNING: unrecognized options: --disable-doc,
--disable-docs, --disable-documentation, --with-xmlto, --with-fop,
--enable-ipv6
configure: *** Orc acceleration disabled. Requires Orc >= 0.4.6,
which was not found. Slower code paths will be used.
>>> gst-ffmpeg 0.10.13 Building
Danomi -
^ permalink raw reply [flat|nested] 14+ messages in thread* [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options
2014-10-13 16:26 ` Danomi Manchego
@ 2014-10-14 8:59 ` Luca Ceresoli
0 siblings, 0 replies; 14+ messages in thread
From: Luca Ceresoli @ 2014-10-14 8:59 UTC (permalink / raw)
To: buildroot
Dear Danomi,
Danomi Manchego wrote:
> Luca,
>
> On Mon, Oct 13, 2014 at 9:37 AM, Luca Ceresoli <luca@lucaceresoli.net> wrote:
>> Dear Danomi,
>>
>> Danomi Manchego wrote:
>>>
>>> The internal copy of libav in gst-ffmpeg does not understand the
>>> PKG_CONFIG env variable, so it throws a line like this at the end
>>> of its configuration:
>>>
>>> WARNING: .../output/host/usr/bin/i686-pc-linux-gnu-pkg-config not found,
>>> library detection may fail.
>>
>>
>> I tried to reproduce the issue, but the message didn't show up.
>> Can you chare a defconfig to reproduce the issue?
>
> I've seen this in a few different configurations, so I didn't think
> that you needed anything special. But anyway, here is one possible
> defconfig:
>
> BR2_arm=y
> BR2_cortex_a8=y
> BR2_ARM_FPU_NEON=y
> BR2_ENABLE_DEBUG=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_PACKAGE_GSTREAMER=y
> BR2_PACKAGE_GST_FFMPEG=y
> # BR2_TARGET_ROOTFS_TAR is not set
>
> Look at the very end of the configure step, just before the build step:
>
> License: GPL version 2 or later
> Creating config.mak and config.h...
>
> WARNING: xxxx/output/host/usr/bin/arm-none-linux-gnueabi-pkg-config
> not found, library detection may fail.
Reproduced with this config, and disappeared applying your patch.
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
--
Luca
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options
2014-10-12 19:30 ` [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options Danomi Manchego
2014-10-13 13:37 ` Luca Ceresoli
@ 2014-10-17 21:24 ` Yann E. MORIN
2014-10-17 21:39 ` Bernd Kuhls
2014-10-18 11:51 ` Thomas Petazzoni
1 sibling, 2 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-10-17 21:24 UTC (permalink / raw)
To: buildroot
Danomi, All,
On 2014-10-12 15:30 -0400, Danomi Manchego spake thusly:
> The internal copy of libav in gst-ffmpeg does not understand the
> PKG_CONFIG env variable, so it throws a line like this at the end
> of its configuration:
>
> WARNING: .../output/host/usr/bin/i686-pc-linux-gnu-pkg-config not found, library detection may fail.
Instead of fixing just that one package, shouldn't we provide a symlink:
TUPLE-pkg-config -> pkg-config
This way, all packages that expect a cross-pkg-config will work without
customisation.
Thomas, thoughts?
Regards,
Yann E. MORIN.
> This patch adds the --pkg-config to let libav know where it is.
>
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
>
> ---
>
> This is basically the same problem suffered by ffmpeg, fixed in
> commit a9a5a8159937cbc5e472cbd0b144d596b85a3386.
> ---
> package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
> index af3e880..11f28dc 100644
> --- a/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
> +++ b/package/gstreamer/gst-ffmpeg/gst-ffmpeg.mk
> @@ -22,7 +22,8 @@ endif
>
> GST_FFMPEG_CONF_EXTRA_OPTS = \
> --cross-prefix=$(TARGET_CROSS) \
> - --target-os=linux
> + --target-os=linux \
> + --pkg-config='$(PKG_CONFIG_HOST_BINARY)'
>
> ifeq ($(BR2_PACKAGE_ZLIB),y)
> GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib
> --
> 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 14+ messages in thread* [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options
2014-10-17 21:24 ` Yann E. MORIN
@ 2014-10-17 21:39 ` Bernd Kuhls
2014-10-17 22:46 ` Yann E. MORIN
2014-10-18 11:51 ` Thomas Petazzoni
1 sibling, 1 reply; 14+ messages in thread
From: Bernd Kuhls @ 2014-10-17 21:39 UTC (permalink / raw)
To: buildroot
"Yann E. MORIN" <yann.morin.1998@free.fr> wrote in
news:20141017212453.GI3971 at free.fr:
> Instead of fixing just that one package, shouldn't we provide a symlink:
> TUPLE-pkg-config -> pkg-config
>
> This way, all packages that expect a cross-pkg-config will work without
> customisation.
>
> Thomas, thoughts?
Hi,
I had the same idea back in January, but Thomas did not like it ;)
http://patchwork.ozlabs.org/patch/312273/
Regards, Bernd
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options
2014-10-17 21:39 ` Bernd Kuhls
@ 2014-10-17 22:46 ` Yann E. MORIN
0 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-10-17 22:46 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2014-10-17 23:39 +0200, Bernd Kuhls spake thusly:
> "Yann E. MORIN" <yann.morin.1998@free.fr> wrote in
> news:20141017212453.GI3971 at free.fr:
>
> > Instead of fixing just that one package, shouldn't we provide a symlink:
> > TUPLE-pkg-config -> pkg-config
> >
> > This way, all packages that expect a cross-pkg-config will work without
> > customisation.
> >
> > Thomas, thoughts?
>
> Hi,
>
> I had the same idea back in January, but Thomas did not like it ;)
> http://patchwork.ozlabs.org/patch/312273/
Damned! :-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options
2014-10-17 21:24 ` Yann E. MORIN
2014-10-17 21:39 ` Bernd Kuhls
@ 2014-10-18 11:51 ` Thomas Petazzoni
2014-10-18 13:14 ` Arnout Vandecappelle
1 sibling, 1 reply; 14+ messages in thread
From: Thomas Petazzoni @ 2014-10-18 11:51 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Fri, 17 Oct 2014 23:24:53 +0200, Yann E. MORIN wrote:
> > WARNING: .../output/host/usr/bin/i686-pc-linux-gnu-pkg-config not found, library detection may fail.
>
> Instead of fixing just that one package, shouldn't we provide a symlink:
> TUPLE-pkg-config -> pkg-config
>
> This way, all packages that expect a cross-pkg-config will work without
> customisation.
>
> Thomas, thoughts?
I don't have a very strong opinion here. How many packages expect
TUPLE-pkg-config instead of pkg-config? I'm not sure it's really the
majority, and if it's not, I prefer to keep handling this on a
per-package basis rather than adding a symlink.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options
2014-10-18 11:51 ` Thomas Petazzoni
@ 2014-10-18 13:14 ` Arnout Vandecappelle
0 siblings, 0 replies; 14+ messages in thread
From: Arnout Vandecappelle @ 2014-10-18 13:14 UTC (permalink / raw)
To: buildroot
On 18/10/14 13:51, Thomas Petazzoni wrote:
> Dear Yann E. MORIN,
>
> On Fri, 17 Oct 2014 23:24:53 +0200, Yann E. MORIN wrote:
>
>>> WARNING: .../output/host/usr/bin/i686-pc-linux-gnu-pkg-config not found, library detection may fail.
>>
>> Instead of fixing just that one package, shouldn't we provide a symlink:
>> TUPLE-pkg-config -> pkg-config
>>
>> This way, all packages that expect a cross-pkg-config will work without
>> customisation.
>>
>> Thomas, thoughts?
>
> I don't have a very strong opinion here. How many packages expect
> TUPLE-pkg-config instead of pkg-config? I'm not sure it's really the
> majority, and if it's not, I prefer to keep handling this on a
> per-package basis rather than adding a symlink.
Actually, even if it is just two packages that use it, I think it is worthwhile
to add the symlink. It is one less thing to solve when adding a package.
Regards,
Arnout
--
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
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 3/3] gst-ffmpeg: expand package description to describe libav usage
2014-10-12 19:30 [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build Danomi Manchego
2014-10-12 19:30 ` [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options Danomi Manchego
@ 2014-10-12 19:30 ` Danomi Manchego
2014-10-13 12:15 ` Luca Ceresoli
2014-10-13 12:16 ` [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build Luca Ceresoli
2014-10-17 21:32 ` Yann E. MORIN
3 siblings, 1 reply; 14+ messages in thread
From: Danomi Manchego @ 2014-10-12 19:30 UTC (permalink / raw)
To: buildroot
- Change URL to gst-ffmpeg page at the gstreamer site.
- Note that gst-ffmpeg actually uses libav, not ffmpeg [anymore].
- Note that gst-ffmpeg is using an internal copy of libav, not a
system copy.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
package/gstreamer/gst-ffmpeg/Config.in | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in
index 00c3471..10e51b3 100644
--- a/package/gstreamer/gst-ffmpeg/Config.in
+++ b/package/gstreamer/gst-ffmpeg/Config.in
@@ -4,9 +4,14 @@ menuconfig BR2_PACKAGE_GST_FFMPEG
depends on BR2_LARGEFILE
depends on BR2_INET_IPV6
help
- GStreamer plugin using FFmpeg.
+ GStreamer plugin containing one plugin with a set of elements using
+ the Libav library. It contains most popular decoders as well as
+ colorspace conversion elements.
- http://gstreamer.freedesktop.org/
+ This package is configured to use an internal copy of the Libav
+ library.
+
+ http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html
if BR2_PACKAGE_GST_FFMPEG
--
1.9.1
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build
2014-10-12 19:30 [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build Danomi Manchego
2014-10-12 19:30 ` [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options Danomi Manchego
2014-10-12 19:30 ` [Buildroot] [PATCH v3 3/3] gst-ffmpeg: expand package description to describe libav usage Danomi Manchego
@ 2014-10-13 12:16 ` Luca Ceresoli
2014-10-17 21:32 ` Yann E. MORIN
3 siblings, 0 replies; 14+ messages in thread
From: Luca Ceresoli @ 2014-10-13 12:16 UTC (permalink / raw)
To: buildroot
Dear Danomi,
Danomi Manchego wrote:
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
--
Luca
^ permalink raw reply [flat|nested] 14+ messages in thread
* [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build
2014-10-12 19:30 [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build Danomi Manchego
` (2 preceding siblings ...)
2014-10-13 12:16 ` [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build Luca Ceresoli
@ 2014-10-17 21:32 ` Yann E. MORIN
3 siblings, 0 replies; 14+ messages in thread
From: Yann E. MORIN @ 2014-10-17 21:32 UTC (permalink / raw)
To: buildroot
Danomi, All,
On 2014-10-12 15:30 -0400, Danomi Manchego spake thusly:
> Signed-off-by: Danomi Manchego <danomimanchego123@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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-10-18 13:14 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-12 19:30 [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build Danomi Manchego
2014-10-12 19:30 ` [Buildroot] [PATCH v3 2/3] gst-ffmpeg: add --pkg-config to internal libav configure options Danomi Manchego
2014-10-13 13:37 ` Luca Ceresoli
2014-10-13 16:26 ` Danomi Manchego
2014-10-14 8:59 ` Luca Ceresoli
2014-10-17 21:24 ` Yann E. MORIN
2014-10-17 21:39 ` Bernd Kuhls
2014-10-17 22:46 ` Yann E. MORIN
2014-10-18 11:51 ` Thomas Petazzoni
2014-10-18 13:14 ` Arnout Vandecappelle
2014-10-12 19:30 ` [Buildroot] [PATCH v3 3/3] gst-ffmpeg: expand package description to describe libav usage Danomi Manchego
2014-10-13 12:15 ` Luca Ceresoli
2014-10-13 12:16 ` [Buildroot] [PATCH v3 1/3] gst-ffmpeg: add option to select GPL vs LGPL build Luca Ceresoli
2014-10-17 21:32 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox