Skip to contentSkip to conversation

package/x264: disable optional ffmpeg support

PATCH New Bernd Kuhls 3 participants 4 messages Jun 5, 2017 – Jun 26, 2017

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/2 package/x264: disable optional ffmpeg support

In buildroot ffmpeg uses x264 as optional dependency if BR2_PACKAGE_FFMPEG_GPL is enabled at the same time.

If BR2_PACKAGE_FFMPEG_GPL is disabled and ffmpeg is built without x264 support before x264 itself is build, x264 picks up certain ffmpeg libs as optional dependency leading to build errors because x264 does not correctly link statically against ffmpeg.

To avoid a circular dependency and to avoid teaching x264 how to correctly link statically with ffmpeg we just disable all ffmpeg- related options.

Fixes
http://autobuild.buildroot.net/results/36a/36abb5b8f3aab57fb7b63056b216b4a58143ee3e/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/x264/x264.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/x264/x264.mk +1 -1
index 7214c967f..d1bc76701 100644
@@ -10,7 +10,7 @@ X264_LICENSE = GPL-2.0+
 X264_DEPENDENCIES = host-pkgconf
 X264_LICENSE_FILES = COPYING
 X264_INSTALL_STAGING = YES
-X264_CONF_OPTS = --disable-avs
+X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale
 
 ifeq ($(BR2_i386)$(BR2_x86_64),y)
 # yasm needed for assembly files
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/2 package/x264: bump version

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/x264/x264.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/x264/x264.mk +1 -1
index d1bc76701..69ec4ccea 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-X264_VERSION = 97eaef2ab82a46d13ea5e00270712d6475fbe42b
+X264_VERSION = df79067c0cf33da712d344b5f8869be7eaf326f3
 X264_SITE = git://git.videolan.org/x264.git
 X264_LICENSE = GPL-2.0+
 X264_DEPENDENCIES = host-pkgconf
Signature · 1 line
2.11.0
#2 lore raw

PATCH 1/2 package/x264: disable optional ffmpeg support

In reply to Bernd Kuhls

Hello,

Quoted 12 lines · Bernd Kuhls

In buildroot ffmpeg uses x264 as optional dependency if BR2_PACKAGE_FFMPEG_GPL is enabled at the same time.

If BR2_PACKAGE_FFMPEG_GPL is disabled and ffmpeg is built without x264 support before x264 itself is build, x264 picks up certain ffmpeg libs as optional dependency leading to build errors because x264 does not correctly link statically against ffmpeg.

To avoid a circular dependency and to avoid teaching x264 how to correctly link statically with ffmpeg we just disable all ffmpeg- related options.

Quoted 7 lines

Fixes
http://autobuild.buildroot.net/results/36a/36abb5b8f3aab57fb7b63056b216b4a58143ee3e/

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/x264/x264.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Both patches applied, thanks. On the second patch, you forgot to update the hash, so I've done so. You probably forgot because back then, we were not checking the hashes of git-downloaded packages. But now we are, so hashes should be correct.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#3 lore raw

PATCH 1/2 package/x264: disable optional ffmpeg support

Quoted 20 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 16 lines · Bernd Kuhls

In buildroot ffmpeg uses x264 as optional dependency if BR2_PACKAGE_FFMPEG_GPL is enabled at the same time.

If BR2_PACKAGE_FFMPEG_GPL is disabled and ffmpeg is built without x264 support before x264 itself is build, x264 picks up certain ffmpeg libs as optional dependency leading to build errors because x264 does not correctly link statically against ffmpeg.

To avoid a circular dependency and to avoid teaching x264 how to correctly link statically with ffmpeg we just disable all ffmpeg- related options.

Fixes
http://autobuild.buildroot.net/results/36a/36abb5b8f3aab57fb7b63056b216b4a58143ee3e/

Signed-off-by Bernd Kuhls <[email protected]>

Committed to 2017.02.x and 2017.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard