[oe-commits] [openembedded-core] 40/43: ffmpeg: fix pkg-config utilization
git at git.openembedded.org
git at git.openembedded.org
Sat Jul 22 07:21:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit c629377122ab348846a3f7b35e93333782dcca8d
Author: Nicolas Dechesne <nicolas.dechesne at linaro.org>
AuthorDate: Thu Jul 20 16:55:11 2017 +0200
ffmpeg: fix pkg-config utilization
in config.log we can see:
WARNING: aarch64-linaro-linux-pkg-config not found, library detection may fail.
ffmpeg configure script is not looking for pkg-config at the rigt place since it
is assuming cross compilation. let's force its value in the recipe.
This patches 'fixes' library detection, so it also adds:
--disable-libxcb
--disable-libxcb-shm
--disable-libxcb-xfixes
--disable-libxcb-shape
Which were dangling configure options, which started to be enabled after the
pkg-config fix, so they need now to be explicitely disabled. Follow up patch
will enable these options when DISTRO_FEATURES has x11.
Signed-off-by: Nicolas Dechesne <nicolas.dechesne at linaro.org>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb
index 73213cc..3c18367 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_3.3.2.bb
@@ -88,6 +88,10 @@ EXTRA_OECONF = " \
--enable-pic \
--enable-shared \
--enable-pthreads \
+ --disable-libxcb \
+ --disable-libxcb-shm \
+ --disable-libxcb-xfixes \
+ --disable-libxcb-shape \
${@bb.utils.contains('USE_NONFREE', 'yes', '--enable-nonfree', '', d)} \
\
--cross-prefix=${TARGET_PREFIX} \
@@ -108,6 +112,7 @@ EXTRA_OECONF = " \
--datadir=${datadir}/ffmpeg \
${@bb.utils.contains('AVAILTUNES', 'mips32r2', '', '--disable-mipsdsp --disable-mipsdspr2', d)} \
--cpu=${@cpu(d)} \
+ --pkg-config=pkg-config \
"
EXTRA_OECONF_append_linux-gnux32 = " --disable-asm"
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list