diff options
author | Khem Raj <raj.khem@gmail.com> | 2014-04-19 02:59:28 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-23 11:43:26 +0100 |
commit | 4961972550fabc70dfa4e07925dcb8331a00ef0b (patch) | |
tree | f64f91fb15bfa4f5d4fa62a5db4cb4d21ad176a3 /meta | |
parent | 4beb639f453f098d3f1c6763e4f14fe68284d29d (diff) | |
download | poky-4961972550fabc70dfa4e07925dcb8331a00ef0b.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)
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.inc | 4 |
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 | ||
10 | ARM_INSTRUCTION_SET = "arm" | 10 | ARM_INSTRUCTION_SET = "arm" |
11 | 11 | ||
12 | DEPENDS = "virtual/libsdl zlib libogg libvorbis libtheora yasm-native" | 12 | DEPENDS = "zlib libogg libvorbis libtheora yasm-native" |
13 | 13 | ||
14 | INC_PR = "r8" | 14 | INC_PR = "r8" |
15 | 15 | ||
@@ -32,7 +32,7 @@ PACKAGECONFIG[x264] = "--enable-libx264,--disable-libx264,x264" | |||
32 | PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" | 32 | PACKAGECONFIG[vpx] = "--enable-libvpx,--disable-libvpx,libvpx" |
33 | PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame" | 33 | PACKAGECONFIG[mp3lame] = "--enable-libmp3lame,--disable-libmp3lame,lame" |
34 | PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" | 34 | PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" |
35 | PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto" | 35 | PACKAGECONFIG[x11] = "--enable-x11grab,--disable-x11grab,virtual/libx11 libxfixes libxext xproto virtual/libsdl" |
36 | 36 | ||
37 | EXTRA_OECONF = " \ | 37 | EXTRA_OECONF = " \ |
38 | --enable-shared \ | 38 | --enable-shared \ |