summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-08-29 09:03:23 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-08-29 09:03:23 +0000
commit8e49acfb489180f3e9563202194ba633c84b3a4c (patch)
tree941a84784cbfa47113956c39003cbeb9e3448d2a
parent8806f1ab1c61be5d749f8788be3e66f73f8e5c79 (diff)
parentaa12068c841cac5509cea075f0ad65a4cd3141b8 (diff)
merge of '3cf7e5f6eed59497a0164a981af89d6bd0f96fae'
and 'f51fb525f916aeb12bcca0e4627daa0b3888de81'
-rw-r--r--conf/distro/include/preferred-om-2008-versions.inc2
-rw-r--r--packages/libsdl/libsdl-x11_1.2.9.bb12
2 files changed, 1 insertions, 13 deletions
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 13040fd45d..9a30fb0aa1 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1009,7 +1009,7 @@ PREFERRED_VERSION_libsdl-native ?= "1.2.11"
PREFERRED_VERSION_libsdl-net ?= "1.2.7"
PREFERRED_VERSION_libsdl-ttf ?= "2.0.3"
PREFERRED_VERSION_libsdl-ttf-native ?= "2.0.3"
-PREFERRED_VERSION_libsdl-x11 ?= "1.2.9"
+PREFERRED_VERSION_libsdl-x11 ?= "1.2.11"
PREFERRED_VERSION_libsettings ?= "0.3"
PREFERRED_VERSION_libsexy ?= "0.1.11"
PREFERRED_VERSION_libsidplay ?= "1.36.59"
diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb
deleted file mode 100644
index 637f0ae177..0000000000
--- a/packages/libsdl/libsdl-x11_1.2.9.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require libsdl.inc
-PR = "r6"
-
-EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \
- --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \
- --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
- --disable-mintaudio --disable-nasm --enable-video-x11 --disable-video-dga \
- --enable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
- --disable-video-xbios --disable-video-gem --disable-video-dummy \
- --enable-video-opengl --enable-input-events --enable-pthreads \
- --disable-video-picogui --disable-video-qtopia --enable-dlopen"
-