diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2017-06-05 18:22:37 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-20 22:27:05 +0200 |
| commit | 310e4f07f8cdb3e3272aaed236142d58cfaa44e6 (patch) | |
| tree | 5466a68ded5d3b17e3be574de4585f87fb04a571 | |
| parent | 3c3d8efd9c19d79c2ecd2655d2027ceed0b2a23b (diff) | |
| download | buildroot-310e4f07f8cdb3e3272aaed236142d58cfaa44e6.tar.gz buildroot-310e4f07f8cdb3e3272aaed236142d58cfaa44e6.zip | |
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 <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/x264/x264.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/x264/x264.mk b/package/x264/x264.mk index 7214c967f1..d1bc76701c 100644 --- a/package/x264/x264.mk +++ b/package/x264/x264.mk @@ -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 |
