From 579bf2572c3688fafa0a2f5674c3a088c38daba0 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 9 Mar 2008 01:33:31 +0000
Subject: initramfs-module-bootldr-buster: Use sane console setup.

---
 packages/initrdscripts/files/01-bootldr-buster.sh             | 2 +-
 packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'packages')

diff --git a/packages/initrdscripts/files/01-bootldr-buster.sh b/packages/initrdscripts/files/01-bootldr-buster.sh
index 46d01903ed..c3b79b5328 100644
--- a/packages/initrdscripts/files/01-bootldr-buster.sh
+++ b/packages/initrdscripts/files/01-bootldr-buster.sh
@@ -7,7 +7,7 @@ if expr "$cmdl" : '.*mtdparts=ipaq' > /dev/null; then
     echo "Detected Compaq bootldr or derivative"
     echo "Kernel command line is assumed to be bogus and ignored"
     echo "!!!!!!!!"
-    CMDLINE=" "
+    CMDLINE="console=ttyS0,115200 console=tty0"
     sleep 3
 fi
 
diff --git a/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb b/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb
index a3141f5a9f..8c4c2f7e93 100644
--- a/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://01-bootldr-buster.sh"
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "An initramfs module for ignoring bogus kernel commandline from Compaq bootldr"
 RDEPENDS = "initramfs-uniboot"
 
-- 
cgit v1.2.3


From 8fd3f13e159ef7506aeed77b3ad2120f91492aae Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 9 Mar 2008 01:35:38 +0000
Subject: initramfs-*: Use $CONSOLE for input/output.

---
 packages/initrdscripts/files/30-bootmenu.sh        | 22 +++++++++++-----------
 packages/initrdscripts/files/87-kexecboot.sh       |  6 +++---
 packages/initrdscripts/files/init.sh               |  3 ++-
 .../initrdscripts/initramfs-module-bootmenu_1.0.bb |  2 +-
 .../initramfs-module-kexecboot_1.0.bb              |  2 +-
 packages/initrdscripts/initramfs-uniboot_1.0.bb    |  2 +-
 6 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'packages')

diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh
index f5ecb8c828..283daadd44 100644
--- a/packages/initrdscripts/files/30-bootmenu.sh
+++ b/packages/initrdscripts/files/30-bootmenu.sh
@@ -36,14 +36,14 @@ add_menu_item()
 }
 
 show_menu() {
-    echo -e -n "${E}3;0H"
+    echo -e -n "${E}3;0H" >$CONSOLE
     cnt=0
     echo -e $list | \
     while read l; do
         if [ $cnt == $num ]; then
-	    echo -e -n "${E}1m"
+	    echo -e -n "${E}1m" >$CONSOLE
 	fi
-        echo -e "$cnt: $l${E}0m"
+        echo -e "$cnt: $l${E}0m" >$CONSOLE
 	cnt=$((cnt + 1))
     done
 }
@@ -109,14 +109,14 @@ total=`echo -e $list | wc -l`
 num=0
 
 # Draw UI
-stty -echo
-echo -e -n "${E}2J"
-echo -e -n "${E}0;0H"
-echo "Select boot image:"
+stty -F $CONSOLE -echo
+echo -e -n "${E}2J" >$CONSOLE
+echo -e -n "${E}0;0H" >$CONSOLE
+echo "Select boot image:" >$CONSOLE
 
 # Main loop
 show_menu
-while read -n1 i; do
+while read -s -n1 i; do
     case "$i" in
 	"A")
 	    num=$((num - 1))
@@ -139,7 +139,7 @@ while read -n1 i; do
     esac
     show_menu
 #    echo "*$esc$i"
-done
+done < $CONSOLE
 
 stty echo
 
@@ -170,8 +170,8 @@ else
     CMDLINE="$CMDLINE root=$ROOT_DEVICE"
 fi
 
-echo ROOT_DEVICE=$ROOT_DEVICE
-echo CMDLINE=$CMDLINE
+echo ROOT_DEVICE=$ROOT_DEVICE >$CONSOLE
+echo CMDLINE=$CMDLINE >$CONSOLE
 
 ##############################
 fi
diff --git a/packages/initrdscripts/files/87-kexecboot.sh b/packages/initrdscripts/files/87-kexecboot.sh
index 9232934f98..2a51b4d9c8 100644
--- a/packages/initrdscripts/files/87-kexecboot.sh
+++ b/packages/initrdscripts/files/87-kexecboot.sh
@@ -3,15 +3,15 @@
 
 if [ -n "$BOOT_ROOT" -a -f "$BOOT_ROOT/boot/zImage" ]; then
     if ! expr "$CMDLINE" : '.*nokexec'; then
-	echo "Kernel found in rootfs:"
-	ls -l "$BOOT_ROOT/boot/zImage"
+	echo "Kernel found in rootfs:" >$CONSOLE
+	ls -l "$BOOT_ROOT/boot/zImage" >$CONSOLE
 	initramfs=""
 	if [ -f "$BOOT_ROOT/boot/initramfs.bin" ]; then
 	    echo "Initramfs found in rootfs:"
 	    ls -l "$BOOT_ROOT/boot/initramfs.bin"
     	    initramfs="--initrd=$BOOT_ROOT/boot/initramfs.bin"
         fi
-	echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec"
+	echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec" >$CONSOLE
         sleep 10
 	/usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec"
         sleep 10000
diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index c3b4336e40..06b9119a1c 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -41,6 +41,7 @@ read_args() {
 
 load_modules() {
     for module in $MODULE_DIR/$1; do
+	# Cannot redir to $CONSOLE here easily - may not be set yet
         echo "initramfs: Loading $module module"
         source $module
     done
@@ -67,7 +68,7 @@ load_modules '0*'
 read_args
 
 if [ -n "$rootdelay" ]; then
-    echo "Waiting $rootdelay seconds for devices to settle..."
+    echo "Waiting $rootdelay seconds for devices to settle..." >$CONSOLE
     sleep $rootdelay
 fi
 
diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 6c01b5edc5..6be8d733c9 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r15"
+PR = "r16"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.
diff --git a/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb b/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb
index 35100a94e6..face73038a 100644
--- a/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://87-kexecboot.sh"
-PR = "r0.4"
+PR = "r1"
 DESCRIPTION = "An initramfs module for kexecing kernel from rootfs."
 RDEPENDS = "initramfs-uniboot kexec-static"
 
diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb
index cfa065b619..95eda7d954 100644
--- a/packages/initrdscripts/initramfs-uniboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://init.sh"
-PR = "r6"
+PR = "r7"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"
 
-- 
cgit v1.2.3


From 84c5f5d53e3417913c75df26cf33678efe0a148e Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Sun, 9 Mar 2008 01:41:02 +0000
Subject: initramfs-uniboot: Set default rootdelay globally, instead of
 initramfs-module-bootmenu. * That's because otherwise it's half-solution -
 after kexec, there won't be delay, and rootfs won't be detected. * Again,
 people who don't need and don't want delay, should pass rootdelay=0.

---
 packages/initrdscripts/files/30-bootmenu.sh             | 7 -------
 packages/initrdscripts/files/init.sh                    | 5 +++++
 packages/initrdscripts/initramfs-module-bootmenu_1.0.bb | 2 +-
 packages/initrdscripts/initramfs-uniboot_1.0.bb         | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'packages')

diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh
index 283daadd44..c77bd662af 100644
--- a/packages/initrdscripts/files/30-bootmenu.sh
+++ b/packages/initrdscripts/files/30-bootmenu.sh
@@ -15,13 +15,6 @@ if ! (echo " " | read -n1 foo) >/dev/null 2>&1; then
     exit 1
 fi
 
-if [ -z "$rootdelay" ]; then
-    echo "rootdelay parameter was not passed on kernel command line - assuming 2s delay"
-    echo "If you would like to avoid this delay, pass explicit rootdelay=0"
-    sleep 2
-    dev_setup
-fi
-
 mkdir -p $MOUNTLOC
 
 list=""
diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index 06b9119a1c..60d2e5da8b 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -67,6 +67,11 @@ load_modules '0*'
 
 read_args
 
+if [ -z "$rootdelay" ]; then
+    echo "rootdelay parameter was not passed on kernel command line - assuming 2s delay"
+    echo "If you would like to avoid this delay, pass explicit rootdelay=0"
+    rootdelay="2"
+fi
 if [ -n "$rootdelay" ]; then
     echo "Waiting $rootdelay seconds for devices to settle..." >$CONSOLE
     sleep $rootdelay
diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 6be8d733c9..5893420742 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r16"
+PR = "r17"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.
diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb
index 95eda7d954..403db0b562 100644
--- a/packages/initrdscripts/initramfs-uniboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://init.sh"
-PR = "r7"
+PR = "r8"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"
 
-- 
cgit v1.2.3


From 84f86f51d4b5c67bc99294eba8fb1b7a5baf4578 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 16:37:07 +0000
Subject: gypsy: workaround automake failure in docs/reference

---
 packages/gypsy/files/docs-reference-am.patch | 17 +++++++++++++++++
 packages/gypsy/gypsy_svn.bb                  |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 packages/gypsy/files/docs-reference-am.patch

(limited to 'packages')

diff --git a/packages/gypsy/files/docs-reference-am.patch b/packages/gypsy/files/docs-reference-am.patch
new file mode 100644
index 0000000000..9eb0051d79
--- /dev/null
+++ b/packages/gypsy/files/docs-reference-am.patch
@@ -0,0 +1,17 @@
+Index: gypsy/docs/reference/Makefile.am
+===================================================================
+--- gypsy.orig/docs/reference/Makefile.am	2008-03-10 13:15:06.000000000 +0800
++++ gypsy/docs/reference/Makefile.am	2008-03-10 13:15:24.000000000 +0800
+@@ -88,10 +88,10 @@
+ 
+ # Other files to distribute
+ # e.g. EXTRA_DIST += version.xml.in
+-EXTRA_DIST += version.xml.in \
++EXTRA_DIST = version.xml.in \
+ 	gypsy-design.png
+ 
+-CLEANFILES += $(dbus_docs)
++CLEANFILES = $(dbus_docs)
+ 
+ ref-%.xml: $(top_srcdir)/interfaces/%-full.xml
+ 	$(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-to-docbook.xsl $<
diff --git a/packages/gypsy/gypsy_svn.bb b/packages/gypsy/gypsy_svn.bb
index 45e283b6b7..bb1038d86a 100644
--- a/packages/gypsy/gypsy_svn.bb
+++ b/packages/gypsy/gypsy_svn.bb
@@ -3,7 +3,8 @@ require gypsy.inc
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \
-           file://fixups.patch;patch=1;maxrev=107"
+           file://fixups.patch;patch=1;maxrev=107 \
+           file://docs-reference-am.patch;patch=1;minrev=134"
 
 PV = "0.0+svnr${SRCREV}"
 S = "${WORKDIR}/${PN}"
-- 
cgit v1.2.3


From 713e0a97c9115eb9b04b2ab7ee7c48723a614097 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 16:46:36 +0000
Subject: diversity: Diversity is a framework for Internet + GPS applications.
 It communicates with a server for location exchange.It also allows you to tag
 and share a location with your friends. * update sane-srcrevs.inc and
 moko-autorev.inc accordingly

---
 packages/openmoko-projects/.mtn2git_empty          |  0
 packages/openmoko-projects/diversity-daemon_svn.bb | 19 +++++++++++++++++++
 packages/openmoko-projects/diversity-nav_svn.bb    | 16 ++++++++++++++++
 3 files changed, 35 insertions(+)
 create mode 100644 packages/openmoko-projects/.mtn2git_empty
 create mode 100644 packages/openmoko-projects/diversity-daemon_svn.bb
 create mode 100644 packages/openmoko-projects/diversity-nav_svn.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/.mtn2git_empty b/packages/openmoko-projects/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb
new file mode 100644
index 0000000000..6ea4f54a92
--- /dev/null
+++ b/packages/openmoko-projects/diversity-daemon_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Diveristy Daemon"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "net/misc"
+LICENSE = "GPL"
+DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl"
+RDEPENDS = "eds-dbus gypsy openmoko-dialer2"
+PV = "0.0+svnr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https"
+
+S = "${WORKDIR}/diversity-daemon"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus"
+
+FILES_${PN} += "${datadir}/dbus-1/"
+FILES_${PN} += "${sysconfdir}/dbus-1/"
diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb
new file mode 100644
index 0000000000..58090e9baf
--- /dev/null
+++ b/packages/openmoko-projects/diversity-nav_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Diversity_nav - a GPS location based communicative application"
+HOMEPAGE = "http://diversity.projects.openmoko.org/"
+SECTION = "openmoko/applications"
+LICENSE = "GPL"
+DEPENDS = "evas edje ecore edbus"
+RDEPENDS = "libevas-engine-buffer libevas-engine-software-16 libevas-engine-software-16-x11 libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-eet libevas-loader-jpeg libevas-loader-png"
+PV = "0.0.1+svnr${SRCREV}"
+PR = "r1"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https"
+
+S = "${WORKDIR}/diversity-nav"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
-- 
cgit v1.2.3


From 4683d62ca408939ab573237c345ded7b02147cbb Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 16:52:37 +0000
Subject: packagekit: PackageKit is a system designed to make installing and
 updating software on your computer easier. The primary design goal is to
 unify all the software graphical tools used in different distributions, and
 use some of the latest technology like PolicyKit to make the process suck
 less.

---
 packages/packagekit/.mtn2git_empty                 |  0
 packages/packagekit/files/.mtn2git_empty           |  0
 .../packagekit/files/disable-docbook2man.patch     | 12 ++++++++++
 packages/packagekit/packagekit_git.bb              | 27 ++++++++++++++++++++++
 4 files changed, 39 insertions(+)
 create mode 100644 packages/packagekit/.mtn2git_empty
 create mode 100644 packages/packagekit/files/.mtn2git_empty
 create mode 100644 packages/packagekit/files/disable-docbook2man.patch
 create mode 100644 packages/packagekit/packagekit_git.bb

(limited to 'packages')

diff --git a/packages/packagekit/.mtn2git_empty b/packages/packagekit/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/packagekit/files/.mtn2git_empty b/packages/packagekit/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/packagekit/files/disable-docbook2man.patch b/packages/packagekit/files/disable-docbook2man.patch
new file mode 100644
index 0000000000..0c7d4239d4
--- /dev/null
+++ b/packages/packagekit/files/disable-docbook2man.patch
@@ -0,0 +1,12 @@
+Index: git/configure.ac
+===================================================================
+--- git.orig/configure.ac	2008-02-20 17:57:44.000000000 +0800
++++ git/configure.ac	2008-02-20 17:58:30.000000000 +0800
+@@ -115,6 +115,7 @@
+ if test "$DOCBOOK2MAN" = "no" ; then
+ 	AC_MSG_WARN([docbook2man not found, will not be able to build man documentation])
+ 	fi
++DOCBOOK2MAN="no"
+ AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"])
+ 
+ dnl ---------------------------------------------------------------------------
diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb
new file mode 100644
index 0000000000..d4055ead63
--- /dev/null
+++ b/packages/packagekit/packagekit_git.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "PackageKit package management abstraction"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool"
+RDEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 opkg"
+PV = "0.1+git${SRCREV}"
+PR = "r7"
+
+SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \
+           file://disable-docbook2man.patch;patch=1"
+
+SRCREV = "${AUTOREV}"
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-security-framework=dummy --with-default-backend=opkg --enable-opkg"
+
+do_configure_prepend() {
+        echo "EXTRA_DIST=" > gtk-doc.make
+}
+do_stage () {
+        autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/"
-- 
cgit v1.2.3


From eab8f2d96728a27d8be1dd99ef43f5ca24efa4cf Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 16:54:44 +0000
Subject: assassin: add recipe for assassin * Assassin is a package manager
 that help users to install, update, and uninstall packages from Openmoko, or
 Openmoko community.

---
 packages/openmoko-projects/assassin_svn.bb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 packages/openmoko-projects/assassin_svn.bb

(limited to 'packages')

diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb
new file mode 100644
index 0000000000..83927c1d2a
--- /dev/null
+++ b/packages/openmoko-projects/assassin_svn.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Action GUI for Installer"
+HOMEPAGE = "http://assassin.projects.openmoko.org/"
+LICENSE = "GPL"
+DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit"
+PV = "0.2+svn${SRCREV}"
+PR = "r2"
+
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https"
+
+S = "${WORKDIR}/assassin"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = ""
+
+FILES_${PN} += "${prefix}/share/*"
-- 
cgit v1.2.3


From aa40825de9384769370499e752acf1d571b28bf5 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 17:59:27 +0000
Subject: intltool: add patch from
 http://bugzilla.gnome.org/show_bug.cgi?id=462312           we need this to
 compile the latest version of packagekit.

---
 .../intltool/files/intltool-0.35.5-polkit.patch    | 32 ++++++++++++++++++++++
 packages/intltool/intltool_0.35.5.bb               |  4 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 packages/intltool/files/intltool-0.35.5-polkit.patch

(limited to 'packages')

diff --git a/packages/intltool/files/intltool-0.35.5-polkit.patch b/packages/intltool/files/intltool-0.35.5-polkit.patch
new file mode 100644
index 0000000000..2d89fbe04c
--- /dev/null
+++ b/packages/intltool/files/intltool-0.35.5-polkit.patch
@@ -0,0 +1,32 @@
+diff -up intltool-0.35.5/intltool.m4.polkit intltool-0.35.5/intltool.m4
+--- intltool-0.35.5/intltool.m4.polkit	2007-07-31 17:23:52.000000000 -0400
++++ intltool-0.35.5/intltool.m4	2007-07-31 17:24:20.000000000 -0400
+@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
+   INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' 
+     INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
++   INTLTOOL_POLICY_RULE='%.policy:    %.policy.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ 
+ AC_SUBST(INTLTOOL_DESKTOP_RULE)
+ AC_SUBST(INTLTOOL_DIRECTORY_RULE)
+@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE)
+ AC_SUBST(INTLTOOL_SCHEMAS_RULE)
+ AC_SUBST(INTLTOOL_THEME_RULE)
+ AC_SUBST(INTLTOOL_SERVICE_RULE)
++AC_SUBST(INTLTOOL_POLICY_RULE)
+ 
+ # Use the tools built into the package, not the ones that are installed.
+ AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+diff -up intltool-0.35.5/intltool-update.in.in.polkit intltool-0.35.5/intltool-update.in.in
+--- intltool-0.35.5/intltool-update.in.in.polkit	2007-07-31 17:10:52.000000000 -0400
++++ intltool-0.35.5/intltool-update.in.in	2007-07-31 17:21:45.000000000 -0400
+@@ -71,7 +71,8 @@ my $xml_support =
+ "sheet(?:\\.in)+|".	# ?
+ "schemas(?:\\.in)+|".	# GConf specific
+ "pong(?:\\.in)+|".	# DEPRECATED: PONG is not used [by GNOME] any longer.
+-"kbd(?:\\.in)+";	# GOK specific. 
++"kbd(?:\\.in)+|".	# GOK specific. 
++"policy(?:\\.in)+";	# PolicyKit files
+ 
+ my $ini_support =
+ "icon(?:\\.in)+|".	# http://www.freedesktop.org/Standards/icon-theme-spec
diff --git a/packages/intltool/intltool_0.35.5.bb b/packages/intltool/intltool_0.35.5.bb
index fc713172f9..092689b24b 100644
--- a/packages/intltool/intltool_0.35.5.bb
+++ b/packages/intltool/intltool_0.35.5.bb
@@ -3,8 +3,10 @@ require intltool.inc
 DEPENDS = "libxml-parser-perl-native"
 RDEPENDS = "perl-module-text-wrap perl-module-re"
 
-PR = "r1"
+PR = "r2"
 
 RRECOMMENDS = "perl-modules"
 
 DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += "file://intltool-0.35.5-polkit.patch;patch=1"
-- 
cgit v1.2.3


From 44fb4792e4f4fd8d2c6430af465522ee1a646a32 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 18:03:49 +0000
Subject: u-boot-openmoko: enable autorev * also update pn-u-boot-openmoko in
 sane-srcrevs.inc * also update patch
 uboot-20070311-tools_makefile_ln_sf.patch

---
 .../u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch  | 13 ++++++++++---
 packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb            | 10 +++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'packages')

diff --git a/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
index e90cc0de71..eca50615ad 100644
--- a/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
+++ b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch
@@ -1,6 +1,8 @@
---- a/tools/Makefile	2007-03-11 00:55:44.000000000 +0000
-+++ b/tools/Makefile	2007-03-11 00:55:52.000000000 +0000
-@@ -194,14 +194,14 @@
+Index: git/tools/Makefile
+===================================================================
+--- git.orig/tools/Makefile	2008-03-03 13:32:32.000000000 +0800
++++ git/tools/Makefile	2008-03-03 13:40:23.000000000 +0800
+@@ -208,18 +208,18 @@
  
  $(obj)environment.c:
  		@rm -f $(obj)environment.c
@@ -15,5 +17,10 @@
 -		ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c
 +		ln -sf $(src)../lib_generic/crc32.c $(obj)crc32.c
  
+ $(obj)sha1.c:
+ 		@rm -f $(obj)sha1.c
+-		ln -s $(src)../lib_generic/sha1.c $(obj)sha1.c
++		ln -sf $(src)../lib_generic/sha1.c $(obj)sha1.c
+ 
  $(LOGO_H):	$(obj)bmp_logo $(LOGO_BMP)
  		$(obj)./bmp_logo $(LOGO_BMP) >$@
diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
index 020fd421c6..1fb9be4f43 100644
--- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
+++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
@@ -5,18 +5,18 @@ SECTION = "bootloader"
 PRIORITY = "optional"
 
 UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e"
-UBOOT_OPENMOKO_REV = "4118"
 UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
-LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}"
-PV = "1.3.1${LOCALVERSION}"
+SRCREV_FORMAT = "+gitupstream+svnpatchset"
+
+PV = "1.3.1${SRCREV}"
 PR = "r3"
 
 PROVIDES = "virtual/bootloader"
 S = "${WORKDIR}/git"
 
 SRC_URI = "\
-  git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \
-  svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
+  git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV};name=upstream \
+  svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patchset \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
 #  file://makefile-no-dirafter.patch;patch=1 \
 #  file://fix-data-abort-from-sd-ombug799.patch;patch=1 \
-- 
cgit v1.2.3


From 7a97c29072572bf147bf625b80982441c11b7c01 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 18:08:19 +0000
Subject: e-wm: remove file://Makefile.in.in since it's not there and      
 it's not used anyway.

---
 packages/e17/e-wm_cvs.bb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'packages')

diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb
index 4dbacffe1b..c3a243a675 100644
--- a/packages/e17/e-wm_cvs.bb
+++ b/packages/e17/e-wm_cvs.bb
@@ -9,7 +9,6 @@ inherit e update-alternatives
 SRC_URI = "${E_CVS};module=e17/apps/e \
            file://Xsession.d/98enlightenment \
            file://applications.menu \
-           file://Makefile.in.in \
 "
 S = "${WORKDIR}/e"
 
-- 
cgit v1.2.3


From 6fcdf85424191d742baf654a02e3337d03ee8815 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 18:12:03 +0000
Subject: mono: use monoburg from mono-native instead * the original method is
 to build monoburg natively during the (crossed)   mono build.  it will
 require glib-dev from host.  now we use the one   from mono-native. *
 mono-native 1.2.5.1 is updated to stage monoburg

---
 packages/mono/mono-1.2.5.1/disable-monoburg.patch | 22 ++++++++++++++++++++++
 packages/mono/mono-native_1.2.5.1.bb              |  8 ++++----
 packages/mono/mono_1.2.5.1.bb                     |  5 +++--
 3 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 packages/mono/mono-1.2.5.1/disable-monoburg.patch

(limited to 'packages')

diff --git a/packages/mono/mono-1.2.5.1/disable-monoburg.patch b/packages/mono/mono-1.2.5.1/disable-monoburg.patch
new file mode 100644
index 0000000000..21c1e30f07
--- /dev/null
+++ b/packages/mono/mono-1.2.5.1/disable-monoburg.patch
@@ -0,0 +1,22 @@
+Index: mono-1.2.5.1/mono/Makefile.am
+===================================================================
+--- mono-1.2.5.1.orig/mono/Makefile.am	2008-03-05 15:52:06.000000000 +0800
++++ mono-1.2.5.1/mono/Makefile.am	2008-03-05 15:52:23.000000000 +0800
+@@ -1,3 +1,3 @@
+ 
+-SUBDIRS = utils io-layer monoburg os cil metadata \
++SUBDIRS = utils io-layer os cil metadata \
+       arch interpreter mini dis monograph tests benchmark profiler
+Index: mono-1.2.5.1/mono/mini/Makefile.am
+===================================================================
+--- mono-1.2.5.1.orig/mono/mini/Makefile.am	2008-03-05 16:02:51.000000000 +0800
++++ mono-1.2.5.1/mono/mini/Makefile.am	2008-03-05 16:02:57.000000000 +0800
+@@ -436,7 +436,7 @@
+ 	$(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc
+ 
+ inssel.c inssel.h: $(BURGSRC)
+-	$(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
++	monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c
+ 
+ testi: mono test.exe
+ 	$(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe
diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb
index 7ac2246b3a..8506a20867 100644
--- a/packages/mono/mono-native_1.2.5.1.bb
+++ b/packages/mono/mono-native_1.2.5.1.bb
@@ -1,5 +1,5 @@
 require mono_1.2.5.inc
-PR = "r1"
+PR = "r2"
 DEPENDS = "glib-2.0-native perl-native"
 
 SRC_URI += "file://mono-fix-libdir-path.patch;patch=1"
@@ -8,9 +8,9 @@ PARALLEL_MAKE = ""
 
 inherit native
 
-#do_stage_prepend() {
-#	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
-#}
+do_stage_prepend() {
+	install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR}
+}
 
 do_fix_libtool_name() {
 	# inherit native will make that all native tools that are being
diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb
index 55f601bcb7..d073aa7d98 100644
--- a/packages/mono/mono_1.2.5.1.bb
+++ b/packages/mono/mono_1.2.5.1.bb
@@ -2,10 +2,11 @@ require mono_1.2.5.inc
 
 DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI += "file://configure.patch;patch=1 \
-	file://genmdesc-cpp.patch;patch=1"
+	file://genmdesc-cpp.patch;patch=1 \
+	file://disable-monoburg.patch;patch=1"
 
 # Per http://www.mono-project.com/Mono:ARM
 EXTRA_OECONF += " --disable-mcs-build "
-- 
cgit v1.2.3


From 7753ca545429b90d853992b6207daa4f1db9116d Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Tue, 11 Mar 2008 19:04:27 +0000
Subject: gnash: clean up/fix for sysroot

---
 packages/gnash/gnash.inc | 79 ++++++++++++------------------------------------
 1 file changed, 19 insertions(+), 60 deletions(-)

(limited to 'packages')

diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc
index 197cea06b6..113422596a 100644
--- a/packages/gnash/gnash.inc
+++ b/packages/gnash/gnash.inc
@@ -1,67 +1,29 @@
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
-
-LICENSE = "GPL-2"
 HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPL-2"
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r1"
 
-DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
-
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
+          "
 
+inherit autotools pkgconfig
 
 EXTRA_OECONF = "--enable-gui=gtk \
                 --enable-renderer=cairo \
-		--enable-media=none \
+                --enable-media=none \
                 --disable-klash \
-		--enable-z \
-		--enable-jpeg \
-		--disable-glext \
-		--enable-Xft \
-		--enable-expat \
-		--enable-mad \
-		--enable-cairo \
-		--disable-plugin \
-		--disable-cygnal \
-		--with-boost-incl=${STAGING_INCDIR} \
-		--with-boost-lib=${STAGING_LIBDIR} \
-		--with-libxml-incl=${STAGING_INCDIR}/libxml2 \
-		--with-libxml-lib=${STAGING_LIBDIR} \
-		--with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
-#		--with-glib-lib=${STAGING_LIBDIR} \
-		--with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
-		--with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
-#		--with-pango-lib=${STAGING_LIBDIR} \
-		--with-sdl-incl=${STAGING_INCDIR}/SDL \
-		--with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
-		--with-Xft-incl=${STAGING_INCDIR}/X11 \
-		--with-expat-incl=${STAGING_INCDIR} \
-		--with-mad-incl=${STAGING_INCDIR} \
-		--with-cairo-incl=${STAGING_INCDIR}/cairo \
-		--with-curl-incl=${STAGING_INCDIR} \
-		--with-curl-lib=${STAGING_LIBDIR} \
-		" 
-
-inherit autotools pkgconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} -lcurl  -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
-CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
-
-do_configure_append() {
-        for i in `find . -name Makefile` ; do
-		sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
-	done
-}
-
-
-PARALLEL_MAKE = ""
-
-do_compile() {
-        oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-                   'ZLIB_INCLUDE=${STAGING_INCDIR}' \
-                   'ZLIB_LIBS=${STAGING_LIBDIR}' \
-		   'PNG_INCLUDE=${STAGING_INCDIR}' \	
-		   'PNG_LIBS=${STAGING_LIBDIR}'
-}
-
+                --enable-z \
+                --enable-jpeg \
+                --disable-glext \
+                --enable-Xft \
+                --enable-expat \
+                --enable-mad \
+                --enable-cairo \
+                --disable-plugin \
+                --disable-cygnal \
+                --with-top-level=${STAGING_DIR_HOST}/usr \
+                "
 
 PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
 
@@ -73,7 +35,4 @@ FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
 FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
 FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
 
-do_stage() {
-        autotools_stage_all
-}
-
+PARALLEL_MAKE = ""
-- 
cgit v1.2.3


From ec185d92295b475fa4e8ce62da27f37cc4666fcb Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Wed, 12 Mar 2008 00:03:21 +0000
Subject: linux-handhelds-2.6: Use official external interface for initramfs
 addition. * I.e., CONFIG_INITRAMFS_SOURCE. Instead of neat, but still hack of
 dropping initramfs where kernel Makefile expects it - this was reported to
 not work under some unknown circumstances.

---
 packages/linux/linux-handhelds-2.6.inc            | 20 ++++++--------------
 packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'packages')

diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index a2efdc955a..5970ace054 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -37,6 +37,11 @@ do_configure() {
 		die "No default configuration for ${MACHINE} available."
 	fi
 
+	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then
+		# Kernel expects non-compressed cpio
+		gzip -d -c ${KERNEL_INITRAMFS_PATH} >${WORKDIR}/initramfs.cpio
+		echo "CONFIG_INITRAMFS_SOURCE=\"${WORKDIR}/initramfs.cpio\"" >> ${S}/.config
+	fi
 
 	if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
 		echo "CONFIG_AEABI=y"                   >> ${S}/.config
@@ -48,26 +53,13 @@ do_configure() {
 
 	sed 	-e '/CONFIG_AEABI/d' \
 		-e '/CONFIG_OABI_COMPAT=/d' \
+		-e '/CONFIG_INITRAMFS_SOURCE=/d' \
 		'${WORKDIR}/defconfig' >>'${S}/.config'
 
 	yes '' | oe_runmake oldconfig
 
 }
 
-do_compile_prepend() {
-	# Clean up any stale initramfs archive
-	rm -f usr/initramfs_data.cpio.gz
-	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then
-	    if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then
-		echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately"
-		exit 1
-	    fi
-	    cp ${KERNEL_INITRAMFS_PATH} usr/initramfs_data.cpio.gz
-	    # touch is for broken Koen's cp
-	    touch usr/initramfs_data.cpio.gz
-	fi
-}
-
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME}
diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
index 4fa2e2bd9b..9d493c3212 100644
--- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
+++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
 LICENSE = "GPL"
-PR = "r18"
+PR = "r19"
 
 DEFAULT_PREFERENCE = "-1"
 
-- 
cgit v1.2.3


From a96c6408316ec2cf2d8f5aed775654414887ff25 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 12 Mar 2008 06:15:12 +0000
Subject: gnash: add 0.8.2

---
 packages/gnash/gnash_0.8.2.bb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 packages/gnash/gnash_0.8.2.bb

(limited to 'packages')

diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb
new file mode 100644
index 0000000000..da4b281e94
--- /dev/null
+++ b/packages/gnash/gnash_0.8.2.bb
@@ -0,0 +1 @@
+require gnash.inc
-- 
cgit v1.2.3


From 1b17a73001b2a7ea133b424e670e1e72bec7c685 Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 12 Mar 2008 06:16:19 +0000
Subject: task-openmoko-feed: temporarily disable python-efl because no
 provider

---
 packages/tasks/task-openmoko-feed.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 97f24a7624..ee8cdf8e6b 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -24,7 +24,8 @@ RDEPENDS_task-openmoko-feed = "\
   nano \
   ntpclient ntp \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
-  python python-pygtk python-pyserial python-efl \
+  python python-pygtk python-pyserial \
+#  python-efl \
   ruby \
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   settingsgui \
-- 
cgit v1.2.3


From 0ec9e3f4a0a6e5200c63df418bfa6bb08dc8c093 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Mar 2008 08:11:47 +0000
Subject: espeak: upgrade to 1.35, clean up * replace tab by white space *
 replace hard coded ${datadir}

---
 packages/espeak/espeak_1.30.bb | 52 ------------------------------------------
 packages/espeak/espeak_1.35.bb | 42 ++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 52 deletions(-)
 delete mode 100644 packages/espeak/espeak_1.30.bb
 create mode 100644 packages/espeak/espeak_1.35.bb

(limited to 'packages')

diff --git a/packages/espeak/espeak_1.30.bb b/packages/espeak/espeak_1.30.bb
deleted file mode 100644
index 523acc77cb..0000000000
--- a/packages/espeak/espeak_1.30.bb
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2008
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: espeak_1.30.bb
-# Date: 20080104 (YMD)
-
-DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
-SECTION = "base"
-LICENSE = "GPL"
-
-DEPENDS = "portaudio-v19"
-
-######################################################################################
-
-PR = "r2"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
-
-S = "${WORKDIR}/${PN}-${PV}-source"
-
-FILES_${PN} += " /usr/share/espeak-data/ "
-
-do_configure() {
-	# espeak supports portaudio in APIs V18 and V19
-	cp ${S}/src/portaudio19.h ${S}/src/portaudio.h 
-}
-
-do_compile() {
-	cd src
-	oe_runmake
-}
-
-do_install() {
-        install -d ${D}${bindir}
-	install -d ${D}${libdir}
-        install -d ${D}${includedir}
-	install -d ${D}/usr/share/espeak-data
-	
-	install -m 0755 ${S}/src/espeak ${D}${bindir}
-	oe_libinstall -so -C src libespeak ${D}${libdir}
-	
-	cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data
-}
-
-do_stage() {
-	install -d ${STAGING_INCDIR}/espeak
-	install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/
-        oe_libinstall -so -C src libespeak ${STAGING_LIBDIR}
-}
diff --git a/packages/espeak/espeak_1.35.bb b/packages/espeak/espeak_1.35.bb
new file mode 100644
index 0000000000..8d7b18a890
--- /dev/null
+++ b/packages/espeak/espeak_1.35.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
+SECTION = "base"
+LICENSE = "GPL"
+DEPENDS = "portaudio-v19"
+
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
+
+S = "${WORKDIR}/${PN}-${PV}-source"
+
+FILES_${PN} += "${datadir}/espeak-data"
+
+do_configure() {
+	# "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19
+	cp ${S}/src/portaudio19.h ${S}/src/portaudio.h 
+}
+
+do_compile() {
+       cd src
+       oe_runmake
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -d ${D}${libdir}
+        install -d ${D}${includedir}
+        install -d ${D}${datadir}/espeak-data
+
+        # we do not ship "speak" binary though.
+        install -m 0755 ${S}/src/espeak ${D}${bindir}
+        install -m 0644 ${S}/src/speak_lib.h ${D}${includedir}
+        oe_libinstall -so -C src libespeak ${D}${libdir}
+
+        cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/espeak
+        install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/
+        oe_libinstall -so -C src libespeak ${STAGING_LIBDIR}
+}
-- 
cgit v1.2.3


From d274c014ee11521bfb84fb4b2b713a85189b8b9a Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Mar 2008 08:16:59 +0000
Subject: speech-dispatcher: upgrade to 0.6.6

---
 .../speech-dispatcher/speech-dispatcher_0.6.5.bb   | 57 ----------------------
 .../speech-dispatcher/speech-dispatcher_0.6.6.bb   | 57 ++++++++++++++++++++++
 2 files changed, 57 insertions(+), 57 deletions(-)
 delete mode 100644 packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
 create mode 100644 packages/speech-dispatcher/speech-dispatcher_0.6.6.bb

(limited to 'packages')

diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
deleted file mode 100644
index 7b8ba73750..0000000000
--- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "Speech Dispatcher is a high-level device independent layer \
-for speech synthesis through a simple, stable and well documented interface."
-HOMEPAGE = "http://www.freebsoft.org/speechd/"
-LICENSE = "GPLv2"
-DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0"
-RPROVIDES_${PN} += "speechd"
-
-PR = "r8"
-
-inherit autotools update-rc.d
-
-SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \
-	   file://speech-dispatcher.init \
-           file://srcMakefile.am.patch;patch=1 \
-           file://configure_fix.patch;patch=1 \
-	   file://configSpeechd.conf.in_00.patch;patch=1"
-
-LEAD_SONAME = "libspeechd.so"
-EXTRA_OECONF = " --with-espeak=yes --with-flite=yes --with-ibmtts=no --with-nas=no --with-alsa=yes --with-pulse=yes "
-
-INITSCRIPT_NAME = "speech-dispatcher"
-INITSCRIPT_PARAMS = "defaults 45"
-
-do_install() {
-        install -d ${D}${bindir}
-        install -d ${D}${includedir}
-        install -d ${D}${libdir}/${PN}-modules
-	install -d ${D}${sysconfdir}	
-	install -d ${D}${sysconfdir}/init.d
-	install -d ${D}${sysconfdir}/speech-dispatcher
-	install -d ${D}${sysconfdir}/speech-dispatcher/modules
-
-        oe_libinstall -so -C src/audio libsdaudio ${D}${libdir}
-        oe_libinstall -so -C src/c/api libspeechd ${D}${libdir}
-        
-        install -m 0644 ${S}/src/c/api/libspeechd.h    ${D}${includedir}
-        install -m 0755 ${S}/src/c/clients/say/.libs/spd-say ${D}${bindir}
-        install -m 0755 ${S}/src/server/.libs/speech-dispatcher  ${D}${bindir}
-        install -m 0755 ${S}/src/modules/.libs/sd_*   ${D}${libdir}/${PN}-modules/
-	
-	install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}/speech-dispatcher
-	install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/speech-dispatcher/modules
-	install -m 0755 ${WORKDIR}/speech-dispatcher.init ${D}${sysconfdir}/init.d/speech-dispatcher
-}
-
-do_stage() {
-        install -m 0644 ${S}/src/c/api/libspeechd.h ${STAGING_INCDIR}
-        oe_libinstall -so -C src/c/api libspeechd ${STAGING_LIBDIR}
-}
-
-PACKAGES =+ "libspeechd-dbg libspeechd libspeechd-dev"
-
-FILES_${PN} += "${libdir}/${PN}-modules/*" 
-FILES_${PN}-dbg += "${libdir}/${PN}-modules/.debug" 
-FILES_libspeechd += "${libdir}/libspeechd.so.*"
-FILES_libspeechd-dev += "${libdir}/libspeechd* ${includedir}"
-FILES_libspeechd-dbg += "${libdir}/.debug/libspeechd*"
diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
new file mode 100644
index 0000000000..302f642d67
--- /dev/null
+++ b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb
@@ -0,0 +1,57 @@
+DESCRIPTION = "Speech Dispatcher is a high-level device independent layer \
+for speech synthesis through a simple, stable and well documented interface."
+HOMEPAGE = "http://www.freebsoft.org/speechd/"
+LICENSE = "GPLv2"
+DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0"
+RPROVIDES_${PN} += "speechd"
+
+PR = "r0"
+
+inherit autotools update-rc.d
+
+SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \
+	   file://speech-dispatcher.init \
+           file://srcMakefile.am.patch;patch=1 \
+           file://configure_fix.patch;patch=1 \
+	   file://configSpeechd.conf.in_00.patch;patch=1"
+
+LEAD_SONAME = "libspeechd.so"
+EXTRA_OECONF = " --with-espeak --with-flite --without-ibmtts --without-nas --with-alsa --with-pulse "
+
+INITSCRIPT_NAME = "speech-dispatcher"
+INITSCRIPT_PARAMS = "defaults 45"
+
+do_install() {
+        install -d ${D}${bindir}
+        install -d ${D}${includedir}
+        install -d ${D}${libdir}/${PN}-modules
+	install -d ${D}${sysconfdir}	
+	install -d ${D}${sysconfdir}/init.d
+	install -d ${D}${sysconfdir}/speech-dispatcher
+	install -d ${D}${sysconfdir}/speech-dispatcher/modules
+
+        oe_libinstall -so -C src/audio libsdaudio ${D}${libdir}
+        oe_libinstall -so -C src/c/api libspeechd ${D}${libdir}
+        
+        install -m 0644 ${S}/src/c/api/libspeechd.h    ${D}${includedir}
+        install -m 0755 ${S}/src/c/clients/say/.libs/spd-say ${D}${bindir}
+        install -m 0755 ${S}/src/server/.libs/speech-dispatcher  ${D}${bindir}
+        install -m 0755 ${S}/src/modules/.libs/sd_*   ${D}${libdir}/${PN}-modules/
+	
+	install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}/speech-dispatcher
+	install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/speech-dispatcher/modules
+	install -m 0755 ${WORKDIR}/speech-dispatcher.init ${D}${sysconfdir}/init.d/speech-dispatcher
+}
+
+do_stage() {
+        install -m 0644 ${S}/src/c/api/libspeechd.h ${STAGING_INCDIR}
+        oe_libinstall -so -C src/c/api libspeechd ${STAGING_LIBDIR}
+}
+
+PACKAGES =+ "libspeechd-dbg libspeechd libspeechd-dev"
+
+FILES_${PN} += "${libdir}/${PN}-modules/*" 
+FILES_${PN}-dbg += "${libdir}/${PN}-modules/.debug" 
+FILES_libspeechd += "${libdir}/libspeechd.so.*"
+FILES_libspeechd-dev += "${libdir}/libspeechd* ${includedir}"
+FILES_libspeechd-dbg += "${libdir}/.debug/libspeechd*"
-- 
cgit v1.2.3


From 093d01d708c2f09213f1667ca45cd165c282e435 Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 12 Mar 2008 10:35:31 +0000
Subject: directfb: Remove potential dangerous sed invocation. Add a -I in
 front and replace it with nothing     It is still compiling and packaging.

---
 packages/directfb/++dfb_1.0.0.bb             | 2 +-
 packages/directfb/directfb-examples_1.0.0.bb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

diff --git a/packages/directfb/++dfb_1.0.0.bb b/packages/directfb/++dfb_1.0.0.bb
index f440e117ff..020cbfe3eb 100644
--- a/packages/directfb/++dfb_1.0.0.bb
+++ b/packages/directfb/++dfb_1.0.0.bb
@@ -11,7 +11,7 @@ RV = "0.9-25"
 inherit autotools pkgconfig
 
 do_configure_append() {
-    find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+    find ${S} -type f | xargs sed -i 's:-I/usr/include::g'
 }
 
 do_stage() {
diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb
index 064a808273..e59e4ecf2e 100644
--- a/packages/directfb/directfb-examples_1.0.0.bb
+++ b/packages/directfb/directfb-examples_1.0.0.bb
@@ -11,8 +11,8 @@ S = "${WORKDIR}/DirectFB-examples-${PV}"
 inherit autotools
 
 do_configure_append() {
-#    find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:'
-    find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
+#    find ${S} -type f | xargs sed -i 's:-L/usr/lib::g'
+    find ${S} -type f | xargs sed -i 's:-I/usr/include::g'
 }
 
 do_stage() {
-- 
cgit v1.2.3


From 72bbade2b07c4701d0b35f0b3a21d81201302c1c Mon Sep 17 00:00:00 2001
From: Holger Freyther <zecke@selfish.org>
Date: Wed, 12 Mar 2008 12:32:45 +0000
Subject: directfb: This magic is not needed for directfb     It compiles and
 the packages look fine

---
 packages/directfb/++dfb_1.0.0.bb             | 4 ----
 packages/directfb/directfb-examples_1.0.0.bb | 5 -----
 2 files changed, 9 deletions(-)

(limited to 'packages')

diff --git a/packages/directfb/++dfb_1.0.0.bb b/packages/directfb/++dfb_1.0.0.bb
index 020cbfe3eb..7c4aea3920 100644
--- a/packages/directfb/++dfb_1.0.0.bb
+++ b/packages/directfb/++dfb_1.0.0.bb
@@ -10,10 +10,6 @@ RV = "0.9-25"
 
 inherit autotools pkgconfig
 
-do_configure_append() {
-    find ${S} -type f | xargs sed -i 's:-I/usr/include::g'
-}
-
 do_stage() {
 	autotools_stage_all
 }
diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb
index e59e4ecf2e..7fd3f38848 100644
--- a/packages/directfb/directfb-examples_1.0.0.bb
+++ b/packages/directfb/directfb-examples_1.0.0.bb
@@ -10,11 +10,6 @@ S = "${WORKDIR}/DirectFB-examples-${PV}"
 
 inherit autotools
 
-do_configure_append() {
-#    find ${S} -type f | xargs sed -i 's:-L/usr/lib::g'
-    find ${S} -type f | xargs sed -i 's:-I/usr/include::g'
-}
-
 do_stage() {
 	autotools_stage_all
 }
-- 
cgit v1.2.3


From 33b304d6d8413e7c1993aae8aef509a58dd59036 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 12 Mar 2008 13:02:18 +0000
Subject: gsm0710muxd svn add proper RDEPENDS

---
 packages/freesmartphone/gsm0710muxd_svn.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'packages')

diff --git a/packages/freesmartphone/gsm0710muxd_svn.bb b/packages/freesmartphone/gsm0710muxd_svn.bb
index 60ea915933..c909c401b7 100644
--- a/packages/freesmartphone/gsm0710muxd_svn.bb
+++ b/packages/freesmartphone/gsm0710muxd_svn.bb
@@ -3,11 +3,12 @@ HOMEPAGE = "http://www.freesmartphone.org"
 AUTHOR = "M. Dietrich"
 SECTION = "console/network"
 DEPENDS = "intltool-native dbus dbus-glib"
+RDEPENDS = "dbus dbus-glib"
 RCONFLICTS = "gsmd"
 RREPLACES = "gsmd"
 LICENSE = "GPL"
 PV = "0.0+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
 S = "${WORKDIR}/gsm0710muxd"
-- 
cgit v1.2.3


From 61835c2897efc6eb52f588ac9a351ec37e82d75a Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Mar 2008 15:59:36 +0000
Subject: gtk+.inc: QA, add LEAD_SONAME

---
 packages/gtk+/gtk+.inc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'packages')

diff --git a/packages/gtk+/gtk+.inc b/packages/gtk+/gtk+.inc
index 1a8236aa34..23a8b9bc70 100644
--- a/packages/gtk+/gtk+.inc
+++ b/packages/gtk+/gtk+.inc
@@ -8,6 +8,8 @@ DEPENDS = "glib-2.0 tiff pango atk jpeg libpng libxext libxcursor gtk-doc libgcr
 
 inherit autotools pkgconfig
 
+LEAD_SONAME = "libgtk-x11-2.0.so"
+
 FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${bindir}/gtk-update-icon-cache \
 	${bindir}/gtk-query-immodules-2.0 \
-- 
cgit v1.2.3


From f336f885a5f0de0a94ff57f5136741ca319efe8c Mon Sep 17 00:00:00 2001
From: Leon Woestenberg <leon.woestenberg@gmail.com>
Date: Wed, 12 Mar 2008 18:37:15 +0000
Subject: smartmontools: 5.38 release.

---
 packages/smartmontools/smartmontools_5.38.bb | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 packages/smartmontools/smartmontools_5.38.bb

(limited to 'packages')

diff --git a/packages/smartmontools/smartmontools_5.38.bb b/packages/smartmontools/smartmontools_5.38.bb
new file mode 100644
index 0000000000..ec9a10d4c5
--- /dev/null
+++ b/packages/smartmontools/smartmontools_5.38.bb
@@ -0,0 +1 @@
+include smartmontools.inc
-- 
cgit v1.2.3


From cec1b020d3e88d90cd1aa209f69d28a0e322eb93 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Wed, 12 Mar 2008 18:43:36 +0000
Subject: opie-image-(16mb): replace MACHINE_TASK_PROVIDER with
 task_boot/task_base   courtesy of Henry von Tresckow <hvontres@gmail.com> *
 oebug# 3969 * add task-base-extended for devices without built in wifi *
 remove borken merge feeds

---
 packages/images/opie-image-16mb.bb | 4 ++--
 packages/images/opie-image.bb      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'packages')

diff --git a/packages/images/opie-image-16mb.bb b/packages/images/opie-image-16mb.bb
index 42bf611880..3abab2e726 100644
--- a/packages/images/opie-image-16mb.bb
+++ b/packages/images/opie-image-16mb.bb
@@ -1,6 +1,6 @@
 IMAGE_LINGUAS = ""
 
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie-16mb"
+DEPENDS = "task-boot task-opie-16mb"
 
 IMAGE_INSTALL = "task-boot \
                     ipkg ipkg-collateral \
@@ -14,6 +14,6 @@ IMAGE_INSTALL = "task-boot \
 		    task-opie-irda"
 
 # create /etc/timestamp from build date
-IMAGE_PREPROCESS_COMMAND = "merge_feeds; create_etc_timestamp"
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 inherit image
diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb
index 04c1f260e8..54e38c498f 100644
--- a/packages/images/opie-image.bb
+++ b/packages/images/opie-image.bb
@@ -1,8 +1,8 @@
 IMAGE_LINGUAS = ""
 
-DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie"
+DEPENDS = "task-base task-opie"
 
-IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \
+IMAGE_INSTALL = "task-base-extended task-opie-base task-opie-base-applets \
 		    task-opie-base-inputmethods task-opie-base-apps \
 		    task-opie-base-settings task-opie-base-decorations \
 		    task-opie-base-styles task-opie-base-pim \
-- 
cgit v1.2.3


From 68d7f83ef48ba4c6429b768860140676cacca0d0 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <dp@xora.org.uk>
Date: Wed, 12 Mar 2008 22:26:20 +0000
Subject: alsa/alsa-state/fic-gta01/* : update gta01 states

---
 packages/alsa/alsa-state/fic-gta01/asound.state    | 96 ++++++++++++----------
 .../alsa/alsa-state/fic-gta01/capturehandset.state | 96 ++++++++++++----------
 .../alsa/alsa-state/fic-gta01/captureheadset.state | 96 ++++++++++++----------
 .../alsa/alsa-state/fic-gta01/gsmbluetooth.state   | 86 +++++++++----------
 .../alsa/alsa-state/fic-gta01/gsmhandset.state     | 96 ++++++++++++----------
 .../alsa/alsa-state/fic-gta01/gsmheadset.state     | 96 ++++++++++++----------
 .../alsa/alsa-state/fic-gta01/gsmspeakerout.state  | 96 ++++++++++++----------
 packages/alsa/alsa-state/fic-gta01/stereoout.state | 96 ++++++++++++----------
 .../alsa/alsa-state/fic-gta01/voip-handset.state   | 96 ++++++++++++----------
 .../alsa/alsa-state/fic-gta01/voip-headset.state   | 96 ++++++++++++----------
 10 files changed, 520 insertions(+), 430 deletions(-)

(limited to 'packages')

diff --git a/packages/alsa/alsa-state/fic-gta01/asound.state b/packages/alsa/alsa-state/fic-gta01/asound.state
index 42ff0ed7ad..26db3cf311 100644
--- a/packages/alsa/alsa-state/fic-gta01/asound.state
+++ b/packages/alsa/alsa-state/fic-gta01/asound.state
@@ -491,7 +491,17 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value Stereo
 	}
-	control.52 {
+        control.52 {
+                comment.access 'read write'
+                comment.type ENUMERATED
+                comment.count 1
+                comment.item.0 'Non Inverted'
+                comment.item.1 Inverted
+                iface MIXER
+                name 'ROUT2 Phase'
+                value Inverted
+        }
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Line Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Line 2'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Line 1'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Left PGA'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value Stereo
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value Stereo
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value true
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value false
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value true
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value false
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 22
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 22
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 0
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value 'Stereo Speakers + Headphones'
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value Headphones
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value false
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
diff --git a/packages/alsa/alsa-state/fic-gta01/capturehandset.state b/packages/alsa/alsa-state/fic-gta01/capturehandset.state
index 4a55f09035..54bf01e945 100644
--- a/packages/alsa/alsa-state/fic-gta01/capturehandset.state
+++ b/packages/alsa/alsa-state/fic-gta01/capturehandset.state
@@ -491,7 +491,17 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value Stereo
 	}
-	control.52 {
+        control.52 {
+                comment.access 'read write'
+                comment.type ENUMERATED
+                comment.count 1
+                comment.item.0 'Non Inverted'
+                comment.item.1 Inverted
+                iface MIXER
+                name 'ROUT2 Phase'
+                value Inverted
+        }
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Line Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Line 2'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Line 1'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value true
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Left PGA'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value false
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value false
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value false
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value false
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 0
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 0
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 0
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value Off
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value 'Capture Handset'
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value false
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
diff --git a/packages/alsa/alsa-state/fic-gta01/captureheadset.state b/packages/alsa/alsa-state/fic-gta01/captureheadset.state
index 3a27323b25..2a174d80ab 100644
--- a/packages/alsa/alsa-state/fic-gta01/captureheadset.state
+++ b/packages/alsa/alsa-state/fic-gta01/captureheadset.state
@@ -491,7 +491,17 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value Stereo
 	}
-	control.52 {
+        control.52 {
+                comment.access 'read write'
+                comment.type ENUMERATED
+                comment.count 1
+                comment.item.0 'Non Inverted'
+                comment.item.1 Inverted
+                iface MIXER
+                name 'ROUT2 Phase'
+                value Inverted
+        }
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Line Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Line 2'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Line 1'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value true
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Left PGA'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value false
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value false
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value false
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value false
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 0
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 0
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 0
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value Off
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value 'Capture Headset'
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value false
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
diff --git a/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
index a0c0c95ea6..8569474a0e 100644
--- a/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
@@ -491,7 +491,7 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value Stereo
 	}
-	control.52 {
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +502,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +514,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +526,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +536,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Line Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +546,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Line 2'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +556,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Line 1'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +564,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +572,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +580,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +588,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value true
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +600,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Left PGA'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +611,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +622,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +634,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +646,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +654,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +662,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +670,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +681,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +692,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +704,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +712,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +720,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +728,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value true
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +736,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +744,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +752,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +760,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +768,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value false
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +776,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value false
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +784,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +792,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +800,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value false
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +808,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value false
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +817,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 0
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +826,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 0
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +835,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 0
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +848,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value Off
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +865,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value 'GSM Bluetooth'
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +873,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value false
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +881,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +889,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
diff --git a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state
index f7fb55ccd1..999f71253c 100644
--- a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state
@@ -491,7 +491,17 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value Stereo
 	}
-	control.52 {
+        control.52 {
+                comment.access 'read write'
+                comment.type ENUMERATED
+                comment.count 1
+                comment.item.0 'Non Inverted'
+                comment.item.1 Inverted
+                iface MIXER
+                name 'ROUT2 Phase'
+                value Inverted
+        }
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Line Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Rx Mix'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Rx Mix'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Mic 2'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value Stereo
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value Stereo
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value true
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value false
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value true
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value false
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value true
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 26
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 0
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 9
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value 'Call Speaker'
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value 'GSM Handset'
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value false
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
diff --git a/packages/alsa/alsa-state/fic-gta01/gsmheadset.state b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state
index e732b77db8..e81bfc8306 100644
--- a/packages/alsa/alsa-state/fic-gta01/gsmheadset.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state
@@ -491,7 +491,17 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value Stereo
 	}
-	control.52 {
+        control.52 {
+                comment.access 'read write'
+                comment.type ENUMERATED
+                comment.count 1
+                comment.item.0 'Non Inverted'
+                comment.item.1 Inverted
+                iface MIXER
+                name 'ROUT2 Phase'
+                value Inverted
+        }
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Line Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Rx Mix'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Rx Mix'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value true
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Mic 1'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value Stereo
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value Stereo
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value true
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value false
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value true
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value false
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value true
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 30
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 15
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 0
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value Headphones
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value 'GSM Headset'
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value false
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
diff --git a/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state b/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
index 950f7e1379..5e3ed93179 100644
--- a/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
+++ b/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
@@ -491,7 +491,17 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value Stereo
 	}
-	control.52 {
+        control.52 {
+                comment.access 'read write'
+                comment.type ENUMERATED
+                comment.count 1
+                comment.item.0 'Non Inverted'
+                comment.item.1 Inverted
+                iface MIXER
+                name 'ROUT2 Phase'
+                value Inverted
+        }
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Line Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Rx Mix'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Rx Mix'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Mic 1'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value Stereo
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value Stereo
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value true
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value false
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value true
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value false
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value true
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 31
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 31
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 9
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value 'Stereo Speakers'
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value 'GSM Handset'
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value false
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
diff --git a/packages/alsa/alsa-state/fic-gta01/stereoout.state b/packages/alsa/alsa-state/fic-gta01/stereoout.state
index 42ff0ed7ad..26db3cf311 100644
--- a/packages/alsa/alsa-state/fic-gta01/stereoout.state
+++ b/packages/alsa/alsa-state/fic-gta01/stereoout.state
@@ -491,7 +491,17 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value Stereo
 	}
-	control.52 {
+        control.52 {
+                comment.access 'read write'
+                comment.type ENUMERATED
+                comment.count 1
+                comment.item.0 'Non Inverted'
+                comment.item.1 Inverted
+                iface MIXER
+                name 'ROUT2 Phase'
+                value Inverted
+        }
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Line Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Line 2'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Line 1'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Left PGA'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value Stereo
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value Stereo
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value true
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value false
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value true
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value false
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 22
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 22
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 0
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value 'Stereo Speakers + Headphones'
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value Headphones
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value false
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
diff --git a/packages/alsa/alsa-state/fic-gta01/voip-handset.state b/packages/alsa/alsa-state/fic-gta01/voip-handset.state
index e4892afc5b..420a4eb79d 100644
--- a/packages/alsa/alsa-state/fic-gta01/voip-handset.state
+++ b/packages/alsa/alsa-state/fic-gta01/voip-handset.state
@@ -491,7 +491,17 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value 'Channel Swap'
 	}
-	control.52 {
+        control.52 {
+                comment.access 'read write'
+                comment.type ENUMERATED
+                comment.count 1
+                comment.item.0 'Non Inverted'
+                comment.item.1 Inverted
+                iface MIXER
+                name 'ROUT2 Phase'
+                value Inverted
+        }
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 2'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Rx Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Rx Mix'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Line 1'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value true
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value false
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Mic 1'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value true
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value false
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value true
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value false
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 16
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 29
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 18
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value 'Call Speaker'
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value 'GSM Handset'
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value true
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
diff --git a/packages/alsa/alsa-state/fic-gta01/voip-headset.state b/packages/alsa/alsa-state/fic-gta01/voip-headset.state
index cccaa99c9a..df22f5b7d5 100644
--- a/packages/alsa/alsa-state/fic-gta01/voip-headset.state
+++ b/packages/alsa/alsa-state/fic-gta01/voip-headset.state
@@ -491,7 +491,17 @@ state.neo1973 {
 		name 'ADC Data Select'
 		value 'Channel Swap'
 	}
-	control.52 {
+        control.52 {
+                comment.access 'read write'
+                comment.type ENUMERATED
+                comment.count 1
+                comment.item.0 'Non Inverted'
+                comment.item.1 Inverted
+                iface MIXER
+                name 'ROUT2 Phase'
+                value Inverted
+        }
+	control.53 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -502,7 +512,7 @@ state.neo1973 {
 		name 'Mic Selection Mux'
 		value 'Mic 1'
 	}
-	control.53 {
+	control.54 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -514,7 +524,7 @@ state.neo1973 {
 		name 'Rx Mixer'
 		value 'RXP - RXN'
 	}
-	control.54 {
+	control.55 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -526,7 +536,7 @@ state.neo1973 {
 		name 'Line Mixer'
 		value 'Line 1 + 2'
 	}
-	control.55 {
+	control.56 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -536,7 +546,7 @@ state.neo1973 {
 		name 'Line Mono Mux'
 		value 'Rx Mix'
 	}
-	control.56 {
+	control.57 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -546,7 +556,7 @@ state.neo1973 {
 		name 'Line Right Mux'
 		value 'Rx Mix'
 	}
-	control.57 {
+	control.58 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -556,7 +566,7 @@ state.neo1973 {
 		name 'Line Left Mux'
 		value 'Line 1'
 	}
-	control.58 {
+	control.59 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -564,7 +574,7 @@ state.neo1973 {
 		name 'ALC Mixer Line Capture Switch'
 		value false
 	}
-	control.59 {
+	control.60 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -572,7 +582,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic2 Capture Switch'
 		value false
 	}
-	control.60 {
+	control.61 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -580,7 +590,7 @@ state.neo1973 {
 		name 'ALC Mixer Mic1 Capture Switch'
 		value true
 	}
-	control.61 {
+	control.62 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -588,7 +598,7 @@ state.neo1973 {
 		name 'ALC Mixer Rx Capture Switch'
 		value false
 	}
-	control.62 {
+	control.63 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -600,7 +610,7 @@ state.neo1973 {
 		name 'Mic Sidetone Mux'
 		value 'Mic 1'
 	}
-	control.63 {
+	control.64 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -611,7 +621,7 @@ state.neo1973 {
 		name 'Capture Right Mux'
 		value PGA
 	}
-	control.64 {
+	control.65 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -622,7 +632,7 @@ state.neo1973 {
 		name 'Capture Left Mux'
 		value PGA
 	}
-	control.65 {
+	control.66 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -634,7 +644,7 @@ state.neo1973 {
 		name 'Capture Right Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.66 {
+	control.67 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -646,7 +656,7 @@ state.neo1973 {
 		name 'Capture Left Mixer'
 		value 'Analogue Mix Left'
 	}
-	control.67 {
+	control.68 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -654,7 +664,7 @@ state.neo1973 {
 		name 'Playback Mixer Voice Capture Sw'
 		value false
 	}
-	control.68 {
+	control.69 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -662,7 +672,7 @@ state.neo1973 {
 		name 'Playback Mixer Left Capture Swi'
 		value false
 	}
-	control.69 {
+	control.70 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -670,7 +680,7 @@ state.neo1973 {
 		name 'Playback Mixer Right Capture Sw'
 		value false
 	}
-	control.70 {
+	control.71 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -681,7 +691,7 @@ state.neo1973 {
 		name 'Out4 Mux'
 		value VREF
 	}
-	control.71 {
+	control.72 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -692,7 +702,7 @@ state.neo1973 {
 		name 'Out3 Mux'
 		value VREF
 	}
-	control.72 {
+	control.73 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -704,7 +714,7 @@ state.neo1973 {
 		name 'Mono 2 Mux'
 		value 'Inverted Mono 1'
 	}
-	control.73 {
+	control.74 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -712,7 +722,7 @@ state.neo1973 {
 		name 'Mono Mixer Left Playback Switch'
 		value false
 	}
-	control.74 {
+	control.75 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -720,7 +730,7 @@ state.neo1973 {
 		name 'Mono Mixer Right Playback Switc'
 		value false
 	}
-	control.75 {
+	control.76 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -728,7 +738,7 @@ state.neo1973 {
 		name 'Mono Mixer Voice Playback Switc'
 		value false
 	}
-	control.76 {
+	control.77 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -736,7 +746,7 @@ state.neo1973 {
 		name 'Mono Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.77 {
+	control.78 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -744,7 +754,7 @@ state.neo1973 {
 		name 'Mono Mixer Bypass Playback Swit'
 		value false
 	}
-	control.78 {
+	control.79 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -752,7 +762,7 @@ state.neo1973 {
 		name 'Right Mixer Voice Playback Swit'
 		value false
 	}
-	control.79 {
+	control.80 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -760,7 +770,7 @@ state.neo1973 {
 		name 'Right Mixer Sidetone Playback S'
 		value false
 	}
-	control.80 {
+	control.81 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -768,7 +778,7 @@ state.neo1973 {
 		name 'Right Mixer Right Playback Swit'
 		value true
 	}
-	control.81 {
+	control.82 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -776,7 +786,7 @@ state.neo1973 {
 		name 'Right Mixer Bypass Playback Swi'
 		value false
 	}
-	control.82 {
+	control.83 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -784,7 +794,7 @@ state.neo1973 {
 		name 'Left Mixer Voice Playback Switc'
 		value false
 	}
-	control.83 {
+	control.84 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -792,7 +802,7 @@ state.neo1973 {
 		name 'Left Mixer Sidetone Playback Sw'
 		value false
 	}
-	control.84 {
+	control.85 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -800,7 +810,7 @@ state.neo1973 {
 		name 'Left Mixer Left Playback Switch'
 		value true
 	}
-	control.85 {
+	control.86 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -808,7 +818,7 @@ state.neo1973 {
 		name 'Left Mixer Bypass Playback Swit'
 		value false
 	}
-	control.86 {
+	control.87 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -817,7 +827,7 @@ state.neo1973 {
 		name 'Amp Left Playback Volume'
 		value 16
 	}
-	control.87 {
+	control.88 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -826,7 +836,7 @@ state.neo1973 {
 		name 'Amp Right Playback Volume'
 		value 29
 	}
-	control.88 {
+	control.89 {
 		comment.access 'read write'
 		comment.type INTEGER
 		comment.count 1
@@ -835,7 +845,7 @@ state.neo1973 {
 		name 'Amp Mono Playback Volume'
 		value 18
 	}
-	control.89 {
+	control.90 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -848,7 +858,7 @@ state.neo1973 {
 		name 'Amp Mode'
 		value Headphones
 	}
-	control.90 {
+	control.91 {
 		comment.access 'read write'
 		comment.type ENUMERATED
 		comment.count 1
@@ -865,7 +875,7 @@ state.neo1973 {
 		name 'Neo Mode'
 		value 'GSM Headset'
 	}
-	control.91 {
+	control.92 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -873,7 +883,7 @@ state.neo1973 {
 		name 'Amp Spk 3D Playback Switch'
 		value true
 	}
-	control.92 {
+	control.93 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -881,7 +891,7 @@ state.neo1973 {
 		name 'Amp HP 3d Playback Switch'
 		value false
 	}
-	control.93 {
+	control.94 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
@@ -889,7 +899,7 @@ state.neo1973 {
 		name 'Amp Fast Wakeup Playback Switch'
 		value false
 	}
-	control.94 {
+	control.95 {
 		comment.access 'read write'
 		comment.type BOOLEAN
 		comment.count 1
-- 
cgit v1.2.3


From 5185c76a4d82f26a6781917d5c42394b229dc89e Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 13 Mar 2008 02:36:58 +0000
Subject: espeak: add support for big-endian phon* files  courtesy of treitmayr

---
 packages/espeak/espeak-data_1.35.bb | 30 ++++++++++++++++++++++++++++++
 packages/espeak/espeak.inc          |  7 +++++++
 packages/espeak/espeak_1.35.bb      | 21 ++++++++++++---------
 3 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 packages/espeak/espeak-data_1.35.bb
 create mode 100644 packages/espeak/espeak.inc

(limited to 'packages')

diff --git a/packages/espeak/espeak-data_1.35.bb b/packages/espeak/espeak-data_1.35.bb
new file mode 100644
index 0000000000..4dc9aa9882
--- /dev/null
+++ b/packages/espeak/espeak-data_1.35.bb
@@ -0,0 +1,30 @@
+require espeak.inc
+
+PR = "r0"
+
+inherit native
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${layout_datadir}"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+TARGET_ARCH = "${MACHINE_ARCH}"
+
+do_compile() {
+        # Fixing byte order of phoneme data files
+        cd "${S}/platforms/big_endian"
+        sed -i '/^ *CC *=/d' Makefile
+        sed -i 's/\(.*BYTE_ORDER\)/#undef BYTE_ORDER\n#define BYTE_ORDER BIG_ENDIAN\n\1/' espeak-phoneme-data.c
+        oe_runmake
+        ./espeak-phoneme-data "${S}/espeak-data"
+        cp -f phondata phonindex phontab "${S}/espeak-data"
+}
+
+do_install() {
+        install -d ${D}${layout_datadir}/espeak-data
+        install -m 0644 ${S}/espeak-data/phon* ${D}${layout_datadir}/espeak-data
+}
+
+do_stage() {
+        :
+}
diff --git a/packages/espeak/espeak.inc b/packages/espeak/espeak.inc
new file mode 100644
index 0000000000..c0502b6ca3
--- /dev/null
+++ b/packages/espeak/espeak.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
+SECTION = "base"
+LICENSE = "GPL"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
+
+S = "${WORKDIR}/espeak-${PV}-source"
diff --git a/packages/espeak/espeak_1.35.bb b/packages/espeak/espeak_1.35.bb
index 8d7b18a890..f7dacf54bc 100644
--- a/packages/espeak/espeak_1.35.bb
+++ b/packages/espeak/espeak_1.35.bb
@@ -1,19 +1,17 @@
-DESCRIPTION = "eSpeak is a compact open source software speech synthesizer"
-SECTION = "base"
-LICENSE = "GPL"
-DEPENDS = "portaudio-v19"
+require espeak.inc
 
-PR = "r0"
+EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANESS", "be",  "espeak-data (= ${PV})", "", d)}'
+RDEPENDS = "portaudio-v19 ${EXTRA_PHONEMES}"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip"
+PR = "r1"
 
-S = "${WORKDIR}/${PN}-${PV}-source"
+CXXFLAGS += "-DUSE_PORTAUDIO"
 
 FILES_${PN} += "${datadir}/espeak-data"
 
 do_configure() {
-	# "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19
-	cp ${S}/src/portaudio19.h ${S}/src/portaudio.h 
+       #  "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19, use V19
+       cp "${S}/src/portaudio19.h" "${S}/src/portaudio.h"
 }
 
 do_compile() {
@@ -32,6 +30,11 @@ do_install() {
         install -m 0644 ${S}/src/speak_lib.h ${D}${includedir}
         oe_libinstall -so -C src libespeak ${D}${libdir}
 
+	if [ "${SITEINFO_ENDIANESS}" = "be" ] ; then
+		# the big-endian phon* files are provided by the package espeak-data
+		rm -f ${S}/espeak-data/phon*
+	fi
+
         cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data
 }
 
-- 
cgit v1.2.3


From 2b588379b62a2b5386c23da3ccb8f04d68313f38 Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 13 Mar 2008 03:19:46 +0000
Subject: cellwriter_1.3.3: add new recipe

---
 packages/cellwriter/.mtn2git_empty      |  0
 packages/cellwriter/cellwriter_1.3.3.bb | 13 +++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 packages/cellwriter/.mtn2git_empty
 create mode 100644 packages/cellwriter/cellwriter_1.3.3.bb

(limited to 'packages')

diff --git a/packages/cellwriter/.mtn2git_empty b/packages/cellwriter/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/cellwriter/cellwriter_1.3.3.bb b/packages/cellwriter/cellwriter_1.3.3.bb
new file mode 100644
index 0000000000..12ec70a48f
--- /dev/null
+++ b/packages/cellwriter/cellwriter_1.3.3.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "A grid-entry natural handwriting input panel"
+SECTION = "x11/input"
+AUTHOR = "Michael Levin"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libxtst"
+
+SRC_URI = "http://pub.risujin.org/cellwriter/${PN}-${PV}.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-gnome"
+
+FILES_${PN} += "${datadir}/icons"
-- 
cgit v1.2.3


From 54ff4e3c9cf1941a359498e8d9413d8e68761c0c Mon Sep 17 00:00:00 2001
From: Junqian Gordon Xu <xjqian@gmail.com>
Date: Thu, 13 Mar 2008 03:23:54 +0000
Subject: gpsdrive: fix pre4 dependency issues, clean up all versions, unify *
 bump pre4 to be the default version * TODO: pre4: remove mysql dependency and
 better packaging

---
 packages/gpsdrive/files/gpsdrive.desktop           |  8 +++---
 .../gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop    |  7 ++---
 packages/gpsdrive/gpsdrive-pda_2.10pre2.bb         | 23 ++++++----------
 packages/gpsdrive/gpsdrive.inc                     | 25 +++++++++++++++++
 packages/gpsdrive/gpsdrive_2.10pre2.bb             | 25 ++---------------
 packages/gpsdrive/gpsdrive_2.10pre3.bb             | 29 --------------------
 packages/gpsdrive/gpsdrive_2.10pre4.bb             | 21 ++++----------
 packages/gpsdrive/gpsdrive_cvs.bb                  | 32 ----------------------
 8 files changed, 49 insertions(+), 121 deletions(-)
 create mode 100644 packages/gpsdrive/gpsdrive.inc
 delete mode 100644 packages/gpsdrive/gpsdrive_2.10pre3.bb
 delete mode 100644 packages/gpsdrive/gpsdrive_cvs.bb

(limited to 'packages')

diff --git a/packages/gpsdrive/files/gpsdrive.desktop b/packages/gpsdrive/files/gpsdrive.desktop
index 32050e27ba..13d0b4fcce 100644
--- a/packages/gpsdrive/files/gpsdrive.desktop
+++ b/packages/gpsdrive/files/gpsdrive.desktop
@@ -2,8 +2,8 @@
 Name=GPSDrive
 Comment=GPS map software
 Exec=gpsdrive -p -1
-Terminal=0
+Terminal=false
 Type=Application
-Icon=gpsicon.png
-Categories=Application;Other
-StartupNotify=False
+Icon=gpsicon
+Categories=Graphics;Network;Geography;
+StartupNotify=false
diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
index 96e8155861..70af29dcad 100644
--- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
+++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
@@ -1,10 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=GPSDrive
 Comment=GPS map software
 Exec=gpsdrive -M pda -1
-Icon=gpsicon
 Terminal=false
 Type=Application
-Categories=Graphics;Network;Geography;Application;Other
-StartupNotify=true
+Icon=gpsicon
+Categories=Graphics;Network;Geography;
+StartupNotify=false
diff --git a/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb b/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
index 6350053768..e79240e392 100644
--- a/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
+++ b/packages/gpsdrive/gpsdrive-pda_2.10pre2.bb
@@ -1,34 +1,29 @@
-inherit autotools pkgconfig
+require gpsdrive.inc
+
+PR = "r2"
 
-PR = "r1"
 DESCRIPTION = "GPS navigation/map display software, PDA-optimized version"
 HOMEPAGE = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-inherit pkgconfig
 
 SRC_URI = "http://www.gedanken.demon.co.uk/gpsdrive-ipaq/gpsdrive-2.10pre2-ipaq-r4.tar.gz \
+           file://gpsdrive.desktop \
 	   file://makefile.patch;patch=1 "
 
 S = "${WORKDIR}/gpsdrive-2.10pre2-ipaq"
 
-FILES_${PN} = "${bindir}/gpsdrive ${datadir}/gpsdrive ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += "${datadir}/${PN}"
-
-do_compile () {
+do_compile() {
 	oe_runmake "CC=${CC}" "LD=${CC}" "STRIP=${STRIP}" all
 }
 
-do_install () {
+do_install() {
 	mkdir -p ${D}${datadir}
         cp -a ipkg-data/usr/share/*  ${D}${datadir}/
         cp -a README.iPAQ.txt ${D}${datadir}/gpsdrive
         cp -a COPYING  ${D}${datadir}/gpsdrive
         cp -a original-docs  ${D}${datadir}/gpsdrive
+
 	mkdir -p ${D}${bindir}
         install -m 0755 gpsdrive ${D}${bindir}/
 }
+
+FILES_${PN} += "${datadir}/gpsdrive"
diff --git a/packages/gpsdrive/gpsdrive.inc b/packages/gpsdrive/gpsdrive.inc
new file mode 100644
index 0000000000..562990d278
--- /dev/null
+++ b/packages/gpsdrive/gpsdrive.inc
@@ -0,0 +1,25 @@
+DESCRIPTION = "GPS navigation/map display software"
+HOMEPAGE = "http://www.gpsdrive.de/"
+AUTHOR = ""Fritz Ganter gpsdrive@warbase.selwerd.nl"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "virtual/libc gtk+ libpcre gpsd"
+RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd" 
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-garmin"
+
+CFLAGS += "-D_GNU_SOURCE"
+
+do_install_append() {
+        mkdir -p  ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/*.desktop ${D}${datadir}/applications/gpsdrive.desktop
+
+        # gpsd is provided by RDEPENDS
+        if test -e ${D}${bindir}/gpsd
+        then
+                rm ${D}${bindir}/gpsd
+        fi
+}
diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb
index f44c5925d2..4d6abf9a85 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre2.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb
@@ -1,27 +1,6 @@
-inherit autotools pkgconfig
+require gpsdrive.inc
 
-PR = "r1"
-PACKAGES += "gpsdrive-add"
-DESCRIPTION = "GPS navigation/map display software"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
+PR = "r2"
 
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive.desktop"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += "${datadir}/${PN}"
-
-FILES_gpsdrive-add = "${libdir}"
-
-EXTRA_OECONF = "--disable-garmin"
-
-do_install_append () {
-        mkdir -p  ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop
-}
diff --git a/packages/gpsdrive/gpsdrive_2.10pre3.bb b/packages/gpsdrive/gpsdrive_2.10pre3.bb
deleted file mode 100644
index 6a97344260..0000000000
--- a/packages/gpsdrive/gpsdrive_2.10pre3.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-inherit autotools pkgconfig
-
-PR = "r1"
-DEFAULT_PREFERENCE="-1"
-
-PACKAGES += "gpsdrive-add"
-DESCRIPTION = "GPS navigation/map display software"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
-           file://gpsdrive.desktop"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += "${datadir}/${PN}"
-
-FILES_gpsdrive-add = "${libdir}"
-
-EXTRA_OECONF = "--disable-garmin"
-
-do_install_append () {
-        mkdir -p  ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop
-}
diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb
index 071a5691e3..102a917c1f 100644
--- a/packages/gpsdrive/gpsdrive_2.10pre4.bb
+++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb
@@ -1,10 +1,9 @@
-DESCRIPTION = "GPS navigation/map display software"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
-DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl"
-PR = "r1"
+require gpsdrive.inc
+
+DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql"
+RDEPENDS_${PN} += "libwww-perl"
+
+PR = "r2"
 
 SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive_2.10pre4.desktop \
@@ -12,10 +11,6 @@ SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \
            file://gpsdrive-ifdef-mapnik.patch;patch=1 \
            file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1"
 
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-garmin"
-
 do_install_append () {
         mkdir -p  ${D}${datadir}/applications
         install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop
@@ -36,7 +31,3 @@ FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small"
 FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
 FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
 FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
-
-CFLAGS += "-D_GNU_SOURCE"
-
-DEFAULT_PREFERENCE = "1"
diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb
deleted file mode 100644
index 6cb78065ea..0000000000
--- a/packages/gpsdrive/gpsdrive_cvs.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-inherit autotools pkgconfig
-
-PR = "r1"
-#Remove the dash below when 2.10pre3 changes in PV
-PV = "2.10pre3+cvs-${SRCDATE}"
-DEFAULT_PREFERENCE="-1"
-
-PACKAGES += "gpsdrive-add"
-DESCRIPTION = "GPS navigation/map display software"
-DEPENDS = "virtual/libc libart-lgpl gtk+ libpcre gpsd"
-RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
-SECTION = "x11"
-PRIORITY = "optional"
-LICENSE = "GPL"
-
-SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \
-           file://gpsdrive.desktop"
-
-S = "${WORKDIR}/gpsdrive"
-CFLAGS += "-D_GNU_SOURCE"
-
-FILES_${PN} = "${bindir}/gpsdrive ${bindir}/wpcvt ${bindir}/wpget ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += "${datadir}/${PN}"
-
-FILES_gpsdrive-add = "${libdir}"
-
-EXTRA_OECONF = "--disable-garmin"
-
-do_install_append () {
-        mkdir -p  ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/gpsdrive.desktop ${D}${datadir}/applications/gpsdrive.desktop
-}
-- 
cgit v1.2.3


From 0aa86df89c061f206092610a67dca95baf9cd38e Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 13 Mar 2008 10:42:14 +0000
Subject: libxext: add 1.0.4

---
 packages/xorg-lib/libxext_1.0.4.bb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 packages/xorg-lib/libxext_1.0.4.bb

(limited to 'packages')

diff --git a/packages/xorg-lib/libxext_1.0.4.bb b/packages/xorg-lib/libxext_1.0.4.bb
new file mode 100644
index 0000000000..3e8aa50f7c
--- /dev/null
+++ b/packages/xorg-lib/libxext_1.0.4.bb
@@ -0,0 +1,8 @@
+require xorg-lib-common.inc
+
+DESCRIPTION = "X11 miscellaneous extension library"
+DEPENDS += "xproto virtual/libx11 xextproto libxau"
+PROVIDES = "xext"
+PE = "1"
+
+XORG_PN = "libXext"
-- 
cgit v1.2.3


From 8a859fc388bf1f69685cd216b545cc6cf491d778 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 13 Mar 2008 10:44:11 +0000
Subject: xf86-video-ati: add 6.8.0

---
 packages/xorg-driver/xf86-video-ati_6.8.0.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-ati_6.8.0.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-ati_6.8.0.bb b/packages/xorg-driver/xf86-video-ati_6.8.0.bb
new file mode 100644
index 0000000000..4aae05a747
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-ati_6.8.0.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- ATI display driver"
+DEPENDS += " xineramaproto xf86miscproto drm xf86driproto"
+PE = "1"
-- 
cgit v1.2.3


From c808919566467efa43e9f82c1b2bbfface9af70b Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 13 Mar 2008 11:28:11 +0000
Subject: xf86-video-intel: add Intel i8xx, i9xx display driver, version 2.2.1

---
 packages/xorg-driver/xf86-video-intel_2.2.1.bb | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 packages/xorg-driver/xf86-video-intel_2.2.1.bb

(limited to 'packages')

diff --git a/packages/xorg-driver/xf86-video-intel_2.2.1.bb b/packages/xorg-driver/xf86-video-intel_2.2.1.bb
new file mode 100644
index 0000000000..eed1fcb600
--- /dev/null
+++ b/packages/xorg-driver/xf86-video-intel_2.2.1.bb
@@ -0,0 +1,5 @@
+require xorg-driver-video.inc
+
+DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver"
+DEPENDS += " virtual/libx11 libxvmc drm xf86driproto"
+PE = "1"
-- 
cgit v1.2.3


From 2490e3f3e7933f76257a875c53f40ae8a85b61c7 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 13 Mar 2008 12:03:21 +0000
Subject: kismet: Add missing patch

---
 packages/kismet/kismet-2007-10-R1/fix_strip.patch | 47 +++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 packages/kismet/kismet-2007-10-R1/fix_strip.patch

(limited to 'packages')

diff --git a/packages/kismet/kismet-2007-10-R1/fix_strip.patch b/packages/kismet/kismet-2007-10-R1/fix_strip.patch
new file mode 100644
index 0000000000..54e7a9b1b7
--- /dev/null
+++ b/packages/kismet/kismet-2007-10-R1/fix_strip.patch
@@ -0,0 +1,47 @@
+Index: kismet-2007-10-R1/Makefile.in
+===================================================================
+--- kismet-2007-10-R1.orig/Makefile.in	2008-03-06 15:20:37.000000000 +0000
++++ kismet-2007-10-R1/Makefile.in	2008-03-06 15:21:07.000000000 +0000
+@@ -138,23 +138,23 @@
+ 	fi
+ 
+ binuserinstall:
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(PS) $(BIN)/$(PS); 
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(DRONE) $(BIN)/$(DRONE);
++	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); 
++	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE);
+ 
+ binsuidinstall:
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(PS) $(BIN)/$(PS); 
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 4755 $(DRONE) $(BIN)/$(DRONE);
++	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(PS) $(BIN)/$(PS); 
++	install -o $(INSTUSR) -g $(INSTGRP) -m 4755 $(DRONE) $(BIN)/$(DRONE);
+ 	
+ commoninstall:
+ 	mkdir -p $(ETC)
+ 	mkdir -p $(BIN)
+ 
+ 	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(WRAP) $(BIN)/kismet
+-	install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(NC) $(BIN)/$(NC)
+-	# install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(HOPPER) $(BIN)/$(HOPPER)
++	install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC)
++	# install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(HOPPER) $(BIN)/$(HOPPER)
+ 	@if test "$(ZAURUS)" = "yes"; then \
+-		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(BUZZER) $(BIN)/buzzme; \
++		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
++		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(BUZZER) $(BIN)/buzzme; \
+ 	fi
+ #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_monitor $(BIN)/kismet_monitor
+ #install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet_unmonitor $(BIN)/kismet_unmonitor
+@@ -169,8 +169,8 @@
+ 	install -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet_drone.conf.5 $(MAN)/man5/kismet_drone.conf.5
+ 
+ 	@if test "$(GPSLBUILD)" = "$(GPSL)"; then \
+-		install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
+-		echo install -o $(INSTUSR) -g $(INSTGRP) -s -m 755 $(GPSL) $(BIN)/$(GPSL); \
++		install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
++		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 $(GPSL) $(BIN)/$(GPSL); \
+ 		install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
+ 		echo install -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/gpsmap-helper-earthamaps $(BIN)/gpsmap-helper-earthamaps; \
+ 		install -o $(INSTUSR) -g $(MANGRP) -m 644 man/gpsmap.1 $(MAN)/man1/gpsmap.1; \
-- 
cgit v1.2.3


From d17e5672c1ad07193835e47188e8819f7b9ad63d Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Thu, 13 Mar 2008 12:15:16 +0000
Subject: Drop unneeded empty directories

---
 packages/gcc/gcc-4.1.0/.mtn2git_empty              | 0
 packages/linux/linux-openmoko-devel/.mtn2git_empty | 0
 packages/netbase/netbase/ghi270/.mtn2git_empty     | 0
 packages/sqlite/sqlite3-3.3.17/.mtn2git_empty      | 0
 packages/sqlite/sqlite3-3.4.1/.mtn2git_empty       | 0
 packages/tslib/tslib-1.0/.mtn2git_empty            | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 packages/gcc/gcc-4.1.0/.mtn2git_empty
 delete mode 100644 packages/linux/linux-openmoko-devel/.mtn2git_empty
 delete mode 100644 packages/netbase/netbase/ghi270/.mtn2git_empty
 delete mode 100644 packages/sqlite/sqlite3-3.3.17/.mtn2git_empty
 delete mode 100644 packages/sqlite/sqlite3-3.4.1/.mtn2git_empty
 delete mode 100644 packages/tslib/tslib-1.0/.mtn2git_empty

(limited to 'packages')

diff --git a/packages/gcc/gcc-4.1.0/.mtn2git_empty b/packages/gcc/gcc-4.1.0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/linux/linux-openmoko-devel/.mtn2git_empty b/packages/linux/linux-openmoko-devel/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/netbase/netbase/ghi270/.mtn2git_empty b/packages/netbase/netbase/ghi270/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/sqlite/sqlite3-3.3.17/.mtn2git_empty b/packages/sqlite/sqlite3-3.3.17/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/sqlite/sqlite3-3.4.1/.mtn2git_empty b/packages/sqlite/sqlite3-3.4.1/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/tslib/tslib-1.0/.mtn2git_empty b/packages/tslib/tslib-1.0/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.3