Skip to contentSkip to conversation

update zaurusd to latest SVN

RFC PATCH In review Paul Eggleton 2 participants 2 messages May 19, 2009

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 update zaurusd to latest SVN

Hi all,

I'd like to update zaurusd to the latest SVN version in .dev. Attached is a patch that does this, which I have tested on my SL-C3000. Note that I had to update several of the patches; I did so based on the assumption that the versions of a few files (eg. alsa state files) were already correct as previously built in OE.

Any objections?

Cheers,
Paul

conf/distro/include/sane-srcdates.inc +1 -1
index 1be3dab..114eaa3 100644
@@ -47,7 +47,7 @@ SRCDATE_xcompmgr ?= "20060814"
 SRCDATE_xirssi ?= "20060814"
 SRCDATE_xsvg ?= "20060814"
 SRCDATE_yamonenv ?= "20060814"
-SRCDATE_zaurusd ?= "20060628"
+SRCDATE_zaurusd ?= "20090501"
 
 # Freedesktop.org
 SRCDATE_poppler0.6 = "20070708"
recipes/zaurusd/files/add-poodle.patch +8 -27
index 4f91413..3793faf 100644
@@ -1,16 +1,10 @@
-diff -Nur zaurusd.orig/config/mach-config/mach-poodle-functions zaurusd/config/mach-config/mach-poodle-functions
---- zaurusd.orig/config/mach-config/mach-poodle-functions	1970-01-01 01:00:00.000000000 +0100
-+++ zaurusd/config/mach-config/mach-poodle-functions	2006-05-14 12:43:01.000000000 +0200
-@@ -0,0 +1,3 @@
-+#HAVE_INPUT_SWITCHES=1
-+#HAVE_ALSA_MIXER=1
-+
-diff -Nur zaurusd.orig/config/mach-config/mach-poodle-vars zaurusd/config/mach-config/mach-poodle-vars
---- zaurusd.orig/config/mach-config/mach-poodle-vars 1970-01-01 01:00:00.000000000 +0100
-+++ zaurusd/config/mach-config/mach-poodle-vars	2006-05-14 12:42:42.000000000 +0200
-@@ -0,0 +1,9 @@
-+MACHINE=poodle
-+
+--- zaurusd/config/mach-config/mach-poodle-vars.in	(revision 418)
++++ zaurusd/config/mach-config/mach-poodle-vars.in	(working copy)
+@@ -1,3 +1,9 @@
+ MACHINE=poodle
+ 
+-ALSA_MIXER_INIT=@appconfdir@/alsa/5600-default.state
+\ No newline at end of file
 +export SWITCH_EVENT_ZMIXER=1
 +SWITCH_EVENT_DEVICE=/dev/input/event0
 +
@@ -18,17 +12,4 @@ diff -Nur zaurusd.orig/config/mach-config/mach-poodle-vars zaurusd/config/mach-c
 +#TSKEYS_DEVICE=/dev/input/event1
 +
 +ALSA_MIXER_INIT=@appconfdir@/alsa/poodle-default.state
-\ Kein Zeilenumbruch am Dateiende.
-diff -Nur zaurusd.orig/scripts/detect-machine zaurusd/scripts/detect-machine
---- zaurusd.orig/scripts/detect-machine	2006-05-07 13:39:11.000000000 +0200
-+++ zaurusd/scripts/detect-machine	2006-05-14 12:40:38.000000000 +0200
-@@ -27,6 +27,9 @@
-         "SHARP Tosa")
- 		MACHINE=tosa
-         	;;	
-+	"SHARP Poodle")
-+		MACHINE=poodle
-+		;;
- 	"Simpad")
- 		;;
- 	"HP iPAQ H2200")
+\ No newline at end of file
recipes/zaurusd/files/alsa-6000x-default.state.patch +169 -156

752 lines not on this page · raw message

recipes/zaurusd/files/alsa-cxx00-default.state.patch +18 -79

155 lines not on this page · raw message

recipes/zaurusd/zaurusd_svn.bb +1 -2
index b2b1622..6240492 100644
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r19"
+PR = "r20"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
@@ -14,7 +14,6 @@ SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
 	   file://disable-alsa-handling.patch;patch=1 \
 	   file://zaurus-hinge.matchbox-portrait \	   
 	   file://zaurus-hinge.matchbox-landscape \
-	   file://tslib-1.diff;patch=1 \
 	   file://zaurus-hinge.bl-on \
 	   file://zaurus-hinge.bl-off \
 	   file://01-check-toggle-landscape \
#1 lore raw
Quoted 9 lines · Paul Eggleton

Hi all,

I'd like to update zaurusd to the latest SVN version in .dev. Attached is a patch that does this, which I have tested on my SL-C3000. Note that I had to update several of the patches; I did so based on the assumption that the versions of a few files (eg. alsa state files) were already correct as previously built in OE.

Any objections?

You tested it on a device, so go ahead.

regards,

Koen