* [Buildroot] [PATCH 1/3] ffmpeg: consolidate duplicated config options
@ 2014-09-09 2:06 Danomi Manchego
2014-09-09 2:06 ` [Buildroot] [PATCH 2/3] ffmpeg: enable or disable debug based on BR2_ENABLE_DEBUG Danomi Manchego
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Danomi Manchego @ 2014-09-09 2:06 UTC (permalink / raw)
To: buildroot
Commit 62ab07ef769bd6504fe1db144aaac3fd45db9dad added a bunch
of hard-coded options. Some of these options are then again
added (or negated) based on kconfig settings. This patch removes
the hard coded swscale and postproc settings, as they are enabled
or disabled later. It also moves the --disable-pic lower
as an else clause to the part that adds --enable-pic.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
package/ffmpeg/ffmpeg.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 6771309..2c52183 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -22,15 +22,12 @@ FFMPEG_CONF_OPT = \
--disable-debug \
--disable-version3 \
--enable-logging \
- --disable-pic \
--enable-optimizations \
--disable-extra-warnings \
--disable-ffprobe \
--enable-avdevice \
--enable-avcodec \
--enable-avformat \
- --enable-swscale \
- --enable-postproc \
--disable-x11grab \
--enable-network \
--disable-gray \
@@ -312,6 +309,8 @@ endif
ifeq ($(BR2_PREFER_STATIC_LIB),)
FFMPEG_CONF_OPT += --enable-pic
+else
+FFMPEG_CONF_OPT += --disable-pic
endif
FFMPEG_CONF_OPT += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF))
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3] ffmpeg: enable or disable debug based on BR2_ENABLE_DEBUG
2014-09-09 2:06 [Buildroot] [PATCH 1/3] ffmpeg: consolidate duplicated config options Danomi Manchego
@ 2014-09-09 2:06 ` Danomi Manchego
2014-09-21 20:51 ` Thomas Petazzoni
2014-09-09 2:06 ` [Buildroot] [PATCH 3/3] ffmpeg: add --pkg-config to configure options Danomi Manchego
2014-09-21 20:48 ` [Buildroot] [PATCH 1/3] ffmpeg: consolidate duplicated config options Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Danomi Manchego @ 2014-09-09 2:06 UTC (permalink / raw)
To: buildroot
Rather than hard-code --disable-debug, selectively enable
or disable based on BR2_ENABLE_DEBUG.
(Similar to gst1-libav.)
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
package/ffmpeg/ffmpeg.mk | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 2c52183..d50720b 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -17,9 +17,8 @@ FFMPEG_LICENSE_FILES += COPYING.GPLv2
endif
FFMPEG_CONF_OPT = \
- --prefix=/usr \
+ --prefix=/usr \
--enable-avfilter \
- --disable-debug \
--disable-version3 \
--enable-logging \
--enable-optimizations \
@@ -68,6 +67,12 @@ FFMPEG_CONF_OPT = \
FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+ifeq ($(BR2_ENABLE_DEBUG),y)
+FFMPEG_CONF_OPT += --enable-debug
+else
+FFMPEG_CONF_OPT += --disable-debug
+endif
+
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
FFMPEG_CONF_OPT += --enable-gpl
else
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] ffmpeg: add --pkg-config to configure options
2014-09-09 2:06 [Buildroot] [PATCH 1/3] ffmpeg: consolidate duplicated config options Danomi Manchego
2014-09-09 2:06 ` [Buildroot] [PATCH 2/3] ffmpeg: enable or disable debug based on BR2_ENABLE_DEBUG Danomi Manchego
@ 2014-09-09 2:06 ` Danomi Manchego
2014-09-21 20:55 ` Thomas Petazzoni
2014-09-21 20:48 ` [Buildroot] [PATCH 1/3] ffmpeg: consolidate duplicated config options Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Danomi Manchego @ 2014-09-09 2:06 UTC (permalink / raw)
To: buildroot
The 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/arm-none-linux-gnueabi-pkg-config not found, library detection may fail.
Apparently, some of the indevs and outdevs need a pkg-config.
This patch adds the --pkg-config to let ffmpeg know where it
is.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
package/ffmpeg/ffmpeg.mk | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index d50720b..b1d524e 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -65,7 +65,7 @@ FFMPEG_CONF_OPT = \
--disable-symver \
--disable-doc
-FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
ifeq ($(BR2_ENABLE_DEBUG),y)
FFMPEG_CONF_OPT += --enable-debug
@@ -327,13 +327,14 @@ define FFMPEG_CONFIGURE_CMDS
$(TARGET_CONFIGURE_ARGS) \
$(FFMPEG_CONF_ENV) \
./configure \
- --enable-cross-compile \
+ --enable-cross-compile \
--cross-prefix=$(TARGET_CROSS) \
--sysroot=$(STAGING_DIR) \
--host-cc="$(HOSTCC)" \
--arch=$(BR2_ARCH) \
--target-os="linux" \
--disable-stripping \
+ --pkg-config="$(PKG_CONFIG_HOST_BINARY)" \
$(if $(BR2_GCC_TARGET_TUNE),--cpu=$(BR2_GCC_TARGET_TUNE)) \
$(SHARED_STATIC_LIBS_OPTS) \
$(FFMPEG_CONF_OPT) \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/3] ffmpeg: consolidate duplicated config options
2014-09-09 2:06 [Buildroot] [PATCH 1/3] ffmpeg: consolidate duplicated config options Danomi Manchego
2014-09-09 2:06 ` [Buildroot] [PATCH 2/3] ffmpeg: enable or disable debug based on BR2_ENABLE_DEBUG Danomi Manchego
2014-09-09 2:06 ` [Buildroot] [PATCH 3/3] ffmpeg: add --pkg-config to configure options Danomi Manchego
@ 2014-09-21 20:48 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2014-09-21 20:48 UTC (permalink / raw)
To: buildroot
Dear Danomi Manchego,
On Mon, 8 Sep 2014 22:06:44 -0400, Danomi Manchego wrote:
> Commit 62ab07ef769bd6504fe1db144aaac3fd45db9dad added a bunch
> of hard-coded options. Some of these options are then again
> added (or negated) based on kconfig settings. This patch removes
> the hard coded swscale and postproc settings, as they are enabled
> or disabled later. It also moves the --disable-pic lower
> as an else clause to the part that adds --enable-pic.
>
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
> ---
> package/ffmpeg/ffmpeg.mk | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/3] ffmpeg: enable or disable debug based on BR2_ENABLE_DEBUG
2014-09-09 2:06 ` [Buildroot] [PATCH 2/3] ffmpeg: enable or disable debug based on BR2_ENABLE_DEBUG Danomi Manchego
@ 2014-09-21 20:51 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2014-09-21 20:51 UTC (permalink / raw)
To: buildroot
Dear Danomi Manchego,
On Mon, 8 Sep 2014 22:06:45 -0400, Danomi Manchego wrote:
> FFMPEG_CONF_OPT = \
> - --prefix=/usr \
> + --prefix=/usr \
Unrelated change, so I removed this change from the patch.
> --enable-avfilter \
> - --disable-debug \
> --disable-version3 \
> --enable-logging \
> --enable-optimizations \
> @@ -68,6 +67,12 @@ FFMPEG_CONF_OPT = \
>
> FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
>
> +ifeq ($(BR2_ENABLE_DEBUG),y)
> +FFMPEG_CONF_OPT += --enable-debug
> +else
> +FFMPEG_CONF_OPT += --disable-debug
> +endif
> +
> ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
> FFMPEG_CONF_OPT += --enable-gpl
> else
Other than that, applied, thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 3/3] ffmpeg: add --pkg-config to configure options
2014-09-09 2:06 ` [Buildroot] [PATCH 3/3] ffmpeg: add --pkg-config to configure options Danomi Manchego
@ 2014-09-21 20:55 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2014-09-21 20:55 UTC (permalink / raw)
To: buildroot
Dear Danomi Manchego,
On Mon, 8 Sep 2014 22:06:46 -0400, Danomi Manchego wrote:
> The 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/arm-none-linux-gnueabi-pkg-config not found, library detection may fail.
>
> Apparently, some of the indevs and outdevs need a pkg-config.
> This patch adds the --pkg-config to let ffmpeg know where it
> is.
>
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
> ---
> package/ffmpeg/ffmpeg.mk | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
> index d50720b..b1d524e 100644
> --- a/package/ffmpeg/ffmpeg.mk
> +++ b/package/ffmpeg/ffmpeg.mk
> @@ -65,7 +65,7 @@ FFMPEG_CONF_OPT = \
> --disable-symver \
> --disable-doc
>
> -FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
> +FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
>
> ifeq ($(BR2_ENABLE_DEBUG),y)
> FFMPEG_CONF_OPT += --enable-debug
> @@ -327,13 +327,14 @@ define FFMPEG_CONFIGURE_CMDS
> $(TARGET_CONFIGURE_ARGS) \
> $(FFMPEG_CONF_ENV) \
> ./configure \
> - --enable-cross-compile \
> + --enable-cross-compile \
Unrelated change.
> --cross-prefix=$(TARGET_CROSS) \
> --sysroot=$(STAGING_DIR) \
> --host-cc="$(HOSTCC)" \
> --arch=$(BR2_ARCH) \
> --target-os="linux" \
> --disable-stripping \
> + --pkg-config="$(PKG_CONFIG_HOST_BINARY)" \
> $(if $(BR2_GCC_TARGET_TUNE),--cpu=$(BR2_GCC_TARGET_TUNE)) \
> $(SHARED_STATIC_LIBS_OPTS) \
> $(FFMPEG_CONF_OPT) \
So I've removed the unrelated change, and committed your patch.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-09-21 20:55 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-09 2:06 [Buildroot] [PATCH 1/3] ffmpeg: consolidate duplicated config options Danomi Manchego
2014-09-09 2:06 ` [Buildroot] [PATCH 2/3] ffmpeg: enable or disable debug based on BR2_ENABLE_DEBUG Danomi Manchego
2014-09-21 20:51 ` Thomas Petazzoni
2014-09-09 2:06 ` [Buildroot] [PATCH 3/3] ffmpeg: add --pkg-config to configure options Danomi Manchego
2014-09-21 20:55 ` Thomas Petazzoni
2014-09-21 20:48 ` [Buildroot] [PATCH 1/3] ffmpeg: consolidate duplicated config options Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox