[oe-commits] org.oe.dev merge of '812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee'

[coredump2 commit]

merge of '812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee'
     and 'a772b6bc0f51e8c371cc638bb29f215e00e02bc5'

Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: 332e97250454514e2c07aea9f1695ab21166d191
ViewMTN: http://monotone.openembedded.org/revision/info/332e97250454514e2c07aea9f1695ab21166d191
Files:
1
packages/zaurusd/files/zaurus-hinge.bl-off
packages/zaurusd/files/zaurus-hinge.bl-on
packages/zaurusd/files/zaurus-hinge.matchbox-landscape
packages/zaurusd/files/zaurus-hinge.matchbox-portrait
packages/zaurusd/zaurusd_svn.bb
packages/wesnoth
packages/wesnoth/wesnoth_svn.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r812ef7daa38cb7e71c9e1bb3ef0358566d20c3ee -r332e97250454514e2c07aea9f1695ab21166d191
#
# 
# 
# patch "packages/zaurusd/files/zaurus-hinge.bl-off"
#  from [6b5b6c2065f8cbf3dd7bc5b7a072b9a764a11ee0]
#    to [87e4a1fb6db37f2ea10378ad5f16b108e4d776ae]
# 
# patch "packages/zaurusd/files/zaurus-hinge.bl-on"
#  from [1ee2f2e97eb96e6dbedfc4f6932cc72538219b6b]
#    to [a404c868701b2d3e35654159015ae6d17b9e7a9d]
# 
# patch "packages/zaurusd/files/zaurus-hinge.matchbox-landscape"
#  from [e8f23204b8c84cf6729bc660e08557b142b9a44f]
#    to [6286ae2f378c8f1957380d5d7de3685230da505a]
# 
# patch "packages/zaurusd/files/zaurus-hinge.matchbox-portrait"
#  from [9b9c517d633741164770bdcc173cafb2d78ed0fe]
#    to [96a2bedfd5c53f713a461c275b147293229eb629]
# 
# patch "packages/zaurusd/zaurusd_svn.bb"
#  from [f709b2aca8b8c4c78926edcec52fc48ed0c06540]
#    to [1c6948752ce366ab73d19f934f67c028b61ebc87]
# 
============================================================
--- packages/zaurusd/files/zaurus-hinge.bl-off	6b5b6c2065f8cbf3dd7bc5b7a072b9a764a11ee0
+++ packages/zaurusd/files/zaurus-hinge.bl-off	87e4a1fb6db37f2ea10378ad5f16b108e4d776ae
@@ -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
+
+
+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"
-test -z "${ZD_BINDIR}" && ZD_BINDIR="/usr/bin"
-${ZD_BINDIR}/bl off
============================================================
--- packages/zaurusd/files/zaurus-hinge.bl-on	1ee2f2e97eb96e6dbedfc4f6932cc72538219b6b
+++ packages/zaurusd/files/zaurus-hinge.bl-on	a404c868701b2d3e35654159015ae6d17b9e7a9d
@@ -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 ) &
+
============================================================
--- packages/zaurusd/files/zaurus-hinge.matchbox-landscape	e8f23204b8c84cf6729bc660e08557b142b9a44f
+++ packages/zaurusd/files/zaurus-hinge.matchbox-landscape	6286ae2f378c8f1957380d5d7de3685230da505a
@@ -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
============================================================
--- packages/zaurusd/files/zaurus-hinge.matchbox-portrait	9b9c517d633741164770bdcc173cafb2d78ed0fe
+++ packages/zaurusd/files/zaurus-hinge.matchbox-portrait	96a2bedfd5c53f713a461c275b147293229eb629
@@ -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
============================================================
--- packages/zaurusd/zaurusd_svn.bb	f709b2aca8b8c4c78926edcec52fc48ed0c06540
+++ packages/zaurusd/zaurusd_svn.bb	1c6948752ce366ab73d19f934f67c028b61ebc87
@@ -1,10 +1,10 @@ PV = "0.0+svn${SRCDATE}"
 DESCRIPTION = "Daemon to handle device specifc features."
 SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r13"
+PR = "r14"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \


#
# mt diff -ra772b6bc0f51e8c371cc638bb29f215e00e02bc5 -r332e97250454514e2c07aea9f1695ab21166d191
#
# 
# 
# add_dir "packages/wesnoth"
# 
# add_file "packages/wesnoth/wesnoth_svn.bb"
#  content [de8bbc9e99d99055231c5edc26d756f2d06012dc]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [9f3cdfb4521c1a35261f43b7b2016b5f26a65a26]
#    to [d1197862572f9af8fe6c4149155a577f214c326d]
# 
============================================================
--- packages/wesnoth/wesnoth_svn.bb	de8bbc9e99d99055231c5edc26d756f2d06012dc
+++ packages/wesnoth/wesnoth_svn.bb	de8bbc9e99d99055231c5edc26d756f2d06012dc
@@ -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
+}
============================================================
--- conf/distro/include/sane-srcrevs.inc	9f3cdfb4521c1a35261f43b7b2016b5f26a65a26
+++ conf/distro/include/sane-srcrevs.inc	d1197862572f9af8fe6c4149155a577f214c326d
@@ -123,6 +123,7 @@ SRCREV_pn-webkit-qtopia ?= "27222"
 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"