| Message ID | 20170605162238.8413-1-bernd.kuhls@t-online.de |
|---|---|
| State | Accepted |
| Headers | show |
Hello, On Mon, 5 Jun 2017 18:22:37 +0200, Bernd Kuhls wrote: > 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> > --- > 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
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Hello, > On Mon, 5 Jun 2017 18:22:37 +0200, Bernd Kuhls wrote: >> 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> Committed to 2017.02.x and 2017.05.x, thanks.
diff --git a/package/x264/x264.mk b/package/x264/x264.mk index 7214c967f..d1bc76701 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
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> --- package/x264/x264.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)