summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-30 11:31:14 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 07:11:33 (GMT)
commitad7ea213b25bf62f02c38505ce774905bf0502e1 (patch)
treec6c2ddb610456609306b1c842a31f434f1adb7d9
parent2851c970caed135f9c5d58745aa2804098649156 (diff)
downloadpoky-ad7ea213b25bf62f02c38505ce774905bf0502e1.tar.gz
libsdl: expand PACKAGECONFIG and enable native builds
Use PACKAGECONFIG instead of using logic in DEPENDS and EXTRA_OECONF, adding new options for PulseAudio, tslib, DirectFB, OpenGL and X11. Pass --disable-x11-shared so that it links to the X libraries instead of using dlopen(). Disable tslib by default as the kernel event input subsystem is generally used. SDL's OpenGL support requires X11 so check for both x11 and opengl, and merge the dependencies. Finally enable native builds, with a minimal PACKAGECONFIG that will build from oe-core for native and nativesdk. (From OE-Core master rev: 3d6c31c3a4ff34376e17005a981bb55fc6f7a38f) (From OE-Core rev: c1b39f145b9e9f65875ec7b46030327741267031) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.15.bb35
1 files changed, 18 insertions, 17 deletions
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index c0d5c6a..1cf3c39 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -12,13 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
12 12
13PROVIDES = "virtual/libsdl" 13PROVIDES = "virtual/libsdl"
14 14
15DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
16 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
17 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
18 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'libglu', '', d)} \
19 tslib"
20DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
21
22PR = "r3" 15PR = "r3"
23 16
24SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ 17SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
@@ -38,21 +31,29 @@ inherit autotools lib_package binconfig-disabled pkgconfig
38 31
39EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \ 32EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \
40 --enable-file --disable-oss --disable-esd --disable-arts \ 33 --enable-file --disable-oss --disable-esd --disable-arts \
41 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ 34 --disable-diskaudio --disable-nas \
42 --disable-mintaudio --disable-nasm --disable-video-dga \ 35 --disable-mintaudio --disable-nasm --disable-video-dga \
43 --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \ 36 --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \
44 --disable-xbios --disable-gem --disable-video-dummy \ 37 --disable-xbios --disable-gem --disable-video-dummy \
45 --enable-input-events --enable-input-tslib --enable-pthreads \ 38 --enable-input-events --enable-pthreads \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
48 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
49 --disable-video-svga \ 39 --disable-video-svga \
50 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ 40 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
51 --disable-rpath \ 41 --disable-rpath"
52 --disable-pulseaudio" 42
43PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
44 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
45 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
46 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \
47 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
48PACKAGECONFIG_class-native = "x11"
49PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
53 50
54PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 51PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib"
55PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," 52PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
53PACKAGECONFIG[tslib] = "--enable-input-tslib, --disable-input-tslib, tslib"
54PACKAGECONFIG[directfb] = "--enable-video-directfb, --disable-video-directfb, directfb"
55PACKAGECONFIG[opengl] = "--enable-video-opengl, --disable-video-opengl, virtual/libgl libglu"
56PACKAGECONFIG[x11] = "--enable-video-x11 --disable-x11-shared, --disable-video-x11, virtual/libx11 libxext libxrandr libxrender"
56 57
57EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" 58EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader"
58 59
@@ -65,4 +66,4 @@ do_configure_prepend() {
65 export SYSROOT=$PKG_CONFIG_SYSROOT_DIR 66 export SYSROOT=$PKG_CONFIG_SYSROOT_DIR
66} 67}
67 68
68BBCLASSEXTEND = "nativesdk" 69BBCLASSEXTEND = "native nativesdk"