merge of '187416af25eba4fe476e378c52987bbc1e156cc8'

     and '7b4883000de7f9e1688f6fcde7bdd3f8b0e548c2'

21 files changed, 116 insertions, 78 deletions

diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index cdfd58852d..657e4d9693 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -37,22 +37,23 @@ do_report_success() {
 	echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log
 }
 
-for machine in gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700  
+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="libtool-cross qmake-native qmake2-native"
+	BUILD_CLEAN="qmake-native qmake2-native"
         BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \
-                       usbutils pciutils mtd-utils usbview hal setserial \
+                       gdb gdbserver strace \
+		       usbutils pciutils mtd-utils usbview hal setserial \
                        task-proper-tools mc screen findutils \
 	               mono jamvm perl python ruby \
 		       gtk+ qt-x11-free qt4-x11-free \
 		       gpe-mini-browser gpe-mini-browser2 netsurf midori firefox epiphany fennec minimo openmoko-browser2 \
 		       samba meta-nas-server \
 		       apache2 boa cherokee lighttpd thttpd \
-		       gpe-gallery gpe-scap notecase task-gpe-pim \
+		       gpe-sketchbook gpe-gallery gpe-scap notecase task-gpe-pim \
 		       pidgin irssi \
 		       roadmap-gtk2 gpsdrive navit viking \
-		       xmms totem mplayer quasar vlc-gpe gnome-mplayer \
+		       ffmpeg xmms totem mplayer quasar vlc-gpe gnome-mplayer \
 		       wpa-gui wifi-radar kismet aircrack-ng dsniff \
 		       nmap iptables iperf openvpn vpnc \
 		       gpe-login ipaq-sleep \
@@ -68,12 +69,16 @@ do
 		       xserver-kdrive xserver-xorg \
 		       xf86-video-fbdev xf86-video-ati xf86-video-vesa \
 		       xf86-input-evdev xf86-input-keyboard xf86-input-mouse \
-		       task-opie \
+		       task-opie task-opie-all \
 		       task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \
 		       gsm0710muxd frameworkd zhone \
                gnome-games \
                mythtv \
-	       "
+	           ioquake3 quake2 quetoo sdlquake \
+               prboom openredalert \		
+               e-wm \
+               angstrom-x11-base-depends angstrom-zeroconf-audio angstrom-gpe-task-settings \
+"
 	do_build
 done
 
diff --git a/packages/cnc/.mtn2git_empty b/packages/cnc/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cnc/.mtn2git_empty
diff --git a/packages/cnc/openredalert/.mtn2git_empty b/packages/cnc/openredalert/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/cnc/openredalert/.mtn2git_empty
diff --git a/packages/cnc/openredalert/openredalert-launcher b/packages/cnc/openredalert/openredalert-launcher
new file mode 100755
index 0000000000..4e5dad4bb6
--- /dev/null
+++ b/packages/cnc/openredalert/openredalert-launcher
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+( cd /usr/share/games/redalert && ./openredalert )
diff --git a/packages/cnc/openredalert_r438.bb b/packages/cnc/openredalert_r438.bb
new file mode 100644
index 0000000000..4da245614a
--- /dev/null
+++ b/packages/cnc/openredalert_r438.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "Game engine to run Red Alert 1"
+LICENSE = "GPLv2"
+
+DEPENDS = "virtual/libsdl libsdl-mixer" 
+
+SRC_URI = "http://openredalert.googlecode.com/files/openredalert-${PV}-src.tar.gz \
+           file://openredalert-launcher"
+
+S = "${WORKDIR}"
+
+CFLAGS_append = " -I. -I${STAGING_INCDIR}"
+
+do_compile() {
+	cd ${S}/src ; cp ${S}/makefile .
+	oe_runmake -e 
+}
+
+do_install() {
+	install -d ${D}/${datadir}/games/redalert/
+	cp -pPr ${S}/data ${D}/${datadir}/games/redalert/
+	install -m 0755 ${S}/src/openredalert ${D}/${datadir}/games/redalert/
+
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/openredalert-launcher ${D}/${bindir}	
+}
+
+FILES_${PN} += "${datadir}/games/redalert/"
+FILES_${PN}-dbg += "${datadir}/games/redalert/.debug"
diff --git a/packages/cnc/redalert-demo-gamedata.bb b/packages/cnc/redalert-demo-gamedata.bb
new file mode 100644
index 0000000000..1aa5722647
--- /dev/null
+++ b/packages/cnc/redalert-demo-gamedata.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Red Alert Demo game data"
+LICENSE = "shareware"
+
+SRC_URI = "ftp://ftp.westwood.com/pub/redalert/previews/demo/ra95demo.zip"
+
+do_install() {
+	install -d ${D}/${datadir}/games/redalert/data/mix
+	cp ${WORKDIR}/ra95demo/INSTALL/MAIN.MIX ${D}/${datadir}/games/redalert/data/mix/main.mix
+	cp ${WORKDIR}/ra95demo/INSTALL/REDALERT.MIX ${D}/${datadir}/games/redalert/data/mix/redalert.mix
+}
+
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += "${datadir}/games/redalert/"
+
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index c4f4677dea..d12bfd7c1d 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -4,7 +4,7 @@ DEPENDS += "schroedinger libgsm"
 
 PE = "1"
 PV = "0.4.9+${PR}+gitr${SRCREV}" 
-PR = "r32"
+PR = "r33"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_armv5te = "1"
@@ -16,8 +16,8 @@ FFBRANCH_arm = "arm"
 FFBRANCH ?= "master"
 
 # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
-SRCREV = "b06c88bbec744970e023a03abed314f10d6936da"
-SRCREV_arm = "afb98868e19e63cbca6c9f0ed9e6cfa48d40277d"
+SRCREV = "adcf5e23c16d4c26f6e0e9b7eba8bbbd487e1cf5"
+SRCREV_arm = "2e95f2adfbb11d033b5736d79f5beacf202ad993"
 SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
 "
 
diff --git a/packages/ffmpeg/omapfbplay_git.bb b/packages/ffmpeg/omapfbplay_git.bb
index efa81fd50a..8c3d0dac36 100644
--- a/packages/ffmpeg/omapfbplay_git.bb
+++ b/packages/ffmpeg/omapfbplay_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple ffmpeg-based player that uses the omapfb overlays"
 DEPENDS = "bzip2 lame ffmpeg virtual/kernel"
 LICENSE = "MIT"
 
-PR = "r11"
+PR = "r12"
 
 inherit module-base
 
diff --git a/packages/gnash/gnash-minimal_cvs.bb b/packages/gnash/gnash-minimal_cvs.bb
index 992998bf55..80564ebe7e 100644
--- a/packages/gnash/gnash-minimal_cvs.bb
+++ b/packages/gnash/gnash-minimal_cvs.bb
@@ -1,7 +1,7 @@
 require gnash-minimal.inc
 
 
-PR = "r1"
+PR = "r2"
 
 PV = "0.8.3+cvs${SRCDATE}"
 
diff --git a/packages/gnash/gnash_0.8.3.bb b/packages/gnash/gnash_0.8.3.bb
index cc8de96995..87ea15878f 100644
--- a/packages/gnash/gnash_0.8.3.bb
+++ b/packages/gnash/gnash_0.8.3.bb
@@ -1,6 +1,6 @@
 require gnash.inc
 
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-include=${STAGING_INCDIR} \
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
index 556214283a..087d5ff670 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 LICENSE = "LGPL"
 HOMEPAGE = "http://www.gstreamer.net/"
 DEPENDS = "ffmpeg gstreamer gst-plugins-base zlib"
-PR = "r5"
+PR = "r6"
 
 inherit autotools pkgconfig
 
diff --git a/packages/leafpad/leafpad_0.8.9.bb b/packages/leafpad/leafpad_0.8.15.bb
index 1b1d23fa2a..3446b4f74e 100644
--- a/packages/leafpad/leafpad_0.8.9.bb
+++ b/packages/leafpad/leafpad_0.8.15.bb
@@ -1,13 +1,17 @@
+DESCRIPTION = "GTK+ based simple text editor"
+HOMEPAGE = "http://tarot.freeshell.org/leafpad"
+AUTHOR = "Tarot Osuji <tarot@sdf.lonestar.org>"
+SECTION = "x11/applications"
 LICENSE = "GPLv2"
-DEPENDS = "gtk+ intltool-native"
+DEPENDS = "gtk+"
 SRC_URI = "http://savannah.nongnu.org/download/${PN}/${PN}-${PV}.tar.gz \
-	   file://leafpad.desktop \
-	   file://leafpad.png"
-PR = "r1"
+           file://leafpad.desktop \
+           file://leafpad.png"
+PR = "r0"
 
 inherit autotools pkgconfig
 
-EXTRA_OECONF = " --enable-chooser --disable-gtktest --disable-print"
+EXTRA_OECONF = " --enable-chooser --enable-emacs --disable-print"
 
 do_install_append () {
         install -d ${D}/${datadir}
@@ -18,4 +22,4 @@ do_install_append () {
         install -m 0644 ${WORKDIR}/leafpad.desktop ${D}/${datadir}/applications
 }
 
-FILES_${PN} += "${datadir}/applications/leafpad.desktop ${datadir}/pixmaps/leafpad.png"
+FILES_${PN} += "${datadir}/applications ${datadir}/pixmaps ${datadir}/icons"
diff --git a/packages/openmax/libomxil-bellagio_0.9.0.bb b/packages/openmax/libomxil-bellagio_0.9.0.bb
index ca9e4fbade..edfcde03d2 100644
--- a/packages/openmax/libomxil-bellagio_0.9.0.bb
+++ b/packages/openmax/libomxil-bellagio_0.9.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMAX Integration Layer (IL) is a standard API to access Multim
 LICENSE = "LGPLv2"
 DEPENDS = "libmad alsa-lib ffmpeg"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/omxil/${PN}-${PV}.tar.gz"
 
diff --git a/packages/pidgin/pidgin.inc b/packages/pidgin/pidgin.inc
index 4799dcbfa3..d608d8adea 100644
--- a/packages/pidgin/pidgin.inc
+++ b/packages/pidgin/pidgin.inc
@@ -22,30 +22,30 @@ EXTRA_OECONF = " \
 OE_LT_RPATH_ALLOW=":${libdir}/purple-2:"
 OE_LT_RPATH_ALLOW[export]="1"
 
-PACKAGES =+ "libpurple libpurple-dev libpurple-dbg libpurple-liboscar libpurple-libjabber libpurple-logreader finch finch-dev finch-dbg"
-
+PACKAGES =+ "libpurple-dbg libpurple-dev libpurple libgnt-dbg libgnt libgnt-dev finch-dbg finch finch-dev ${PN}-data"
 
 LEAD_SONAME = "libpurple.so.0"
-FILES_libpurple     = "${libdir}/libpurple*.so.* /usr/bin/purple-* /etc/gconf/schemas/purple*"
-FILES_libpurple-dev = "${libdir}/libpurple* \
-                       ${libdir}/purple-2/*.la " 
+FILES_libpurple     = "${libdir}/libpurple*.so.* ${libdir}/purple-2 ${bindir}/purple-* ${sysconfdir}/gconf/schemas/purple*"
+FILES_libpurple-dev = "${libdir}/libpurple*.la \
+                       ${libdir}/libpurple*.so \
+                       ${libdir}/purple-2/*.la \
+                       ${libdir}/purple-2/libjabber.so \
+                       ${libdir}/purple-2/liboscar.so \
+                       ${datadir}/aclocal"
 FILES_libpurple-dbg += "${libdir}/.debug/libpurple* \
                        ${libdir}/purple-2/.debug"
-FILES_libpurple-liboscar = "${libdir}/purple-2/liboscar.so.*"
-FILES_libpurple-libjabber = "${libdir}/purple-2/libjabber.so.*"
-FILES_libpurple-logreader = "${libdir}/purple-2/log_reader.so"
-FILES_finch         = "${bindir}/finch /usr/lib/libgnt.so.*" 
+FILES_libgnt         = "${libdir}/libgnt.so.* ${libdir}/gnt/*.so" 
+FILES_libgnt-dev     = "${libdir}/gnt/*.la" 
+FILES_libgnt-dbg     = "${libdir}/gnt/.debug \
+FILES_finch         = "${bindir}/finch" 
 FILES_finch-dev     = "${libdir}/finch/*.la" 
 FILES_finch-dbg     = "${bindir}/.debug/finch \
                        ${libdir}/finch/.debug"
 
-FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* \
-	    ${sysconfdir} ${sharedstatedir} ${localstatedir} \
-	    /bin /sbin /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}/*.so \
-	    ${datadir}/pixmaps ${datadir}/applications \
-	    ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
-	    ${libdir}/bonobo/servers ${datadir}/icons"
-FILES_${PN}-dev += "${libdir}/pidgin/*.la"
+FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \
+	       ${datadir}/applications"
+FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons"
+FILES_${PN}-dev += "${libdir}/${PN}/*.la"
 
 inherit autotools gettext pkgconfig gconf
 
diff --git a/packages/pidgin/pidgin_2.0.2.bb b/packages/pidgin/pidgin_2.0.2.bb
deleted file mode 100644
index 2cc02c5072..0000000000
--- a/packages/pidgin/pidgin_2.0.2.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require pidgin.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
-           file://sanitize-configure.ac.patch;patch=1 \
-           file://gconf-no-errors.patch;patch=1 \
-	   file://pidgin.desktop-set-icon.patch;patch=1 \
-	  " 
-
-PR = "r1"
diff --git a/packages/pidgin/pidgin_2.1.1.bb b/packages/pidgin/pidgin_2.1.1.bb
deleted file mode 100644
index 5531880669..0000000000
--- a/packages/pidgin/pidgin_2.1.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require pidgin.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
-           file://sanitize-configure.ac.patch;patch=1 \
-           file://gconf-no-errors.patch;patch=1 \
-	   file://pidgin.desktop-set-icon.patch;patch=1 \
-	   file://purple-OE-branding.patch;patch=1 \
-	  " 
-
-PR = "r0"
diff --git a/packages/pidgin/pidgin_2.2.1.bb b/packages/pidgin/pidgin_2.2.1.bb
deleted file mode 100644
index 5531880669..0000000000
--- a/packages/pidgin/pidgin_2.2.1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require pidgin.inc
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
-           file://sanitize-configure.ac.patch;patch=1 \
-           file://gconf-no-errors.patch;patch=1 \
-	   file://pidgin.desktop-set-icon.patch;patch=1 \
-	   file://purple-OE-branding.patch;patch=1 \
-	  " 
-
-PR = "r0"
diff --git a/packages/pidgin/pidgin_2.5.0.bb b/packages/pidgin/pidgin_2.5.0.bb
index 80d15f677f..65fbc53ffa 100644
--- a/packages/pidgin/pidgin_2.5.0.bb
+++ b/packages/pidgin/pidgin_2.5.0.bb
@@ -1,5 +1,7 @@
 require pidgin.inc
 
+PR = "r2"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
            file://sanitize-configure.ac.patch;patch=1 \
            file://gconf-no-errors.patch;patch=1 \
@@ -11,6 +13,5 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
 EXTRA_OECONF += " --disable-gtkspell \
                   --disable-meanwhile \
                   --disable-nm \ 
+                  --disable-screensaver \
                 "
-
-PR = "r0"
diff --git a/packages/slugos-init/files/leds b/packages/slugos-init/files/leds
index 7a51a247ef..c5ce2997cc 100644
--- a/packages/slugos-init/files/leds
+++ b/packages/slugos-init/files/leds
@@ -180,12 +180,22 @@ sysled(){
 #  does nothing if there is no beep executable, is very
 #  quiet in the presence of errors
 beep(){
-	local arg
+	local arg devices module
 	arg=
 	test "$1" = beep && shift
 	if test -x /bin/beep
 	then
-		test -c /dev/buzzer && arg="-e /dev/buzzer"
+		devices=`ls -d /sys/class/input/event*`
+		for device in $devices
+		do
+			module=`egrep PHYSDEVDRIVER $device'/uevent' | cut -d '=' -f 2`
+			if test "$module" = "ixp4xx-beeper";
+			then
+				devnode=`echo "$device" | cut -d '/' -f 5`
+				arg="-e /dev/input/"$devnode
+				break
+			fi
+		done
 		/bin/beep $arg "$@" 2>/dev/null
 	fi
 	return 0
diff --git a/packages/vnc/x11vnc_0.9.3.bb b/packages/vnc/x11vnc_0.9.4.bb
index 2e728ed2a9..400abc8904 100644
--- a/packages/vnc/x11vnc_0.9.3.bb
+++ b/packages/vnc/x11vnc_0.9.4.bb
@@ -1,11 +1,12 @@
 DESCRIPTION = "Export your X session on-the-fly via VNC"
-SECTION = "x11/utils"
 HOMEPAGE = "http://www.karlrunge.com/x11vnc/"
 AUTHOR = "Karl Runge"
+SECTION = "x11/utils"
 LICENSE = "GPL"
 DEPENDS = "openssl virtual/libx11 libxtst libxext avahi jpeg zlib"
 
+PR = "r0"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc-${PV}.tar.gz"
 
 inherit autotools
-
diff --git a/packages/zbedic/libbedic_1.1.bb b/packages/zbedic/libbedic_1.1.bb
index c9e2ebfd9b..8036af6b78 100644
--- a/packages/zbedic/libbedic_1.1.bb
+++ b/packages/zbedic/libbedic_1.1.bb
@@ -1,11 +1,13 @@
-DESCRIPTION = "A dictionary application for Qt/E based Palmtop Environments"
-SECTION = "opie/applications"
+DESCRIPTION = "Library for bedic dictionary"
+HOMEPAGE = "http://bedic.sourceforge.net/"
+AUTHOR = "Rafal Mantiuk <rafm@users.sourceforge.net>"
+SECTION = "opie/libs"
 PRIORITY = "optional"
 LICENSE = "GPL"
 DEPENDS = "sqlite3"
 APPTYPE = "binary"
 APPDESKTOP = "${WORKDIR}/zbedic/misc"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/bedic/libbedic_${PV}-0.tgz"
 
@@ -16,7 +18,6 @@ inherit palmtop
 # pass VERSION as a string \\"${PV}.0\\"
 export OE_QMAKE_CXXFLAGS="-fexceptions -fno-rtti ${CXXFLAGS} -DVERSION=\\"${PV}.0\\""
 
-# no sharedlib, only as staticlib
 do_configure() {
         qmake -project && qmake -makefile -t lib -spec ${QMAKESPEC} CONFIG=console CONFIG+=staticlib CONFIG+=sharedlib -after \
         TARGET=bedic \
@@ -38,5 +39,4 @@ do_stage() {
     oe_libinstall -a libbedic ${STAGING_LIBDIR}
 }
 
-FILES_${PN} = "${libdir}"
-FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-dev = "${includedir} ${libdir}"