summaryrefslogtreecommitdiffstats
path: root/meta
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-05-29 13:42:17 +0100
commit9153d11e6c1ae809107d51f20951a02e4ddcdb12 (patch)
tree1d138bf1f19b176bba56ce536964a81ac75eca25 /meta
parentde20bf01e43e3575000686f2e79f9c859df03743 (diff)
downloadpoky-9153d11e6c1ae809107d51f20951a02e4ddcdb12.tar.gz
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 (From OE-Core rev: fe9fe5ca5039743fc80d14f0518b95929c458b1a) (From OE-Core rev: 740deb02b653d1c5174be99c3093dac5af73f6ff) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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"
9 9
10ARM_INSTRUCTION_SET = "arm" 10ARM_INSTRUCTION_SET = "arm"
11 11
12DEPENDS = "virtual/libsdl zlib libogg libvorbis libtheora yasm-native" 12DEPENDS = "zlib libogg libvorbis libtheora yasm-native"
13 13
14INC_PR = "r8" 14INC_PR = "r8"
15 15
@@ -32,7 +32,7 @@ PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264"
32PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" 32PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx"
33PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame" 33PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame"
34PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" 34PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac"
35PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto" 35PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl"
36 36
37EXTRA_OECONF = " \ 37EXTRA_OECONF = " \
38 --enable-shared \ 38 --enable-shared \