summaryrefslogtreecommitdiff
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-04-19 02:59:28 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-23 11:41:03 +0100
commitfe9fe5ca5039743fc80d14f0518b95929c458b1a (patch)
tree13477a572eabe4391fa90cd569ef98328e3968d4 /meta/recipes-multimedia
parentabb2571a6352fc33a8b78ab0886d443894cda3b6 (diff)
downloadopenembedded-core-fe9fe5ca5039743fc80d14f0518b95929c458b1a.tar.gz
openembedded-core-fe9fe5ca5039743fc80d14f0518b95929c458b1a.tar.bz2
openembedded-core-fe9fe5ca5039743fc80d14f0518b95929c458b1a.zip
libav: Add libsdl to DEPENDS only when x11 is enabled
When we have opengl in distro features but not x11 and try to build libav then it calls out to build libsdl which inturn has depependency on libglu and libglu fails to build ld: error: cannot find -lGL | collect2: error: ld returned 1 exit status | make: *** [libGLU.la] Error 1 | ERROR: oe_runmake failed since libglu wants glx enabled in mesa and glx in mesa is (righly) enabled only when x11 is in distro features. This breaks the dependency chain leading to this problem Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/libav/libav.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index 5e675be3ca..2152936dc7 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -9,7 +9,7 @@ PROVIDES = "ffmpeg"
ARM_INSTRUCTION_SET = "arm"
-DEPENDS = "virtual/libsdl zlib libogg libvorbis libtheora yasm-native"
+DEPENDS = "zlib libogg libvorbis libtheora yasm-native"
INC_PR = "r8"
@@ -32,7 +32,7 @@ PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac"
-PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto"
+PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl"
EXTRA_OECONF = " \
--enable-shared \