merge of '746afc454473a4b341411a3247c01c9b83c5606e'

     and 'ad51ca9ac30054f5463b958893cb1fd5986330d4'

7 files changed, 44 insertions, 2 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 6a32bf2e4f..8d5a75fcdf 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -40,7 +40,7 @@ do_report_success() {
 for machine in efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 
 do
         BUILD_MACHINE=$machine
-	BUILD_CLEAN="qmake-native qmake2-native"
+	BUILD_CLEAN="qmake-native qmake2-native qt-x11-free"
         BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \
                        gdb gdbserver strace \
 		       usbutils pciutils mtd-utils usbview hal setserial \
diff --git a/packages/cowsay/.mtn2git_empty b/packages/cowsay/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cowsay/.mtn2git_empty
diff --git a/packages/cowsay/xcowsay_1.1.bb b/packages/cowsay/xcowsay_1.1.bb
new file mode 100644
index 0000000000..85f336c85f
--- /dev/null
+++ b/packages/cowsay/xcowsay_1.1.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "xcowsay displays a cute cow and message on your desktop"
+LICENSE = "GPLv3"
+DEPENDS = "gtk+ dbus"
+
+SRC_URI = "http://www.nickg.me.uk/files/xcowsay-${PV}.tar.gz"
+
+inherit autotools
+
diff --git a/packages/gnome/gnome-games_2.23.6.bb b/packages/gnome/gnome-games_2.23.6.bb
index 6fb4dd7d89..c8e1c19da3 100644
--- a/packages/gnome/gnome-games_2.23.6.bb
+++ b/packages/gnome/gnome-games_2.23.6.bb
@@ -19,7 +19,7 @@ do_configure_prepend() {
 	done
 }
 
-do_configure_prepend() {
+do_configure_append() {
 	for i in $(find ${S} -name "Makefile") ; do
 		sed -i -e s:'-I /usr/include -I /usr/local/include'::g $i
 	done	
diff --git a/packages/libsdl/libsdl-gfx_2.0.17.bb b/packages/libsdl/libsdl-gfx_2.0.17.bb
new file mode 100644
index 0000000000..79af40ae1d
--- /dev/null
+++ b/packages/libsdl/libsdl-gfx_2.0.17.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Simple DirectMedia Layer graphic primitives library."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "zlib libpng jpeg virtual/libsdl"
+LICENSE = "LGPL"
+
+SRC_URI = "http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz"
+S = "${WORKDIR}/SDL_gfx-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-mmx"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/packages/wolf3d/.mtn2git_empty b/packages/wolf3d/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wolf3d/.mtn2git_empty
diff --git a/packages/wolf3d/wolf4sdl_1.6.bb b/packages/wolf3d/wolf4sdl_1.6.bb
new file mode 100644
index 0000000000..2e3483b164
--- /dev/null
+++ b/packages/wolf3d/wolf4sdl_1.6.bb
@@ -0,0 +1,17 @@
+LICENSE = "Various"
+DESCRIPTION = "Wolfenstein3d game engine"
+DEPENDS = "virtual/libsdl libsdl-mixer"
+
+SRC_URI = "http://www.stud.uni-karlsruhe.de/~uvaue/chaos/bins/Wolf4SDL-${PV}-src.zip"
+
+S = "${WORKDIR}/Wolf4SDL-1.6-src"
+
+TARGET_CFLAGS_append = " -lSDL -lSDL_mixer -I${STAGING_INCDIR} -I${STAGING_INCDIR}/SDL"
+
+do_compile() {
+	oe_runmake -e Q= PREFIX=${prefix}
+}
+
+do_install() {
+	oe_runmake -e Q= PREFIX=${D}/${prefix} install
+}