merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'

     and '332e97250454514e2c07aea9f1695ab21166d191'

9 files changed, 101 insertions, 9 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index df8ebd2a74..df4be2d2e0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -123,6 +123,7 @@ SRCREV_pn-tmut ?= "60"
 SRCREV_pn-webkit-gtk ?= "27222"
 SRCREV_pn-webkit-qt ?= "27222"
 SRCREV_pn-webkit-qtopia ?= "27222"
+SRCREV_pn-wesnoth ?= "22021"
 SRCREV_pn-xoo ?= "1623"
 SRCREV_pn-mplayer ?= "24587"
 SRCREV_pn-networkmanager ?= "2887"
diff --git a/packages/subversion/subversion_1.4.5.bb b/packages/subversion/subversion_1.4.5.bb
new file mode 100644
index 0000000000..1daf45bd0c
--- /dev/null
+++ b/packages/subversion/subversion_1.4.5.bb
@@ -0,0 +1,33 @@
+DESCRIPTION = "The Subversion (svn) client"
+SECTION = "console/network"
+DEPENDS = "apr-util neon"
+RDEPENDS = "neon"
+LICENSE = "Apache BSD"
+HOMEPAGE = "http://subversion.tigris.org"
+
+PR = "r0"
+
+SRC_URI = "http://subversion.tigris.org/downloads/${P}.tar.bz2 \
+           file://disable-revision-install.patch;patch=1 \
+	   file://neon-detection.patch;patch=1"
+
+EXTRA_OECONF = "--with-neon=${STAGING_DIR}/${TARGET_SYS} \
+                --without-berkeley-db --without-apxs --without-apache \
+                --without-swig --with-apr=${STAGING_BINDIR_CROSS} \
+                --with-apr-util=${STAGING_BINDIR_CROSS}"
+
+
+inherit autotools
+
+export LDFLAGS += " -L${STAGING_LIBDIR} "
+
+do_configure() {
+	gnu-configize
+	libtoolize --force
+	aclocal -I build/ -I build/ac-macros/ && autoconf
+	oe_runconf
+}
+
+do_stage() {
+	autotools_stage_all
+}
diff --git a/packages/wesnoth/.mtn2git_empty b/packages/wesnoth/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/wesnoth/.mtn2git_empty
diff --git a/packages/wesnoth/wesnoth_svn.bb b/packages/wesnoth/wesnoth_svn.bb
new file mode 100644
index 0000000000..430abe7d0f
--- /dev/null
+++ b/packages/wesnoth/wesnoth_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "fantasy turn-based strategy game"
+PV = "0.01+svnr${SRCREV}"
+PR = "r1"
+SECTION = "games"
+LICENSE = "GPL"
+DEPENDS += "libsdl-image libsdl-mixer libsdl-net"
+SRC_URI = "svn://svn.gna.org/svn/wesnoth;module=trunk;proto=http"
+
+EXTRA_OECONF += " --enable-tinygui --disable-python --enable-lite --enable-lowmem"
+
+S = "${WORKDIR}/trunk"
+
+inherit autotools
+
+addtask autogen after do_patch before do_configure
+
+do_autogen() {
+        cd ${WORKDIR}/trunk/ && ./autogen.sh --host=armv4t-angstrom-linux-gnueabi
+}
diff --git a/packages/zaurusd/files/zaurus-hinge.bl-off b/packages/zaurusd/files/zaurus-hinge.bl-off
index 888f90bfc5..ec3cefb2ca 100644
--- a/packages/zaurusd/files/zaurus-hinge.bl-off
+++ b/packages/zaurusd/files/zaurus-hinge.bl-off
@@ -6,5 +6,13 @@
 # Filename: zaurus-hinge.bl-off
 # Date: 04-Jun-06
 
-test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
-${ZD_BINDIR}/bl off
+#test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
+#${ZD_BINDIR}/bl off
+
+
+STEP=5
+DRIVER="`ls /sys/class/backlight/|head -n 1`"
+BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
+
+cat "$BRIGHTNESS_FILE" > /var/run/display_brightness.tmp
+echo 0 > "$BRIGHTNESS_FILE"
diff --git a/packages/zaurusd/files/zaurus-hinge.bl-on b/packages/zaurusd/files/zaurus-hinge.bl-on
index b9b0e68749..61598155f2 100644
--- a/packages/zaurusd/files/zaurus-hinge.bl-on
+++ b/packages/zaurusd/files/zaurus-hinge.bl-on
@@ -12,7 +12,7 @@ ${ZD_BINDIR}/bl on
 # If the backlight does not come back on after a suspend, the driver is 
 # still "on" (hence "bl on" does nothing) with a brightness of "0"
 
-if test "`bl | awk '{print $2}'`" = "0"
+( if test "`bl | awk '{print $2}'`" = "0"
 then
 	x=0
 	while test "$x" != 4
@@ -24,5 +24,29 @@ then
 		
 		let x=$x+1
 	done
-fi
+	
+	if mkdir /var/run/display_brightness.lock
+	then
+		if test -e /var/run/display_brightness.tmp
+		then
+			OLD_VALUE="`cat /var/run/display_brightness.tmp`"
+			echo "OLD BRIGHTNESS SETTING FOUND: $OLD_VALUE"
+
+			if test "$OLD_VALUE" -gt 1
+			then
+				STEP=5
+				DRIVER="`ls /sys/class/backlight/|head -n 1`"
+				BRIGHTNESS_FILE="/sys/class/backlight/$DRIVER/brightness"
+
+				echo "SETTING $OLD_VALUE!"
+				echo "$OLD_VALUE" > "$BRIGHTNESS_FILE"
+				rm /var/run/display_brightness.tmp
+				echo "FINISH!"
+			fi
+		fi
+		rm -rf /var/run/display_brightness.lock
+	else
+		echo "BRIGHTNESS IS LOCKED"
+	fi
+fi ) &
 
diff --git a/packages/zaurusd/files/zaurus-hinge.matchbox-landscape b/packages/zaurusd/files/zaurus-hinge.matchbox-landscape
index e7b92b5140..a048769f7d 100644
--- a/packages/zaurusd/files/zaurus-hinge.matchbox-landscape
+++ b/packages/zaurusd/files/zaurus-hinge.matchbox-landscape
@@ -16,6 +16,10 @@
   # urg mbinputmgr should kill below
   killproc ${ZD_BINDIR}/matchbox-keyboard
   killproc ${ZD_BINDIR}/matchbox-stroke
+  
   if [ -x ${ZD_BINDIR}/xrandr ]; then
-    xrandr -o normal
+  	if ! ( xrandr | awk '{print $4}' | grep -q normal )
+	then
+		${ZD_BINDIR}/xrandr -o normal 
+	fi
   fi
diff --git a/packages/zaurusd/files/zaurus-hinge.matchbox-portrait b/packages/zaurusd/files/zaurus-hinge.matchbox-portrait
index bd04d328cc..291617cd02 100644
--- a/packages/zaurusd/files/zaurus-hinge.matchbox-portrait
+++ b/packages/zaurusd/files/zaurus-hinge.matchbox-portrait
@@ -1,7 +1,10 @@
 #!/bin/sh
 
   if [ -x ${ZD_BINDIR}/xrandr ]; then
-    ${ZD_BINDIR}/xrandr -o left 
+  	if ! ( xrandr | awk '{print $4}' | grep -q left )
+	then
+		${ZD_BINDIR}/xrandr -o left 
+	fi
   fi
   # just to be extra safe
   sleep 1
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index f2d1f640b1..8bc0b2ba58 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -1,10 +1,10 @@
 DESCRIPTION = "Daemon to handle device specifc features."
 SECTION = "base"
 LICENSE = "GPL"
-DEPENDS = "tslib gpe-conf"
-RDEPENDS = "procps gpe-conf"
+DEPENDS = "tslib"
+RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r12"
+PR = "r14"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \