[oe-commits] org.oe.dev merge of '7435522d56d19ccf11e4eb570b93e2f6cc418b0b'
xora commit
oe at amethyst.openembedded.net
Fri Apr 25 15:43:17 UTC 2008
merge of '7435522d56d19ccf11e4eb570b93e2f6cc418b0b'
and 'f460277636d213d6a3257745ceaac42b26814877'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 11f076562f177b288dd4e6d9d2e998b8bb689e10
ViewMTN: http://monotone.openembedded.org/revision/info/11f076562f177b288dd4e6d9d2e998b8bb689e10
Files:
1
packages/images/openmoko-minimal-image.bb
packages/intltool/intltool-native_0.37.1.bb
packages/intltool/intltool_0.37.1.bb
packages/swt/files/make_linux-fix.patch
conf/distro/include/sane-srcrevs.inc
conf/distro/include/preferred-om-2008-versions.inc
packages/alsa/alsa-state/fic-gta02/gsmhandset.state
packages/gnash/gnash.inc
packages/gnash/gnash_0.8.1.bb
packages/gpsdrive/gpsdrive-2.10pre4
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/ipkg/files/ipkg_bugfix.patch
packages/multitap-pad
packages/multitap-pad/files
packages/multitap-pad/files/80multitappad
packages/multitap-pad/multitap-pad_svn.bb
packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb
packages/openmoko2/openmoko-dialer2/fic-gta01
packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch
packages/openmoko2/openmoko-dialer2/fic-gta02
packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch
packages/perl/libwww-perl-native_5.808.bb
packages/perl/libwww-perl_5.808.bb
packages/qtopia-phone
packages/qtopia-phone/files
packages/qtopia-phone/files/fic-gta01
packages/qtopia-phone/files/fic-gta02
packages/qtopia-phone/qtopia-phone-x11
packages/qtopia-phone/qtopia-phone-x11/fic-gta02
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d
packages/images/openmoko-qtopia-image.bb
packages/images/openmoko-qtopia-x11-image.bb
packages/openmoko-tools/pty-forward-native.bb
packages/openmoko-tools/serial-forward.bb
packages/qtopia-phone/files/fic-gta01/device-conf
packages/qtopia-phone/files/fic-gta01/device-conf.old
packages/qtopia-phone/files/fic-gta01/qplatformdefs.h
packages/qtopia-phone/files/fic-gta02/device-conf
packages/qtopia-phone/files/fic-gta02/device-conf.old
packages/qtopia-phone/files/fic-gta02/qplatformdefs.h
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia
packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
packages/qtopia-phone/qtopia-phone.inc
packages/qtopia-phone/qtopia-phone_4.3.0.bb
packages/qtopia-phone/qtopia-phone_4.3.1.bb
packages/qtopia-phone/qtopia-phone_arch.inc
packages/tasks/task-openmoko-qtopia-x11.bb
packages/tasks/task-openmoko-qtopia.bb
classes/sourcepkg.bbclass
conf/checksums.ini
conf/distro/include/sane-srcdates.inc
packages/alsa/alsa-state.bb
Diffs:
#
# mt diff -r7435522d56d19ccf11e4eb570b93e2f6cc418b0b -r11f076562f177b288dd4e6d9d2e998b8bb689e10
#
#
#
# add_file "packages/images/openmoko-minimal-image.bb"
# content [a740cb7d4b108c6fc352e2a396d3563360322be0]
#
# add_file "packages/intltool/intltool-native_0.37.1.bb"
# content [b81685a0378422210accba665f9676953372a3ce]
#
# add_file "packages/intltool/intltool_0.37.1.bb"
# content [384bb6821454d43ace2fb6a4e2eb6c9f40d12d52]
#
# add_file "packages/swt/files/make_linux-fix.patch"
# content [c36fcfcc97e0624a3bd9f09d46459a84fc45b283]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [4776533690280f65381ecc211b3dd203c191f919]
# to [64e775c7452446ab8fb516b74096c5aad891a927]
#
============================================================
--- packages/images/openmoko-minimal-image.bb a740cb7d4b108c6fc352e2a396d3563360322be0
+++ packages/images/openmoko-minimal-image.bb a740cb7d4b108c6fc352e2a396d3563360322be0
@@ -0,0 +1,21 @@
+#------------------------------------------------------
+# OpenMoko Minimal Image Recipe
+# other openmoko images should include this.
+# -----------------------------------------------------
+
+IMAGE_LINGUAS = ""
+
+IMAGE_INSTALL = "\
+ ${MACHINE_TASK_PROVIDER} \
+ task-openmoko-linux \
+ "
+
+DEPENDS = "\
+ ${MACHINE_TASK_PROVIDER} \
+ task-openmoko-linux \
+ "
+
+
+inherit image
+
+ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp'
============================================================
--- packages/intltool/intltool-native_0.37.1.bb b81685a0378422210accba665f9676953372a3ce
+++ packages/intltool/intltool-native_0.37.1.bb b81685a0378422210accba665f9676953372a3ce
@@ -0,0 +1,7 @@
+require intltool_${PV}.bb
+
+inherit native
+DEPENDS = "libxml-parser-perl-native"
+
+export PERL = "/usr/bin/env perl"
+SRC_URI_append = " file://intltool-nowarn.patch;patch=1"
============================================================
--- packages/intltool/intltool_0.37.1.bb 384bb6821454d43ace2fb6a4e2eb6c9f40d12d52
+++ packages/intltool/intltool_0.37.1.bb 384bb6821454d43ace2fb6a4e2eb6c9f40d12d52
@@ -0,0 +1 @@
+require intltool.inc
============================================================
--- packages/swt/files/make_linux-fix.patch c36fcfcc97e0624a3bd9f09d46459a84fc45b283
+++ packages/swt/files/make_linux-fix.patch c36fcfcc97e0624a3bd9f09d46459a84fc45b283
@@ -0,0 +1,22 @@
+Index: swt-source/make_linux.mak
+===================================================================
+--- swt-source.orig/make_linux.mak 2008-01-23 15:08:02.000000000 +0800
++++ swt-source/make_linux.mak 2008-01-23 15:08:21.000000000 +0800
+@@ -74,8 +74,6 @@
+ -Wno-non-virtual-dtor \
+ -fPIC \
+ -I. \
+- -I$(JAVA_HOME)/include \
+- -I$(JAVA_HOME)/include/linux \
+ ${SWT_PTR_CFLAGS}
+ MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
+ MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
+@@ -96,8 +94,6 @@
+ -DSWT_VERSION=$(SWT_VERSION) \
+ $(NATIVE_STATS) \
+ -DLINUX -DGTK \
+- -I$(JAVA_HOME)/include \
+- -I$(JAVA_HOME)/include/linux \
+ -fPIC \
+ ${SWT_PTR_CFLAGS}
+ LIBS = -shared -fPIC
============================================================
--- conf/distro/include/sane-srcrevs.inc 4776533690280f65381ecc211b3dd203c191f919
+++ conf/distro/include/sane-srcrevs.inc 64e775c7452446ab8fb516b74096c5aad891a927
@@ -17,8 +17,8 @@ SRCREV_pn-dbus-c++ ?= "13131"
SRCREV_pn-contact ?= "1410"
SRCREV_pn-dbus-c++-native ?= "13131"
SRCREV_pn-dbus-c++ ?= "13131"
-SRCREV_pn-dfu-util ?= "2866"
-SRCREV_pn-dfu-util-native ?= "2866"
+SRCREV_pn-dfu-util ?= "4160"
+SRCREV_pn-dfu-util-native ?= "4160"
SRCREV_pn-diversity-daemon ?= "127"
SRCREV_pn-diversity-nav ?= "238"
SRCREV_pn-eds-dbus ?= "659"
@@ -43,13 +43,13 @@ SRCREV_pn-libfakekey ?= "1455"
SRCREV_pn-kismet-newcore ?= "2285"
SRCREV_pn-libcalenabler2 ?= "1410"
SRCREV_pn-libfakekey ?= "1455"
-SRCREV_pn-libgsmd ?= "3684"
+SRCREV_pn-libgsmd ?= "4216"
SRCREV_pn-libgsmd-devel ?= "3293"
-SRCREV_pn-libjana ?= "700"
+SRCREV_pn-libjana ?= "704"
SRCREV_pn-libmokogsmd2 ?= "3663"
-SRCREV_pn-libmokojournal2 ?= "3217"
+SRCREV_pn-libmokojournal2 ?= "3473"
SRCREV_pn-libmokopanelui2 ?= "3349"
-SRCREV_pn-libmokoui2 ?= "3688"
+SRCREV_pn-libmokoui2 ?= "3976"
SRCREV_pn-libw100 ?= "47"
SRCREV_pn-libowl ?= "277"
SRCREV_pn-libxosd ?= "627"
@@ -57,7 +57,7 @@ SRCREV_pn-linux-ixp4xx ?= "1039"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1039"
-SRCREV_pn-linux-openmoko ?= "4102"
+SRCREV_pn-linux-openmoko ?= "4194-r4165"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
@@ -66,11 +66,11 @@ SRCREV_pn-matchbox-stroke ?= "1820"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-moko-gtk-engine ?= "3405"
+SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-mplayer ?= "24587"
SRCREV_pn-multitap-pad ?= "337"
-SRCREV_pn-neod ?= "3421"
+SRCREV_pn-neod ?= "4219"
SRCREV_pn-netsurf ?= "3859"
SRCREV_pn-networkmanager ?= "2887"
SRCREV_pn-networkmanager-applet ?= "200"
@@ -79,39 +79,39 @@ SRCREV_pn-osb-nrcore ?= "126"
SRCREV_pn-osb-jscore ?= "117"
SRCREV_pn-osb-nrcit ?= "125"
SRCREV_pn-osb-nrcore ?= "126"
-SRCREV_pn-openmoko-appearance ?= "3239"
+SRCREV_pn-openmoko-appearance ?= "3262"
SRCREV_pn-openmoko-appmanager ?= "1851"
SRCREV_pn-openmoko-appmanager2 ?= "3442"
-SRCREV_pn-openmoko-browser2 ?= "3646"
+SRCREV_pn-openmoko-browser2 ?= "4172"
SRCREV_pn-openmoko-calculator ?= "2404"
SRCREV_pn-openmoko-calculator2 ?= "3655"
SRCREV_pn-openmoko-common ?= "397"
SRCREV_pn-openmoko-common2 ?= "3259"
SRCREV_pn-openmoko-contacts ?= "2298"
-SRCREV_pn-openmoko-contacts2 ?= "387"
+SRCREV_pn-openmoko-contacts2 ?= "412"
SRCREV_pn-openmoko-dates ?= "467"
SRCREV_pn-openmoko-dates2 ?= "673"
SRCREV_pn-openmoko-dialer ?= "2811"
-SRCREV_pn-openmoko-dialer2 ?= "3689"
+SRCREV_pn-openmoko-dialer2 ?= "4224"
SRCREV_pn-openmoko-feedreader2 ?= "3645"
SRCREV_pn-openmoko-finger-demo ?= "1671"
SRCREV_pn-openmoko-firststart2 ?= "3158"
SRCREV_pn-openmoko-footer ?= "2354"
SRCREV_pn-openmoko-icon-theme-standard ?= "2232"
-SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247"
-SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247"
+SRCREV_pn-openmoko-icon-theme-standard2 ?= "4225"
+SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "4225"
SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-mediaplayer2 ?= "4173"
SRCREV_pn-openmoko-messages ?= "2276"
-SRCREV_pn-openmoko-messages2 ?= "3712"
+SRCREV_pn-openmoko-messages2 ?= "4182"
SRCREV_pn-openmoko-panel-battery ?= "3360"
-SRCREV_pn-openmoko-panel-bt ?= "3149"
+SRCREV_pn-openmoko-panel-bt ?= "4197"
SRCREV_pn-openmoko-panel-clock ?= "2567"
SRCREV_pn-openmoko-panel-demo ?= "1622"
SRCREV_pn-openmoko-panel-demo-simple ?= "1328"
SRCREV_pn-openmoko-panel-gps ?= "2900"
-SRCREV_pn-openmoko-panel-gsm ?= "3664"
+SRCREV_pn-openmoko-panel-gsm ?= "4191"
SRCREV_pn-openmoko-panel-mainmenu ?= "2567"
SRCREV_pn-openmoko-panel-memory ?= "3903"
SRCREV_pn-openmoko-panel-usb ?= "3360"
@@ -124,21 +124,21 @@ SRCREV_pn-openmoko-tasks ?= "320"
SRCREV_pn-openmoko-stylus-demo-simple ?= "1818"
SRCREV_pn-openmoko-taskmanager ?= "1663"
SRCREV_pn-openmoko-tasks ?= "320"
-SRCREV_pn-openmoko-tasks2 ?= "361"
-SRCREV_pn-openmoko-terminal2 ?= "3764"
-SRCREV_pn-openmoko-theme-standard ?= "2370"
-SRCREV_pn-openmoko-theme-standard-qvga ?= "2370"
+SRCREV_pn-openmoko-tasks2 ?= "398"
+SRCREV_pn-openmoko-terminal2 ?= "4039"
+SRCREV_pn-openmoko-theme-standard ?= "4167"
+SRCREV_pn-openmoko-theme-standard-qvga ?= "4167"
SRCREV_pn-openmoko-theme-standard2 ?= "3425"
SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3609"
-SRCREV_pn-openmoko-today2-folders ?= "3414"
+SRCREV_pn-openmoko-today2 ?= "4168"
+SRCREV_pn-openmoko-today2-folders ?= "3704"
SRCREV_pn-openmoko-toolchain-scripts ?= "3767"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
-SRCREV_pn-openocd ?= "206"
-SRCREV_pn-openocd-native ?= "206"
-SRCREV_pn-opkg ?= "4209"
-SRCREV_pn-opkg-native ?= "4209"
+SRCREV_pn-openocd ?= "517"
+SRCREV_pn-openocd-native ?= "517"
+SRCREV_pn-opkg ?= "4210"
+SRCREV_pn-opkg-native ?= "4210"
SRCREV_pn-opkg-sdk ?= "4209"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
@@ -154,8 +154,8 @@ SRCREV_pn-u-boot-openmoko ?= "4138"
SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-tmut ?= "60"
SRCREV_pn-u-boot-openmoko ?= "4138"
-SRCREV_pn-usbpath ?= "3108"
-SRCREV_pn-usbpath-native ?= "3108"
+SRCREV_pn-usbpath ?= "3172"
+SRCREV_pn-usbpath-native ?= "3172"
SRCREV_pn-webkit-gtk ?= "30762"
SRCREV_pn-webkit-qt ?= "28656"
SRCREV_pn-webkit-qtopia ?= "28656"
#
# mt diff -rf460277636d213d6a3257745ceaac42b26814877 -r11f076562f177b288dd4e6d9d2e998b8bb689e10
#
#
#
# delete "conf/distro/include/preferred-om-2008-versions.inc"
#
# delete "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
#
# delete "packages/gnash/gnash.inc"
#
# delete "packages/gnash/gnash_0.8.1.bb"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
#
# delete "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
#
# delete "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#
# delete "packages/ipkg/files/ipkg_bugfix.patch"
#
# delete "packages/multitap-pad"
#
# delete "packages/multitap-pad/files"
#
# delete "packages/multitap-pad/files/80multitappad"
#
# delete "packages/multitap-pad/multitap-pad_svn.bb"
#
# delete "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02"
#
# delete "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
#
# delete "packages/perl/libwww-perl-native_5.808.bb"
#
# delete "packages/perl/libwww-perl_5.808.bb"
#
# add_dir "packages/gpsdrive/gpsdrive-2.10pre4"
#
# add_dir "packages/multitap-pad"
#
# add_dir "packages/multitap-pad/files"
#
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta01"
#
# add_dir "packages/openmoko2/openmoko-dialer2/fic-gta02"
#
# add_dir "packages/qtopia-phone"
#
# add_dir "packages/qtopia-phone/files"
#
# add_dir "packages/qtopia-phone/files/fic-gta01"
#
# add_dir "packages/qtopia-phone/files/fic-gta02"
#
# add_dir "packages/qtopia-phone/qtopia-phone-x11"
#
# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02"
#
# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d"
#
# add_file "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
# content [3db54371d119d26931ec5dc3eacd2f5658fb0982]
#
# add_file "packages/gnash/gnash.inc"
# content [66c805eb5cfd0e18a89770e022d4420ee9013566]
#
# add_file "packages/gnash/gnash_0.8.1.bb"
# content [50014de2c3904a6950c775be0eda4815399cb573]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
# content [f7d05fac53703548b59b528f752366847140744e]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
# content [47e014d89d9957ea970e01aced2dc553d3722236]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
# content [b9c3b9e051b269ab097c36a70c58b6d218e0d55d]
#
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
# content [6ef8f7d5db97dd3541a0bfe44325bd07296baf1b]
#
# add_file "packages/gpsdrive/gpsdrive_2.10pre4.bb"
# content [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
#
# add_file "packages/images/openmoko-qtopia-image.bb"
# content [85858c01bf04fa98f230120b45029c9ffc41a05c]
#
# add_file "packages/images/openmoko-qtopia-x11-image.bb"
# content [fd1679f4eb35ac9f3302c6a11f82e975921a169f]
#
# add_file "packages/multitap-pad/files/80multitappad"
# content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
#
# add_file "packages/multitap-pad/multitap-pad_svn.bb"
# content [8f2b626f58690dd52e509cacab5977c5f52270e2]
#
# add_file "packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb"
# content [4e424e0c74d42282c80ac2738e417b8dc7014e80]
#
# add_file "packages/openmoko-tools/pty-forward-native.bb"
# content [17c7e0ad0fe30607be9326cec651ccf4ee86b4b8]
#
# add_file "packages/openmoko-tools/serial-forward.bb"
# content [32434a87a886be4c262ea2f13af0375bae297e48]
#
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch"
# content [43b8c9925bee93d59e2aefd4c7eec71d0b796197]
#
# add_file "packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch"
# content [d1c708f7f915fa250e20a84fa9d4512440442a4f]
#
# add_file "packages/perl/libwww-perl-native_5.808.bb"
# content [66723b8808de2c5758435a88b9640bc8777d89be]
#
# add_file "packages/perl/libwww-perl_5.808.bb"
# content [c76a162b7e6844022d4b9826386bfeed71c6328e]
#
# add_file "packages/qtopia-phone/files/fic-gta01/device-conf"
# content [33f77c8d4d680c25796f493f054c0e6581439476]
#
# add_file "packages/qtopia-phone/files/fic-gta01/device-conf.old"
# content [7cf2ef99b35315048f286f7f0027ed5c6d609862]
#
# add_file "packages/qtopia-phone/files/fic-gta01/qplatformdefs.h"
# content [4548b7c6203d64cb5ba410f46ff363427f46e675]
#
# add_file "packages/qtopia-phone/files/fic-gta02/device-conf"
# content [33f77c8d4d680c25796f493f054c0e6581439476]
#
# add_file "packages/qtopia-phone/files/fic-gta02/device-conf.old"
# content [7cf2ef99b35315048f286f7f0027ed5c6d609862]
#
# add_file "packages/qtopia-phone/files/fic-gta02/qplatformdefs.h"
# content [4548b7c6203d64cb5ba410f46ff363427f46e675]
#
# add_file "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia"
# content [54bf1406f00aebb9f05186ae64e99cd38f45ef0b]
#
# add_file "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
# content [14600d791e31540ce23ce74084b05c424a136b7f]
#
# add_file "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# content [d410359003086e0e79d452ced03bb87f9747df45]
#
# add_file "packages/qtopia-phone/qtopia-phone.inc"
# content [3a88780f98fdd8af1ad280d0c3e688bf14e81001]
#
# add_file "packages/qtopia-phone/qtopia-phone_4.3.0.bb"
# content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]
#
# add_file "packages/qtopia-phone/qtopia-phone_4.3.1.bb"
# content [6a8d100cd18fb90e6f4dfc83f85e4588a049db4c]
#
# add_file "packages/qtopia-phone/qtopia-phone_arch.inc"
# content [15641411049adbe933692115529c6bac3f43cfef]
#
# add_file "packages/tasks/task-openmoko-qtopia-x11.bb"
# content [38da0e6335542addd488373f6e8cee974a877a58]
#
# add_file "packages/tasks/task-openmoko-qtopia.bb"
# content [4367872d7b461db04275d0f119b597e45eb0811b]
#
# patch "classes/sourcepkg.bbclass"
# from [4d9f8a49273051e27cb3e914d97f9ea3ebcdaba3]
# to [e4c6fac480eaea68ccd24d95a5878b9f5e41b464]
#
# patch "conf/checksums.ini"
# from [92a53abc70649f35606c3e047de4cd95d6a61407]
# to [d56bc810ab61b67ed3f8810f504ed68e4e4c3a7d]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [e417185fe87a77364d7d662829af7d8b658df96e]
# to [3dd1a196e482da03ba4107a6b06975fd0f997875]
#
# patch "packages/alsa/alsa-state.bb"
# from [b78fa244fb9c836713118514b9b2a32dd5f3bd88]
# to [64e43b8b24e43885d00500fd5632f439c9579f8f]
#
============================================================
--- packages/alsa/alsa-state/fic-gta02/gsmhandset.state 3db54371d119d26931ec5dc3eacd2f5658fb0982
+++ packages/alsa/alsa-state/fic-gta02/gsmhandset.state 3db54371d119d26931ec5dc3eacd2f5658fb0982
@@ -0,0 +1,885 @@
+state.neo1973gta02 {
+ control.1 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+ value.0 235
+ value.1 235
+ }
+ control.2 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'ADC Capture Volume'
+ value.0 195
+ value.1 195
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Speaker Playback Volume'
+ value.0 127
+ value.1 127
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+ value 121
+ }
+ control.6 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Playback Volume'
+ value.0 2
+ value.1 2
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.11 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Bypass Playback Volume'
+ value 2
+ }
+ control.12 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Sidetone Playback Volume'
+ value 2
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Mono Voice Playback Volume'
+ value 2
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+ control.15 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Linear Control'
+ comment.item.1 'Adaptive Boost'
+ iface MIXER
+ name 'Bass Boost'
+ value 'Linear Control'
+ }
+ control.16 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '130Hz @ 48kHz'
+ comment.item.1 '200Hz @ 48kHz'
+ comment.item.2 '100Hz @ 16kHz'
+ comment.item.3 '400Hz @ 48kHz'
+ comment.item.4 '100Hz @ 8kHz'
+ comment.item.5 '200Hz @ 8kHz'
+ iface MIXER
+ name 'Bass Filter'
+ value '130Hz @ 48kHz'
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Bass Volume'
+ value 0
+ }
+ control.18 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+ value 0
+ }
+ control.19 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '8kHz'
+ comment.item.1 '4kHz'
+ iface MIXER
+ name 'Treble Cut-off'
+ value '8kHz'
+ }
+ control.20 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Sidetone Capture Volume'
+ value.0 2
+ value.1 2
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Voice Sidetone Capture Volume'
+ value 2
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 63'
+ iface MIXER
+ name 'Capture Volume'
+ value.0 23
+ value.1 23
+ }
+ control.23 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.24 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 true
+ value.1 true
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '3.4Hz @ 48kHz'
+ comment.item.1 '82Hz @ 16k'
+ comment.item.2 '82Hz @ 8kHz'
+ comment.item.3 '170Hz @ 8kHz'
+ iface MIXER
+ name 'Capture Filter Select'
+ value '3.4Hz @ 48kHz'
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 HiFi
+ comment.item.1 Voice
+ iface MIXER
+ name 'Capture Filter Cut-off'
+ value HiFi
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture Filter Switch'
+ value false
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Target Volume'
+ value 3
+ }
+ control.29 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Max Volume'
+ value 7
+ }
+ control.30 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Off
+ comment.item.1 Right
+ comment.item.2 Left
+ comment.item.3 Stereo
+ iface MIXER
+ name 'ALC Capture Function'
+ value Left
+ }
+ control.31 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+ value false
+ }
+ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+ value 15
+ }
+ control.33 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+ value 12
+ }
+ control.34 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+ value 2
+ }
+ control.35 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ iface MIXER
+ name 'ALC Capture NG Threshold'
+ value 0
+ }
+ control.36 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Constant PGA Gain'
+ comment.item.1 'Mute ADC Output'
+ iface MIXER
+ name 'ALC Capture NG Type'
+ value 'Constant PGA Gain'
+ }
+ control.37 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture NG Switch'
+ value false
+ }
+ control.38 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Capture
+ comment.item.1 Playback
+ iface MIXER
+ name '3D Function'
+ value Capture
+ }
+ control.39 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name '3D Upper Cut-off'
+ value '2.2kHz'
+ }
+ control.40 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '200Hz'
+ comment.item.1 '500Hz'
+ iface MIXER
+ name '3D Lower Cut-off'
+ value '200Hz'
+ }
+ control.41 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name '3D Volume'
+ value 0
+ }
+ control.42 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name '3D Switch'
+ value false
+ }
+ control.43 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture 6dB Attenuate'
+ value false
+ }
+ control.44 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback 6dB Attenuate'
+ value false
+ }
+ control.45 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 None
+ comment.item.1 '32kHz'
+ comment.item.2 '44.1kHz'
+ comment.item.3 '48kHz'
+ iface MIXER
+ name De-emphasis
+ value None
+ }
+ control.46 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 Left
+ comment.item.2 Right
+ comment.item.3 Mono
+ iface MIXER
+ name 'Playback Mono Mix'
+ value Stereo
+ }
+ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Non Inverted'
+ comment.item.1 Inverted
+ iface MIXER
+ name 'Playback Phase'
+ value 'Non Inverted'
+ }
+ control.48 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic2 Capture Volume'
+ value 0
+ }
+ control.49 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic1 Capture Volume'
+ value 0
+ }
+%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list