From 4b11fd6647232e69daf1a351cfe5d74c3d4ae506 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 15 May 2006 14:30:36 +0000
Subject: libsdl-qpe|x11 1.2.7 fix make it build (also) against qte-mt

---
 packages/libsdl/libsdl-qpe_1.2.7.bb | 9 ++++++++-
 packages/libsdl/libsdl-x11_1.2.7.bb | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'packages/libsdl')

diff --git a/packages/libsdl/libsdl-qpe_1.2.7.bb b/packages/libsdl/libsdl-qpe_1.2.7.bb
index d3f7236761..c003d76a31 100644
--- a/packages/libsdl/libsdl-qpe_1.2.7.bb
+++ b/packages/libsdl/libsdl-qpe_1.2.7.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
 
 # NOTE: make sure to keep PR in sync with libsdl-x11
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
            file://agawa-piro-mickey.patch;patch=1 \
@@ -34,6 +34,13 @@ EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads
 FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir}/*config"
 
+do_compile_prepend() {
+	if [ "${PALMTOP_USE_MULTITHREADED_QT}" == "yes" ]
+	then
+		sed -i s,-lqte,-lqte-mt, src/Makefile
+	fi
+}
+
 do_stage() {
 	oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
 	rm ${STAGING_LIBDIR}/libSDL.la
diff --git a/packages/libsdl/libsdl-x11_1.2.7.bb b/packages/libsdl/libsdl-x11_1.2.7.bb
index b2060cd0fd..2bdf6933a0 100644
--- a/packages/libsdl/libsdl-x11_1.2.7.bb
+++ b/packages/libsdl/libsdl-x11_1.2.7.bb
@@ -7,7 +7,7 @@ PROVIDES = "virtual/libsdl"
 LICENSE = "LGPL"
 
 # NOTE: make sure to keep PR in sync with libsdl-qpe
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
 	   file://extra-keys.patch;patch=1 \
-- 
cgit 1.2.3-korg