From 13b71d3646054a698956460aa4246d9c9167dee4 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Feb 2008 16:31:45 +0000
Subject: Output NUL terminated lines with sort -z (busybox#1591). Fixes
 updatedb.

---
 packages/busybox/busybox-1.9.1/sort-z-nul.patch | 50 +++++++++++++++++++++++++
 packages/busybox/busybox_1.9.1.bb               |  3 +-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 packages/busybox/busybox-1.9.1/sort-z-nul.patch

diff --git a/packages/busybox/busybox-1.9.1/sort-z-nul.patch b/packages/busybox/busybox-1.9.1/sort-z-nul.patch
new file mode 100644
index 0000000000..55452a4524
--- /dev/null
+++ b/packages/busybox/busybox-1.9.1/sort-z-nul.patch
@@ -0,0 +1,50 @@
+Summary: 0001591: inconsistent behavior of sort -z
+
+URL: http://busybox.net/bugs/view.php?id=1591
+http://www.busybox.net/cgi-bin/viewcvs.cgi/trunk/busybox/coreutils/sort.c?rev=21004&r1=20435&r2=21004&makepatch=1&diff_format=u
+
+Description:
+
+busybox sort -z does:
+use NUL instead of EOL on input
+
+GNU sort -z does:
+use NUL instead of EOL on input and output
+
+GNU sort -z documents:
+use NUL instead of EOL on input
+
+Additional Information:
+
+Note that sort -z is not part of any standard. But several applications
+(e. g. GNU findutils updatedb) depends on the NUL-on-output behavior.
+
+GNU sort documentation bug was reported to coreutils maintainers.
+
+Notes: 
+
+vda 02-13-08 06:30 (0004364)
+Fixed in revision 21004. Thanks!
+
+--- busybox/coreutils/sort.c	2007/11/16 12:39:16	20435
++++ busybox/coreutils/sort.c	2008/02/13 14:30:33	21004
+@@ -32,7 +32,7 @@
+ 	FLAG_u  = 8,            /* Unique */
+ 	FLAG_c  = 0x10,         /* Check: no output, exit(!ordered) */
+ 	FLAG_s  = 0x20,         /* Stable sort, no ascii fallback at end */
+-	FLAG_z  = 0x40,         /* Input is null terminated, not \n */
++	FLAG_z  = 0x40,         /* Input and output is NUL terminated, not \n */
+ /* These can be applied to search keys, the previous four can't */
+ 	FLAG_b  = 0x80,         /* Ignore leading blanks */
+ 	FLAG_r  = 0x100,        /* Reverse */
+@@ -396,8 +396,9 @@
+ 		if (linecount) linecount = flag+1;
+ 	}
+ 	/* Print it */
++	flag = (option_mask32 & FLAG_z) ? '\0' : '\n';
+ 	for (i = 0; i < linecount; i++)
+-		fprintf(outfile, "%s\n", lines[i]);
++		fprintf(outfile, "%s%c", lines[i], flag);
+ 
+ 	fflush_stdout_and_exit(EXIT_SUCCESS);
+ }
diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb
index b41f1779b0..237f6a6dac 100644
--- a/packages/busybox/busybox_1.9.1.bb
+++ b/packages/busybox/busybox_1.9.1.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \
@@ -12,6 +12,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://syslog.conf \
            file://udhcpscript.patch;patch=1 \
            file://adduser-longops.patch;patch=1 \
+           file://sort-z-nul.patch;patch=1;status=upstream \
            file://umount.busybox \
            file://run_parts.c \
            file://defconfig"
-- 
cgit v1.2.3


From 74a532e4bc5f8b037d050a0a1fb66ea35eeac1ec Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Feb 2008 17:08:48 +0000
Subject: - Ignore false toggle signals (work-around for OE#3390). - Fixed
 default ALSA state for SL-Cxx00 (OE#2617). - Do not alter incorrect mixer
 levels by zaurus-mixer-callback. - Allow to disable rotation by touch
 ~/.norot. - Fixed detection of panel_user.

---
 packages/zaurusd/files/01-check-toggle-landscape   |   9 +
 packages/zaurusd/files/01-check-toggle-portait     |   9 +
 .../zaurusd/files/alsa-cxx00-default.state.patch   | 276 +++++++++++++++------
 packages/zaurusd/files/zaurus-hinge.in             |   7 +-
 .../zaurusd/files/zaurusd-mixer-callback.patch     |  11 -
 packages/zaurusd/zaurusd_svn.bb                    |  10 +-
 6 files changed, 237 insertions(+), 85 deletions(-)
 create mode 100644 packages/zaurusd/files/01-check-toggle-landscape
 create mode 100644 packages/zaurusd/files/01-check-toggle-portait
 delete mode 100644 packages/zaurusd/files/zaurusd-mixer-callback.patch

diff --git a/packages/zaurusd/files/01-check-toggle-landscape b/packages/zaurusd/files/01-check-toggle-landscape
new file mode 100644
index 0000000000..13ae9a4e68
--- /dev/null
+++ b/packages/zaurusd/files/01-check-toggle-landscape
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Try to determine and ignore false rotation signals caused by
+# headphones removal or remote removal remembering the old state.
+# OE#3390
+if test "`cat /var/run/last-screen-rotation`" = landscape ; then
+    exit
+fi
+echo landscape > /var/run/last-screen-rotation
diff --git a/packages/zaurusd/files/01-check-toggle-portait b/packages/zaurusd/files/01-check-toggle-portait
new file mode 100644
index 0000000000..4c3b7f1291
--- /dev/null
+++ b/packages/zaurusd/files/01-check-toggle-portait
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Try to determine and ignore false rotation signals caused by                                                              
+# headphones removal or remote removal remembering the old state.
+# OE#3390
+if test "`cat /var/run/last-screen-rotation`" = portait ; then
+    exit
+fi
+echo portait > /var/run/last-screen-rotation
diff --git a/packages/zaurusd/files/alsa-cxx00-default.state.patch b/packages/zaurusd/files/alsa-cxx00-default.state.patch
index c3e234b534..b10e6c85dd 100644
--- a/packages/zaurusd/files/alsa-cxx00-default.state.patch
+++ b/packages/zaurusd/files/alsa-cxx00-default.state.patch
@@ -1,64 +1,194 @@
---- zaurusd/config/alsa/cxx00-default.state.orig	2006-06-28 08:45:07.000000000 +0000
-+++ zaurusd/config/alsa/cxx00-default.state	2007-05-21 21:40:50.000000000 +0000
-@@ -32,7 +32,7 @@
+http://bugs.openembedded.org/show_bug.cgi?id=2617
+- Fixes default ALSA state for SL-Cxx00.
+  * Treble level reflects kernel fix alsa-wm8750-treble.patch (>2.6.24).
+  * Increased Mic Levels and Boost.
+  * Enabled Capture Switch.
+  * Improved Headphones / Speaker volume balance.
+  * 3D Mode changed to "Playback" (still Off by default).
+  * Disabled all bypasses.
+  * All Mono signals decreased to 0 (not connected).
+  * Line Mux changed to differential, keeping PGA unused.
+  * Using Digital mono for recording (jack supports ony mono).
+  * Enabled Automatic Level Control, optimized for voice recording.
+  * Enabled Zero Cross volume changes.
+- Do not alter incorrect mixer levels by zaurus-mixer-callback.
+
+Index: zaurusd/config/alsa/cxx00-default.state
+===================================================================
+--- zaurusd.orig/config/alsa/cxx00-default.state	2006-06-28 08:45:07.000000000 +0000
++++ zaurusd/config/alsa/cxx00-default.state	2007-11-27 23:06:43.000000000 +0000
+@@ -6,8 +6,8 @@
+ 		comment.range '0 - 63'
+ 		iface MIXER
+ 		name 'Capture Volume'
+-		value.0 23
+-		value.1 23
++		value.0 48
++		value.1 48
+ 	}
+ 	control.2 {
+ 		comment.access 'read write'
+@@ -15,8 +15,8 @@
+ 		comment.count 2
+ 		iface MIXER
+ 		name 'Capture ZC Switch'
+-		value.0 false
+-		value.1 false
++		value.0 true
++		value.1 true
+ 	}
+ 	control.3 {
+ 		comment.access 'read write'
+@@ -24,26 +24,26 @@
+ 		comment.count 2
+ 		iface MIXER
+ 		name 'Capture Switch'
+-		value.0 false
+-		value.1 false
++		value.0 true
++		value.1 true
+ 	}
+ 	control.4 {
+ 		comment.access 'read write'
  		comment.type BOOLEAN
  		comment.count 2
  		iface MIXER
 -		name 'Out1 Playback ZC Switch'
+-		value.0 false
+-		value.1 false
 +		name 'Headphone Playback ZC Switch'
- 		value.0 false
- 		value.1 false
++		value.0 true
++		value.1 true
  	}
-@@ -41,7 +41,7 @@
+ 	control.5 {
+ 		comment.access 'read write'
  		comment.type BOOLEAN
  		comment.count 2
  		iface MIXER
 -		name 'Out2 Playback ZC Switch'
+-		value.0 false
+-		value.1 false
 +		name 'Speaker Playback ZC Switch'
- 		value.0 false
- 		value.1 false
++		value.0 true
++		value.1 true
+ 	}
+ 	control.6 {
+ 		comment.access 'read write'
+@@ -92,8 +92,8 @@
+ 		comment.range '0 - 255'
+ 		iface MIXER
+ 		name 'PCM Volume'
+-		value.0 255
+-		value.1 255
++		value.0 220
++		value.1 220
  	}
-@@ -218,7 +218,7 @@
- 		comment.item.3 Stereo
+ 	control.11 {
+ 		comment.access 'read write'
+@@ -131,7 +131,7 @@
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'Treble Volume'
+-		value 15
++		value 0
+ 	}
+ 	control.15 {
+ 		comment.access 'read write'
+@@ -188,7 +188,7 @@
+ 		comment.item.1 Playback
  		iface MIXER
- 		name 'ALC Capture Function'
--		value Left
-+		value Off
+ 		name '3D Mode'
+-		value Capture
++		value Playback
  	}
- 	control.24 {
+ 	control.21 {
  		comment.access 'read write'
-@@ -321,8 +321,8 @@
+@@ -226,7 +226,7 @@
+ 		comment.count 1
+ 		iface MIXER
+ 		name 'ALC Capture ZC Switch'
+-		value false
++		value true
+ 	}
+ 	control.25 {
+ 		comment.access 'read write'
+@@ -235,7 +235,7 @@
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'ALC Capture Hold Time'
+-		value 0
++		value 9
+ 	}
+ 	control.26 {
+ 		comment.access 'read write'
+@@ -244,7 +244,7 @@
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'ALC Capture Decay Time'
+-		value 3
++		value 9
+ 	}
+ 	control.27 {
+ 		comment.access 'read write'
+@@ -253,7 +253,7 @@
+ 		comment.range '0 - 15'
+ 		iface MIXER
+ 		name 'ALC Capture Attack Time'
+-		value 2
++		value 3
+ 	}
+ 	control.28 {
+ 		comment.access 'read write'
+@@ -306,7 +306,7 @@
+ 		comment.count 1
+ 		iface MIXER
+ 		name 'ZC Timeout Switch'
+-		value false
++		value true
+ 	}
+ 	control.34 {
+ 		comment.access 'read write'
+@@ -321,7 +321,7 @@
  		comment.type BOOLEAN
  		comment.count 1
  		iface MIXER
 -		name 'Right Out2 Playback Invert Switch'
--		value true
 +		name 'Right Speaker Playback Invert Switch'
-+		value false
+ 		value true
  	}
  	control.36 {
- 		comment.access 'read write'
 @@ -331,8 +331,8 @@
  		comment.range '0 - 3'
  		iface MIXER
  		name 'Mic Boost'
 -		value.0 2
 -		value.1 2
++		value.0 3
++		value.1 3
+ 	}
+ 	control.37 {
+ 		comment.access 'read write'
+@@ -341,8 +341,8 @@
+ 		comment.range '0 - 7'
+ 		iface MIXER
+ 		name 'Bypass Left Playback Volume'
+-		value.0 2
+-		value.1 2
 +		value.0 0
 +		value.1 0
  	}
- 	control.37 {
+ 	control.38 {
  		comment.access 'read write'
-@@ -351,8 +351,8 @@
+@@ -361,8 +361,8 @@
  		comment.range '0 - 7'
  		iface MIXER
- 		name 'Bypass Right Playback Volume'
--		value.0 0
--		value.1 0
-+		value.0 2
-+		value.1 2
+ 		name 'Bypass Mono Playback Volume'
+-		value.0 2
+-		value.1 2
++		value.0 0
++		value.1 0
  	}
- 	control.39 {
+ 	control.40 {
  		comment.access 'read write'
 @@ -378,9 +378,9 @@
  		comment.count 2
@@ -68,8 +198,8 @@
 -		value.0 120
 -		value.1 120
 +		name 'Headphone Playback Volume'
-+		value.0 121
-+		value.1 121
++		value.0 105
++		value.1 105
  	}
  	control.42 {
  		comment.access 'read write'
@@ -81,17 +211,26 @@
 -		value.0 119
 -		value.1 119
 +		name 'Speaker Playback Volume'
-+		value.0 121
-+		value.1 121
++		value.0 127
++		value.1 127
  	}
  	control.43 {
  		comment.access 'read write'
+@@ -399,7 +399,7 @@
+ 		comment.range '0 - 127'
+ 		iface MIXER
+ 		name 'Mono Playback Volume'
+-		value 121
++		value 0
+ 	}
+ 	control.44 {
+ 		comment.access 'read write'
 @@ -411,7 +411,7 @@
  		comment.item.3 'Digital Mono'
  		iface MIXER
  		name 'Right ADC Mux'
 -		value 'Mono (Left)'
-+		value Stereo
++		value 'Digital Mono'
  	}
  	control.45 {
  		comment.access 'read write'
@@ -100,55 +239,19 @@
  		iface MIXER
  		name 'Left ADC Mux'
 -		value 'Mono (Left)'
-+		value Stereo
++		value 'Digital Mono'
  	}
  	control.46 {
  		comment.access 'read write'
-@@ -458,7 +458,7 @@
- 		comment.item.4 Differential
- 		iface MIXER
- 		name 'Right Line Mux'
--		value Differential
-+		value 'Line 1'
- 	}
- 	control.49 {
- 		comment.access 'read write'
 @@ -471,7 +471,7 @@
  		comment.item.4 Differential
  		iface MIXER
  		name 'Left Line Mux'
 -		value PGA
-+		value 'Line 1'
++		value Differential
  	}
  	control.50 {
  		comment.access 'read write'
-@@ -483,7 +483,7 @@
- 		comment.item.3 Differential
- 		iface MIXER
- 		name 'Right PGA Mux'
--		value Differential
-+		value 'Line 1'
- 	}
- 	control.51 {
- 		comment.access 'read write'
-@@ -495,7 +495,7 @@
- 		comment.item.3 Differential
- 		iface MIXER
- 		name 'Left PGA Mux'
--		value Differential
-+		value 'Line 1'
- 	}
- 	control.52 {
- 		comment.access 'read write'
-@@ -535,7 +535,7 @@
- 		comment.count 1
- 		iface MIXER
- 		name 'Right Mixer Left Playback Switc'
--		value false
-+		value true
- 	}
- 	control.57 {
- 		comment.access 'read write'
 @@ -610,9 +610,8 @@
  		comment.access 'read write'
  		comment.type ENUMERATED
@@ -161,3 +264,38 @@
  		iface MIXER
  		name 'Speaker Function'
  		value On
+Index: zaurusd/scripts/zaurus-mixer-callback.in
+===================================================================
+--- zaurusd.orig/scripts/zaurus-mixer-callback.in	2007-11-27 23:32:45.000000000 +0000
++++ zaurusd/scripts/zaurus-mixer-callback.in	2007-11-27 23:36:54.000000000 +0000
+@@ -16,8 +16,6 @@
+ JACK="$1"
+ SPK="$2"
+ LEFT="true"
+-RLPLAYBACK="false"
+-RLBYPASS="false"
+ 
+ case $SPK in
+   "On")
+@@ -37,8 +35,6 @@
+     ;;
+   "Headset" | "Mic" | "Line")
+     LEFT="false"
+-    RLPLAYBACK="true"
+-    RLBYPASS="true"
+     SPK="Off"
+     ;;
+   *)
+@@ -58,12 +54,6 @@
+ }; /Speaker Function/ {
+ N
+ s:\(Speaker Function.*\n.*value \).*$:\1$SPK:
+-}; /Right Mixer Left Playback/ {
+-N
+-s:\(Right Mixer Left Playback.*\n.*value \).*$:\1$RLPLAYBACK:
+-}; /Right Mixer Left Bypass/ {
+-N
+-s:\(Right Mixer Left Bypass.*\n.*value \).*$:\1$RLBYPASS:
+ }; /Left Mixer Playback/ {
+ N
+ s:\(Left Mixer Playback.*\n.*value \).*$:\1$LEFT:
diff --git a/packages/zaurusd/files/zaurus-hinge.in b/packages/zaurusd/files/zaurus-hinge.in
index f719ba3c76..9670e8803e 100644
--- a/packages/zaurusd/files/zaurus-hinge.in
+++ b/packages/zaurusd/files/zaurus-hinge.in
@@ -19,9 +19,12 @@ if [ -z "$1" ]; then
    exit 1
 fi
 
-panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $2}'`"
-
+panel_user="`ps aux|grep matchbox-panel|grep -v grep | awk '{print $1}'`"
 
+# touch ~/.norot can disable rotation.
+if test -f /home/$panel_user/.norot ; then
+  exit
+fi
 
 STATE=$1
 
diff --git a/packages/zaurusd/files/zaurusd-mixer-callback.patch b/packages/zaurusd/files/zaurusd-mixer-callback.patch
deleted file mode 100644
index 7c9455d042..0000000000
--- a/packages/zaurusd/files/zaurusd-mixer-callback.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- zaurusd/scripts/zaurus-mixer-callback.in.orig	2007-06-05 03:15:30.000000000 +0000
-+++ zaurusd/scripts/zaurus-mixer-callback.in	2007-06-05 03:14:53.000000000 +0000
-@@ -16,7 +16,7 @@
- JACK="$1"
- SPK="$2"
- LEFT="true"
--RLPLAYBACK="false"
-+RLPLAYBACK="true"
- RLBYPASS="false"
- 
- case $SPK in
diff --git a/packages/zaurusd/zaurusd_svn.bb b/packages/zaurusd/zaurusd_svn.bb
index 3ea0d2b22f..be9379eced 100644
--- a/packages/zaurusd/zaurusd_svn.bb
+++ b/packages/zaurusd/zaurusd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "tslib"
 RDEPENDS = "procps"
 PV = "0.0+svn${SRCDATE}"
-PR = "r16"
+PR = "r17"
 
 SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=zaurusd;proto=http \
            file://zaurus-hinge.in \
@@ -14,10 +14,11 @@ 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://zaurusd-mixer-callback.patch;patch=1 \
 	   file://tslib-1.diff;patch=1 \
 	   file://zaurus-hinge.bl-on \
-	   file://zaurus-hinge.bl-off"
+	   file://zaurus-hinge.bl-off \
+	   file://01-check-toggle-landscape \
+	   file://01-check-toggle-portait"
 
 
 S = "${WORKDIR}/${PN}"
@@ -39,6 +40,9 @@ do_install_append() {
 	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-on" "${D}/etc/zaurusd/hinge-portrait.d/00-backlight-on"
 	install -m 0755 "${WORKDIR}/zaurus-hinge.bl-off" "${D}/etc/zaurusd/hinge-close.d/00-backlight-off"
 
+	install -m 0755 "${WORKDIR}/01-check-toggle-landscape" "${D}/etc/zaurusd/hinge-landscape.d/01-check-toggle"
+	install -m 0755 "${WORKDIR}/01-check-toggle-portait" "${D}/etc/zaurusd/hinge-portrait.d/01-check-toggle"
+
 	install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-landscape" "${D}/etc/zaurusd/hinge-landscape.d/20-matchbox-landscape"
 	install -m 0755 "${WORKDIR}/zaurus-hinge.matchbox-portrait" "${D}/etc/zaurusd/hinge-portrait.d/20-matchbox-portrait"
 }
-- 
cgit v1.2.3


From 0bf5a6a8d22ab206b36b2bc7a54ef30c83a9e8d8 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Tue, 19 Feb 2008 19:26:01 +0000
Subject: repair openmoko-python-devel-image

---
 packages/images/openmoko-python-devel-image.bb | 3 ++-
 packages/tasks/task-python-efl-examples.bb     | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/images/openmoko-python-devel-image.bb b/packages/images/openmoko-python-devel-image.bb
index 9d2a8db2c6..615042f3b8 100644
--- a/packages/images/openmoko-python-devel-image.bb
+++ b/packages/images/openmoko-python-devel-image.bb
@@ -2,5 +2,6 @@ require openmoko-image.bb
 
 IMAGE_INSTALL += "\
   task-openmoko-python-devel \
+  task-python-efl-examples \
+  edje-viewer \
 "
-
diff --git a/packages/tasks/task-python-efl-examples.bb b/packages/tasks/task-python-efl-examples.bb
index 0a4e32097f..e78a4cabae 100644
--- a/packages/tasks/task-python-efl-examples.bb
+++ b/packages/tasks/task-python-efl-examples.bb
@@ -2,9 +2,13 @@ DESCRIPTION = "Python Examples for the Enlightenment Foundation Libraries"
 LICENSE = "MIT"
 SECTION = "devel/python"
 RDEPENDS = "\
-  python-efl python-ecore-examples python-emotion-examples python-edje-examples python-epsilon-examples \
+  task-python-efl \
+  python-ecore-examples \
+  python-emotion-examples \
+  python-edje-examples \
+  python-epsilon-examples \
   python-math python-textutils \
 "
-PR = "ml2"
+PR = "ml3"
 
 ALLOW_EMPTY = "1"
-- 
cgit v1.2.3


From c29453d85e7236aaef0ed5b5b20de2b18b1a8381 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 19 Feb 2008 19:34:46 +0000
Subject: ipkg-utils: ipkg-make-index-track-stamps.patch: Remove hunk with
 whitespace-only changes.

---
 .../ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch     | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
index 9f9b9359ce..ad6df4f2e9 100644
--- a/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
+++ b/packages/ipkg-utils/ipkg-utils/ipkg-make-index-track-stamps.patch
@@ -86,12 +86,3 @@ Index: ipkg-utils/ipkg-make-index
  if opt_s:
       sys.exit(0)
  
-@@ -154,7 +177,7 @@ if packages_filename:
-      os.rename(tmp_packages_filename, packages_filename)
-      os.rename(tmp_gzip_filename, gzip_filename)
- 
--if verbose:	
-+if verbose:
-      sys.stderr.write("Generate Packages.filelist file\n")
- files = {}
- names = packages.packages.keys()
-- 
cgit v1.2.3


From f14f0d3bfd9ebd96079700cf30b5c4ebffc9b6c4 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Tue, 19 Feb 2008 21:15:37 +0000
Subject: ipkg-utils*: Re-add support for openwrt-style .ipk's. * There're two
 .ipk formats: one with ar top-level wrapping (essentially, .deb format,
 native OE format) and with tar.gz top-level wrap, used by OpenWRT and some
 tiny distros. When I did performance optimization work on ipkg-make-index, I
 just blocked support of tar.gz-style ipk's, as it was unclear if those are
 used in OE at all. Now support is readded, with the old code to handle them
 (i.e. not as optimal as ar-style ones). * This makes DISTRO=openwrt-sdk
 usable for producing compatible packages and deploy-feed for them. But
 there're still some issues to resolve before OE can be said to provide
 seamless support for building packages for OpenWRT.

---
 .../ipkg-utils-native_1.6+cvs20050404.bb           |   2 +-
 .../ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch    | 105 +++++++++++----------
 packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb  |   2 +-
 3 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
index 3101ecb3be..ba3c8ecd0c 100644
--- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb
@@ -1,7 +1,7 @@
 require ipkg-utils_${PV}.bb
 
 RDEPENDS = ""
-PR = "r15"
+PR = "r16"
 
 inherit native
 
diff --git a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
index 25eb2cce6f..389a86018b 100644
--- a/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
+++ b/packages/ipkg-utils/ipkg-utils/ipkg-py-tarfile.patch
@@ -1,13 +1,6 @@
----
- arfile.py |  124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ipkg.py   |  106 ++++++++++++++++++++++++++---------------------------
- setup.py  |    2 -
- 3 files changed, 177 insertions(+), 55 deletions(-)
-
-Index: ipkg-utils/arfile.py
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ipkg-utils/arfile.py	2007-05-26 23:46:59.000000000 +0100
+diff -r 720080c24d2f arfile.py
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/arfile.py	Sun Jan 27 23:26:35 2008 +0200
 @@ -0,0 +1,124 @@
 +"""
 +arfile - A module to parse GNU ar archives.
@@ -133,23 +126,10 @@ Index: ipkg-utils/arfile.py
 +
 +        f2 = tarf.extractfile("control")
 +        print f2.read()
-Index: ipkg-utils/setup.py
-===================================================================
---- ipkg-utils.orig/setup.py	2007-05-26 23:45:55.000000000 +0100
-+++ ipkg-utils/setup.py	2007-05-26 23:46:59.000000000 +0100
-@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
- 		      platforms = 'POSIX',
- 		      keywords = 'ipkg familiar',
-                       url = 'http://www.handhelds.org/sources.html/',
--                      py_modules = [ 'ipkg' ],
-+                      py_modules = [ 'ipkg', 'arfile' ],
- 		      scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
-                       )
-Index: ipkg-utils/ipkg.py
-===================================================================
---- ipkg-utils.orig/ipkg.py	2007-05-26 23:46:55.000000000 +0100
-+++ ipkg-utils/ipkg.py	2007-05-26 23:45:20.000000000 +0100
-@@ -41,6 +41,8 @@ import re
+diff -r 720080c24d2f ipkg.py
+--- a/ipkg.py	Sun Jan 27 23:13:26 2008 +0200
++++ b/ipkg.py	Sun Jan 27 23:26:35 2008 +0200
+@@ -41,6 +41,8 @@ import string
  import string
  import commands
  from stat import ST_SIZE
@@ -158,7 +138,7 @@ Index: ipkg-utils/ipkg.py
  
  class Version:
      """A class for holding parsed package version information."""
-@@ -131,78 +133,61 @@ class Package:
+@@ -131,77 +133,61 @@ class Package:
  	self.section = None
          self.filename_header = None
  	self.file_list = []
@@ -198,8 +178,6 @@ Index: ipkg-utils/ipkg.py
 -            self.size = stat[ST_SIZE]
 +
              self.filename = os.path.basename(fn)
-+            assert self.isdeb == 1, "Old ipk format (non-deb) is unsupported"
-+
  	    ## sys.stderr.write("  extracting control.tar.gz from %s\n"% (fn,)) 
 -            if self.isdeb:
 -                control = os.popen("ar p "+fn+" control.tar.gz | tar xfzO - './control'","r")
@@ -227,15 +205,18 @@ Index: ipkg-utils/ipkg.py
 -                            self.__dict__[name] = value
 -                else:
 -                    line = control.readline()
++	    if self.isdeb:
++        	ar = arfile.ArFile(f)
++        	tarStream = ar.open("control.tar.gz")
++        	tarf = tarfile.open("control.tar.gz", "r", tarStream)
++
++        	try:
++        	    control = tarf.extractfile("control")
++        	except KeyError:
++        	    control = tarf.extractfile("./control")
++	    else:
++		control = os.popen("tar --wildcards -xzO -f " + fn + " '*control.tar.gz' | tar xfzO - './control'", "r")
 +
-+            ar = arfile.ArFile(f)
-+            tarStream = ar.open("control.tar.gz")
-+            tarf = tarfile.open("control.tar.gz", "r", tarStream)
-+
-+            try:
-+        	control = tarf.extractfile("control")
-+            except KeyError:
-+        	control = tarf.extractfile("./control")
 +            self.read_control(control)
              control.close()
 -            if self.isdeb:
@@ -251,7 +232,7 @@ Index: ipkg-utils/ipkg.py
  	self.scratch_dir = None
  	self.file_dir = None
  	self.meta_dir = None
- 
++
 +    def __getattr__(self, name):
 +        if name == "md5":
 +            self._computeFileMD5()
@@ -269,11 +250,10 @@ Index: ipkg-utils/ipkg.py
 +            sum.update(data)
 +        f.close()
 +        self.md5 = sum.hexdigest()
-+
+ 
      def read_control(self, control):
          import os
- 
-@@ -221,9 +203,15 @@ class Package:
+@@ -221,9 +207,15 @@ class Package:
                      value = value + '\n' + line
                  if name == 'size':
                      self.size = int(value)
@@ -290,20 +270,43 @@ Index: ipkg-utils/ipkg.py
                      return # consumes one blank line at end of package descriptoin
              else:
                  line = control.readline()
-@@ -314,6 +302,16 @@ class Package:
+@@ -314,7 +306,27 @@ class Package:
  	return self.section
  
      def get_file_list(self):
+-	return self.file_list
 +        if not self.fn:
 +            return []
-+        f = open(self.fn, "rb")
-+        ar = arfile.ArFile(f)
-+        tarStream = ar.open("data.tar.gz")
-+        tarf = tarfile.open("data.tar.gz", "r", tarStream)
-+        self.file_list = tarf.getnames()
++	
++	if self.isdeb:
++    	    f = open(self.fn, "rb")
++    	    ar = arfile.ArFile(f)
++    	    tarStream = ar.open("data.tar.gz")
++    	    tarf = tarfile.open("data.tar.gz", "r", tarStream)
++    	    self.file_list = tarf.getnames()
++    	    f.close()
++	else:
++            f = os.popen("tar xfzO " + self.fn + " '*data.tar.gz' | tar tfz -","r") 
++            while 1: 
++                line = f.readline() 
++                if not line: break 
++                self.file_list.append(string.rstrip(line)) 
++            f.close() 
++
++        # Make sure that filelist has consistent format regardless of tar version
 +        self.file_list = map(lambda a: ["./", ""][a.startswith("./")] + a, self.file_list)
-+
-+        f.close()
- 	return self.file_list
++        return self.file_list
  
      def write_package(self, dirname):
+         buf = self.render_control()
+diff -r 720080c24d2f setup.py
+--- a/setup.py	Sun Jan 27 23:13:26 2008 +0200
++++ b/setup.py	Sun Jan 27 23:26:35 2008 +0200
+@@ -16,6 +16,6 @@ distutils.core.setup( name = 'ipkg-utils
+ 		      platforms = 'POSIX',
+ 		      keywords = 'ipkg familiar',
+                       url = 'http://www.handhelds.org/sources.html/',
+-                      py_modules = [ 'ipkg' ],
++                      py_modules = [ 'ipkg', 'arfile' ],
+ 		      scripts = ['ipkg-compare-indexes', 'ipkg-make-index', 'ipkg-update-index', 'ipkg-build', 'ipkg-unbuild', 'ipkg-upload']
+                       )
diff --git a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
index c089796ccb..febecb0085 100644
--- a/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
+++ b/packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 SRCDATE = "20050404"
-PR = "r17"
+PR = "r18"
 
 SRC_URI = "${HANDHELDS_CVS};module=ipkg-utils \
            file://ipkg-utils-fix.patch;patch=1 \
-- 
cgit v1.2.3


From 0efa4c6c1cf75c70c9eae673daae44e937a92e1f Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <utx@penguin.cz>
Date: Tue, 19 Feb 2008 23:35:23 +0000
Subject: Fixed default ALSA state for SL-Cxx00 (OE#2617).   * Fixes
 bass/treble levels (reflects kernel fix alsa-wm8750-treble.patch (>2.6.24)). 
  * Increased Mic Levels and Boost.   * Enabled Capture Switch.   * Improved
 Headphones / Speaker volume balance.   * Disabled all bypasses.   * Disabled
 Left -> Right routing.   * All Mono signals decreased to 0 (not connected).  
 * Line Mux changed to differential, keeping PGA unused.   * Using Digital
 mono for recording (jack supports ony mono).   * Enabled Automatic Level
 Control, optimized for voice recording.   * Enabled Zero Cross volume
 changes.

---
 packages/alsa/alsa-state/akita/asound.state | 66 +++++++++++------------
 packages/alsa/alsa-state/spitz/asound.state | 82 ++++++++++++++---------------
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/packages/alsa/alsa-state/akita/asound.state b/packages/alsa/alsa-state/akita/asound.state
index ee5ef519c3..d1bacfb708 100644
--- a/packages/alsa/alsa-state/akita/asound.state
+++ b/packages/alsa/alsa-state/akita/asound.state
@@ -6,8 +6,8 @@ state.Spitz {
 		comment.range '0 - 63'
 		iface MIXER
 		name 'Capture Volume'
-		value.0 23
-		value.1 23
+		value.0 48
+		value.1 48
 	}
 	control.2 {
 		comment.access 'read write'
@@ -15,8 +15,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Capture ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.3 {
 		comment.access 'read write'
@@ -24,8 +24,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Capture Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.4 {
 		comment.access 'read write'
@@ -33,8 +33,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Headphone Playback ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.5 {
 		comment.access 'read write'
@@ -42,8 +42,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Speaker Playback ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.6 {
 		comment.access 'read write'
@@ -92,8 +92,8 @@ state.Spitz {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 220
+		value.1 220
 	}
 	control.11 {
 		comment.access 'read write'
@@ -122,7 +122,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'Bass Volume'
-		value 11
+		value 0
 	}
 	control.14 {
 		comment.access 'read write'
@@ -131,7 +131,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'Treble Volume'
-		value 11
+		value 0
 	}
 	control.15 {
 		comment.access 'read write'
@@ -158,7 +158,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name '3D Volume'
-		value 9
+		value 0
 	}
 	control.18 {
 		comment.access 'read write'
@@ -226,7 +226,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'ALC Capture ZC Switch'
-		value false
+		value true
 	}
 	control.25 {
 		comment.access 'read write'
@@ -235,7 +235,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Hold Time'
-		value 0
+		value 9
 	}
 	control.26 {
 		comment.access 'read write'
@@ -244,7 +244,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Decay Time'
-		value 3
+		value 9
 	}
 	control.27 {
 		comment.access 'read write'
@@ -253,7 +253,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Attack Time'
-		value 2
+		value 3
 	}
 	control.28 {
 		comment.access 'read write'
@@ -298,7 +298,7 @@ state.Spitz {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'Right ADC Capture Volume'
-		value 0
+		value 195
 	}
 	control.33 {
 		comment.access 'read write'
@@ -306,7 +306,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'ZC Timeout Switch'
-		value false
+		value true
 	}
 	control.34 {
 		comment.access 'read write'
@@ -331,8 +331,8 @@ state.Spitz {
 		comment.range '0 - 3'
 		iface MIXER
 		name 'Mic Boost'
-		value.0 0
-		value.1 0
+		value.0 3
+		value.1 3
 	}
 	control.37 {
 		comment.access 'read write'
@@ -379,8 +379,8 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Headphone Playback Volume'
-		value.0 121
-		value.1 121
+		value.0 105
+		value.1 105
 	}
 	control.42 {
 		comment.access 'read write'
@@ -389,8 +389,8 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Speaker Playback Volume'
-		value.0 121
-		value.1 121
+		value.0 127
+		value.1 127
 	}
 	control.43 {
 		comment.access 'read write'
@@ -411,7 +411,7 @@ state.Spitz {
 		comment.item.3 'Digital Mono'
 		iface MIXER
 		name 'Right ADC Mux'
-		value 'Mono (Left)'
+		value 'Digital Mono'
 	}
 	control.45 {
 		comment.access 'read write'
@@ -423,7 +423,7 @@ state.Spitz {
 		comment.item.3 'Digital Mono'
 		iface MIXER
 		name 'Left ADC Mux'
-		value 'Mono (Left)'
+		value 'Digital Mono'
 	}
 	control.46 {
 		comment.access 'read write'
@@ -458,7 +458,7 @@ state.Spitz {
 		comment.item.4 Differential
 		iface MIXER
 		name 'Right Line Mux'
-		value 'Line 2'
+		value Differential
 	}
 	control.49 {
 		comment.access 'read write'
@@ -471,7 +471,7 @@ state.Spitz {
 		comment.item.4 Differential
 		iface MIXER
 		name 'Left Line Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.50 {
 		comment.access 'read write'
@@ -483,7 +483,7 @@ state.Spitz {
 		comment.item.3 Differential
 		iface MIXER
 		name 'Right PGA Mux'
-		value 'Line 2'
+		value Differential
 	}
 	control.51 {
 		comment.access 'read write'
@@ -495,7 +495,7 @@ state.Spitz {
 		comment.item.3 Differential
 		iface MIXER
 		name 'Left PGA Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.52 {
 		comment.access 'read write'
diff --git a/packages/alsa/alsa-state/spitz/asound.state b/packages/alsa/alsa-state/spitz/asound.state
index 81b6ed9814..d1bacfb708 100644
--- a/packages/alsa/alsa-state/spitz/asound.state
+++ b/packages/alsa/alsa-state/spitz/asound.state
@@ -6,8 +6,8 @@ state.Spitz {
 		comment.range '0 - 63'
 		iface MIXER
 		name 'Capture Volume'
-		value.0 23
-		value.1 23
+		value.0 48
+		value.1 48
 	}
 	control.2 {
 		comment.access 'read write'
@@ -15,8 +15,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Capture ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.3 {
 		comment.access 'read write'
@@ -24,8 +24,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Capture Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.4 {
 		comment.access 'read write'
@@ -33,8 +33,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Headphone Playback ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.5 {
 		comment.access 'read write'
@@ -42,8 +42,8 @@ state.Spitz {
 		comment.count 2
 		iface MIXER
 		name 'Speaker Playback ZC Switch'
-		value.0 false
-		value.1 false
+		value.0 true
+		value.1 true
 	}
 	control.6 {
 		comment.access 'read write'
@@ -92,8 +92,8 @@ state.Spitz {
 		comment.range '0 - 255'
 		iface MIXER
 		name 'PCM Volume'
-		value.0 255
-		value.1 255
+		value.0 220
+		value.1 220
 	}
 	control.11 {
 		comment.access 'read write'
@@ -131,7 +131,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'Treble Volume'
-		value 15
+		value 0
 	}
 	control.15 {
 		comment.access 'read write'
@@ -188,7 +188,7 @@ state.Spitz {
 		comment.item.1 Playback
 		iface MIXER
 		name '3D Mode'
-		value Capture
+		value Playback
 	}
 	control.21 {
 		comment.access 'read write'
@@ -218,7 +218,7 @@ state.Spitz {
 		comment.item.3 Stereo
 		iface MIXER
 		name 'ALC Capture Function'
-		value Off
+		value Left
 	}
 	control.24 {
 		comment.access 'read write'
@@ -226,7 +226,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'ALC Capture ZC Switch'
-		value false
+		value true
 	}
 	control.25 {
 		comment.access 'read write'
@@ -235,7 +235,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Hold Time'
-		value 0
+		value 9
 	}
 	control.26 {
 		comment.access 'read write'
@@ -244,7 +244,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Decay Time'
-		value 3
+		value 9
 	}
 	control.27 {
 		comment.access 'read write'
@@ -253,7 +253,7 @@ state.Spitz {
 		comment.range '0 - 15'
 		iface MIXER
 		name 'ALC Capture Attack Time'
-		value 2
+		value 3
 	}
 	control.28 {
 		comment.access 'read write'
@@ -306,7 +306,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'ZC Timeout Switch'
-		value false
+		value true
 	}
 	control.34 {
 		comment.access 'read write'
@@ -322,7 +322,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'Right Speaker Playback Invert Switch'
-		value false
+		value true
 	}
 	control.36 {
 		comment.access 'read write'
@@ -331,8 +331,8 @@ state.Spitz {
 		comment.range '0 - 3'
 		iface MIXER
 		name 'Mic Boost'
-		value.0 0
-		value.1 0
+		value.0 3
+		value.1 3
 	}
 	control.37 {
 		comment.access 'read write'
@@ -341,8 +341,8 @@ state.Spitz {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Bypass Left Playback Volume'
-		value.0 2
-		value.1 2
+		value.0 0
+		value.1 0
 	}
 	control.38 {
 		comment.access 'read write'
@@ -351,8 +351,8 @@ state.Spitz {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Bypass Right Playback Volume'
-		value.0 2
-		value.1 2
+		value.0 0
+		value.1 0
 	}
 	control.39 {
 		comment.access 'read write'
@@ -361,8 +361,8 @@ state.Spitz {
 		comment.range '0 - 7'
 		iface MIXER
 		name 'Bypass Mono Playback Volume'
-		value.0 2
-		value.1 2
+		value.0 0
+		value.1 0
 	}
 	control.40 {
 		comment.access 'read write'
@@ -379,8 +379,8 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Headphone Playback Volume'
-		value.0 121
-		value.1 121
+		value.0 105
+		value.1 105
 	}
 	control.42 {
 		comment.access 'read write'
@@ -389,8 +389,8 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Speaker Playback Volume'
-		value.0 121
-		value.1 121
+		value.0 127
+		value.1 127
 	}
 	control.43 {
 		comment.access 'read write'
@@ -399,7 +399,7 @@ state.Spitz {
 		comment.range '0 - 127'
 		iface MIXER
 		name 'Mono Playback Volume'
-		value 121
+		value 0
 	}
 	control.44 {
 		comment.access 'read write'
@@ -411,7 +411,7 @@ state.Spitz {
 		comment.item.3 'Digital Mono'
 		iface MIXER
 		name 'Right ADC Mux'
-		value Stereo
+		value 'Digital Mono'
 	}
 	control.45 {
 		comment.access 'read write'
@@ -423,7 +423,7 @@ state.Spitz {
 		comment.item.3 'Digital Mono'
 		iface MIXER
 		name 'Left ADC Mux'
-		value Stereo
+		value 'Digital Mono'
 	}
 	control.46 {
 		comment.access 'read write'
@@ -458,7 +458,7 @@ state.Spitz {
 		comment.item.4 Differential
 		iface MIXER
 		name 'Right Line Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.49 {
 		comment.access 'read write'
@@ -471,7 +471,7 @@ state.Spitz {
 		comment.item.4 Differential
 		iface MIXER
 		name 'Left Line Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.50 {
 		comment.access 'read write'
@@ -483,7 +483,7 @@ state.Spitz {
 		comment.item.3 Differential
 		iface MIXER
 		name 'Right PGA Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.51 {
 		comment.access 'read write'
@@ -495,7 +495,7 @@ state.Spitz {
 		comment.item.3 Differential
 		iface MIXER
 		name 'Left PGA Mux'
-		value 'Line 1'
+		value Differential
 	}
 	control.52 {
 		comment.access 'read write'
@@ -535,7 +535,7 @@ state.Spitz {
 		comment.count 1
 		iface MIXER
 		name 'Right Mixer Left Playback Switc'
-		value true
+		value false
 	}
 	control.57 {
 		comment.access 'read write'
-- 
cgit v1.2.3