merge of 599c09d67423118adcf4ed6ee44637260778ff74

     and ebb36a79d8c57f959145afb2c1f8685843041b9a

12 files changed, 131 insertions, 34 deletions

diff --git a/packages/gtk+/gtk+_2.8.9.bb b/packages/gtk+/gtk+_2.8.9.bb
index cd2e331dfd..817d179f9f 100644
--- a/packages/gtk+/gtk+_2.8.9.bb
+++ b/packages/gtk+/gtk+_2.8.9.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://www.gtk.org"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt cairo"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
@@ -35,8 +35,8 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 FILES_${PN}-dev += "${datadir}/gtk-2.0/include ${libdir}/gtk-2.0/include ${bindir}/gdk-pixbuf-csource"
 
 RRECOMMENDS_${PN} = "glibc-gconv-iso8859-1"
-RRECOMMENDS_${PN}_append_angstrom = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
-RRECOMMENDS_${PN}_append_openzaurus = "gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
+RRECOMMENDS_${PN}_angstrom = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
+RRECOMMENDS_${PN}_openzaurus = "glibc-gconv-iso8859-1 gdk-pixbuf-loader-png gdk-pixbuf-loader-jpg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm"
 
 EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 # --disable-cruft
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 \
diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb
new file mode 100644
index 0000000000..50c1439410
--- /dev/null
+++ b/packages/libsdl/libsdl-x11_1.2.9.bb
@@ -0,0 +1,55 @@
+DESCRIPTION = "Simple DirectMedia Layer - X11 Edition"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "alsa-lib libx11 libxext"
+PROVIDES = "virtual/libsdl"
+LICENSE = "LGPL"
+
+# NOTE: make sure to keep PR in sync with libsdl-qpe
+PR = "r0"
+
+SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \
+	   file://extra-keys.patch;patch=1 \
+	   file://acinclude.m4"
+S = "${WORKDIR}/SDL-${PV}"
+
+inherit autotools binconfig
+
+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 \
+                --disable-video-fbcon --disable-video-directfb --disable-video-ps2gs \
+                --disable-video-xbios --disable-video-gem --disable-video-dummy \
+                --disable-video-opengl --enable-input-events --enable-pthreads \
+                --disable-video-picogui --disable-video-qtopia --enable-dlopen"
+
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${bindir}/*config"
+
+do_configure_prepend() {
+	rm -f ${S}/acinclude.m4
+	cp ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_configure_append () {
+	cd ${S}
+
+	# prevent libtool from linking libs against libstdc++, libgcc, ...
+	cat ${TARGET_PREFIX}libtool | sed -e 's/postdeps=".*"/postdeps=""/' > ${TARGET_PREFIX}libtool.tmp
+	mv ${TARGET_PREFIX}libtool.tmp ${TARGET_PREFIX}libtool
+}
+
+do_stage() {
+	oe_libinstall -so -C src libSDL ${STAGING_LIBDIR}
+	rm ${STAGING_LIBDIR}/libSDL.la
+	ln -sf libSDL.so ${STAGING_LIBDIR}/libSDL-1.2.so
+	#oe_libinstall -a -C src/main libSDLmain ${STAGING_LIBDIR}
+	install -m 0644 src/main/libSDLmain.a ${STAGING_LIBDIR}
+
+	install -d ${STAGING_INCDIR}/SDL
+	for f in include/*.h
+	do
+		install -m 0644 $f ${STAGING_INCDIR}/SDL/
+	done
+}
diff --git a/packages/lyx/lyx_1.4.0.bb b/packages/lyx/lyx_1.4.0.bb
deleted file mode 100644
index 644d8bfa73..0000000000
--- a/packages/lyx/lyx_1.4.0.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION = "LyX is an advanced type setting processor - a frontend for LaTeX"
-SECTION = "x11/office"
-LICENSE = "GPL"
-HOMEPAGE = "http://www.lyx.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "boost"
-RRECOMMENDS = "tetex"
-PR = "r0"
-
-# we're checking out from svn because the tarball doesn't contain the necessary stuff to run autoreconf
-SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags;module=lyx-1_4_0;rev=13538"
-S = "${WORKDIR}/lyx-1_4_0"
-
-inherit autotools qt3x11
-
-EXTRA_OECONF = "--with-frontend=qt --with-qt-dir=${QTDIR}"
-PARALLEL_MAKE = ""
-
-do_configure_prepend() {
-	echo "NOTE: touching missing files, please report to upstream"
-	touch lib/configure.ac lib/doc/LaTeXConfig.lyx lib/textclass.lst
-}
-
-export UIC="${OE_QMAKE_UIC}"
-export MOC="${OE_QMAKE_MOC}"
diff --git a/packages/lyx/lyx_1.4.1.bb b/packages/lyx/lyx_1.4.1.bb
index 59dc35f0ff..0ff8489134 100644
--- a/packages/lyx/lyx_1.4.1.bb
+++ b/packages/lyx/lyx_1.4.1.bb
@@ -5,11 +5,11 @@ HOMEPAGE = "http://www.lyx.org"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 DEPENDS = "boost"
 RRECOMMENDS = "tetex"
-PR = "r0"
+PR = "r1"
 
 # we're checking out from svn because the tarball doesn't contain the necessary stuff to run autoreconf
-SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags/lyx-1_4_1;module=BRANCH_1_4_X;rev=13640"
-S = "${WORKDIR}/BRANCH_1_4_X"
+SRC_URI = "svn://svn.lyx.org/lyx/lyx-devel/tags;module=lyx-1_4_1;rev=13847"
+S = "${WORKDIR}/lyx-1_4_1"
 
 inherit autotools qt3x11
 
diff --git a/packages/meta/task-qpe.bb b/packages/meta/task-qpe.bb
index 3cdd371d9e..c4d8aaa965 100644
--- a/packages/meta/task-qpe.bb
+++ b/packages/meta/task-qpe.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
 ALLOW_EMPTY = 1
 PACKAGE_ARCH = "all"
 LICENSE = "MIT"
-PR = "r4"
+PR = "r5"
 
 PACKAGES = "task-qpe-applets task-qpe-games task-qpe-inputmethods \
 	task-qpe-multimedia task-qpe-emulators task-qpe-applications \
@@ -85,6 +85,7 @@ RDEPENDS_task-qpe-games = "\
     pairs \
     pdamaze \
     pipeman \
+    pipepanic \
     powermanga \
     puzz-le \
     qfish2 \
diff --git a/packages/pango/pango_1.8.2.bb b/packages/pango/pango_1.8.2.bb
index 2b0322a5be..3ab63077bf 100644
--- a/packages/pango/pango_1.8.2.bb
+++ b/packages/pango/pango_1.8.2.bb
@@ -2,6 +2,7 @@ LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
 DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/packages/pango/pango_1.9.1.bb b/packages/pango/pango_1.9.1.bb
index db01079fe1..7f7fdd1e26 100644
--- a/packages/pango/pango_1.9.1.bb
+++ b/packages/pango/pango_1.9.1.bb
@@ -2,6 +2,7 @@ LICENSE = "LGPL"
 SECTION = "x11/libs"
 # Xt needed to keep autoconf's check for X11 happy
 DEPENDS = "glib-2.0 fontconfig freetype zlib libx11 libxft libxt gtk-doc"
+RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" 
 DESCRIPTION = "The goal of the Pango project is to provide an \
 Open Source framework for the layout and rendering of \
 internationalized text."
diff --git a/packages/pipepanic/.mtn2git_empty b/packages/pipepanic/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/pipepanic/.mtn2git_empty
diff --git a/packages/pipepanic/pipepanic_0.1.1.bb b/packages/pipepanic/pipepanic_0.1.1.bb
new file mode 100644
index 0000000000..ac54f119a4
--- /dev/null
+++ b/packages/pipepanic/pipepanic_0.1.1.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Pipepanic is a pipe connecting game using libSDL. \
+Connect as many different shaped pipes together as possible within the time given."
+HOMEPAGE = "http://www.users.waitrose.com/~thunor/pipepanic/"
+LICENSE = "GPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+
+SRC_URI = "http://www.users.waitrose.com/~thunor/pipepanic/dload/pipepanic-${PV}-source.tar.gz"
+S = "${WORKDIR}/pipepanic-0.1.1-source"
+
+APPIMAGE = "zaurus/pipepanic.png"
+APPDESKTOP = "zaurus/pipenaic.desktop"
+
+inherit sdl
+
+do_compile() {
+	oe_runmake CC="${CC}" CFLAGS="${CFLAGS}" LINK="${CCLD}" LDFLAGS="${LDFLAGS} -Wl,-rpath-link,${STAGING_LIBDIR}/../qt2/lib"
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 pipepanic ${D}${bindir}
+}
+
diff --git a/packages/uqm/uqm_0.5.0.bb b/packages/uqm/uqm_0.5.0.bb
new file mode 100644
index 0000000000..a12ae12492
--- /dev/null
+++ b/packages/uqm/uqm_0.5.0.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Star Control 2 source port using SDL (see sc2.sourceforge.net)"
+SECTION = "games"
+PRIORITY = "optional"
+DEPENDS = "virtual/libsdl libsdl-image libsdl-net libvorbis libogg zlib"
+SECTION = "games"
+PRIORITY = "optional"
+MAINTAINER = "Paul Eggleton <paule@handhelds.org>"
+LICENSE = "GPL"
+
+PR = "r0"
+
+S = "${WORKDIR}/uqm-${PV}"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/sc2/uqm-${PV}-source.tar.gz \
+           file://build-opts.sh \
+"
+
+do_configure() {
+	install ${WORKDIR}/build-opts.sh ${S}/
+	./build-opts.sh ${STAGING_DIR} ${STAGING_BINDIR} ${STAGING_LIBDIR}
+}
+
+do_compile() {
+	export ARCH="${TARGET_ARCH}"
+	export CC="${CC}"
+	export STAGING_INCDIR="${STAGING_INCDIR}"
+	export STAGING_LIBDIR="${STAGING_LIBDIR}"
+	./build.sh uqm
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 uqm ${D}${bindir}
+}