[oe-commits] org.oe.dev merge of '5835e96816cbf14d4a7298959b92309cd3d8178b'
xora commit
oe at amethyst.openembedded.net
Fri Apr 25 15:43:42 UTC 2008
merge of '5835e96816cbf14d4a7298959b92309cd3d8178b'
and 'f7df80732af56b59315ef203e69f092313ec2ddd'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 809d7d650e2852bbb5de2df34e3496d61b6c4523
ViewMTN: http://monotone.openembedded.org/revision/info/809d7d650e2852bbb5de2df34e3496d61b6c4523
Files:
1
packages/pango/pango-1.18.3/pkgconfig_fixes.patch
packages/pango/files/pkgconfig_fixes.patch
packages/openmoko-projects/illume
packages/openmoko-projects/illume/illume-fix-includes.patch
packages/vte/vte_0.16.13.bb
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2008-preferred-versions.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/beagleboard.conf
conf/machine/omap5912osk.conf
packages/gtk+/gtk+.inc
packages/gtk+/gtk+_2.12.0.bb
packages/gtk+/gtk+_2.12.3.bb
packages/openmoko-projects/illume_svn.bb
packages/pango/pango_1.8.2.bb
packages/sysvinit/sysvinit_2.86.bb
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
packages/alsa/alsa-state.bb
packages/openmoko2/openmoko-session2.bb
Diffs:
#
# mt diff -r5835e96816cbf14d4a7298959b92309cd3d8178b -r809d7d650e2852bbb5de2df34e3496d61b6c4523
#
#
#
# rename "packages/pango/pango-1.18.3/pkgconfig_fixes.patch"
# to "packages/pango/files/pkgconfig_fixes.patch"
#
# add_dir "packages/openmoko-projects/illume"
#
# add_file "packages/openmoko-projects/illume/illume-fix-includes.patch"
# content [9c77a2deb5117d5264a62d14acac593527d9ec08]
#
# add_file "packages/vte/vte_0.16.13.bb"
# content [07c7810a2019c094f4d7e6dd69d8b110eb03d1a1]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [5c5fce6eea9295023e972ef3168ecfe9d891845c]
# to [00d7a502fb3a2a220a9e65b25b8acb2fbf3fe05d]
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [41b541c02998505d16e4a6b698b0aa8ac26b1819]
# to [d88513c46c7ccd9a74ab4e7fc7b3c7ee572463e0]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [bf5c7bd9d18e00b4d3328eaa56521dc05a9ed56c]
# to [eae76e457c389303e93597d7d4217f114ed95ff9]
#
# patch "conf/machine/beagleboard.conf"
# from [c6f1d6f7af44caca6ecaaa5778c9efda3b0f55a9]
# to [1143999fa2292dd52e80f29182a3b2a17ddd0494]
#
# patch "conf/machine/omap5912osk.conf"
# from [0e95b09a1be375036ac3d8c2bde78501405ef4e3]
# to [550c9fd932094e999a41c4ac6321b068c9efec66]
#
# patch "packages/gtk+/gtk+.inc"
# from [1aaf588548db151300913d0a15d5cc12dc7cdaa8]
# to [8aedbf6c56434aa2961e5238b7863e3537faba35]
#
# patch "packages/gtk+/gtk+_2.12.0.bb"
# from [08e63663afbf9b3a26edfaf43148e2e60683e7df]
# to [b7951643e667231ff2d092dd865e23dde9666222]
#
# patch "packages/gtk+/gtk+_2.12.3.bb"
# from [7160ff887391b65883e37a5a1fbb1007a4356f49]
# to [0d9c399ba649e1291ca7948faac117dd90dce289]
#
# patch "packages/openmoko-projects/illume_svn.bb"
# from [e5d4b34ba7ffcc19cf76941aa5f700a687147d15]
# to [c0608172fae13bd898686c009658f6f8179e9c46]
#
# patch "packages/pango/pango_1.8.2.bb"
# from [a17979a78d6ca8ee7191f00fd631befaadc5dcac]
# to [c5167cdc5d3b91d13bdc3a6bbbd7d2c772f3dedf]
#
# patch "packages/sysvinit/sysvinit_2.86.bb"
# from [1c35cfa24576ba16dc1ae7020b0b5c61ddd20533]
# to [0288b0c48e4b35bdad86e6eb8ae993fa4686e6fb]
#
============================================================
--- packages/openmoko-projects/illume/illume-fix-includes.patch 9c77a2deb5117d5264a62d14acac593527d9ec08
+++ packages/openmoko-projects/illume/illume-fix-includes.patch 9c77a2deb5117d5264a62d14acac593527d9ec08
@@ -0,0 +1,70 @@
+Index: src/e_mod_win.c
+===================================================================
+--- src/e_mod_win.c (revision 14)
++++ src/e_mod_win.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_mod_win.h"
+ #include "e_slipshelf.h"
+ #include "e_slipwin.h"
+Index: src/e_kbd.c
+===================================================================
+--- src/e_kbd.c (revision 14)
++++ src/e_kbd.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_kbd.h"
+
+ /* internal calls */
+Index: src/e_slip.c
+===================================================================
+--- src/e_slip.c (revision 14)
++++ src/e_slip.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slip.h"
+
+ EAPI int E_EVENT_SLIP_DEL = 0;
+Index: src/e_mod_layout.c
+===================================================================
+--- src/e_mod_layout.c (revision 14)
++++ src/e_mod_layout.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_mod_main.h"
+ #include "e_mod_layout.h"
+
+Index: src/e_mod_main.c
+===================================================================
+--- src/e_mod_main.c (revision 14)
++++ src/e_mod_main.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+
+ #include "e_kbd.h"
+ #include "e_slipshelf.h"
+Index: src/e_slipwin.c
+===================================================================
+--- src/e_slipwin.c (revision 14)
++++ src/e_slipwin.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slipwin.h"
+
+ EAPI int E_EVENT_SLIPWIN_DEL = 0;
+Index: src/e_slipshelf.c
+===================================================================
+--- src/e_slipshelf.c (revision 14)
++++ src/e_slipshelf.c (working copy)
+@@ -1,4 +1,4 @@
+-#include <e.h>
++#include <enlightenment/e.h>
+ #include "e_slipshelf.h"
+
+ /* FIXME: break out gadcons for 2 swallow areas */
============================================================
--- packages/vte/vte_0.16.13.bb 07c7810a2019c094f4d7e6dd69d8b110eb03d1a1
+++ packages/vte/vte_0.16.13.bb 07c7810a2019c094f4d7e6dd69d8b110eb03d1a1
@@ -0,0 +1 @@
+require vte.inc
============================================================
--- conf/distro/angstrom-2008.1.conf 5c5fce6eea9295023e972ef3168ecfe9d891845c
+++ conf/distro/angstrom-2008.1.conf 00d7a502fb3a2a220a9e65b25b8acb2fbf3fe05d
@@ -81,7 +81,6 @@ PREFERRED_VERSION_glib-2.0
#Prefer a newer GTK+ and friends
PREFERRED_VERSION_gtk+ ?= "2.12.3"
PREFERRED_VERSION_glib-2.0 ?= "2.14.4"
-PREFERRED_VERSION_pango ?= "1.18.1"
PREFERRED_PROVIDER_avahi = "avahi"
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc 41b541c02998505d16e4a6b698b0aa8ac26b1819
+++ conf/distro/include/angstrom-2008-preferred-versions.inc d88513c46c7ccd9a74ab4e7fc7b3c7ee572463e0
@@ -3,6 +3,6 @@ PREFERRED_VERSION_libtool = "1.5.10"
PREFERRED_VERSION_glib-2.0 = "2.16.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_pango = "1.18.3"
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
-PREFERRED_VERSION_vte = "0.16.10"
============================================================
--- conf/distro/include/sane-srcrevs.inc bf5c7bd9d18e00b4d3328eaa56521dc05a9ed56c
+++ conf/distro/include/sane-srcrevs.inc eae76e457c389303e93597d7d4217f114ed95ff9
@@ -137,9 +137,9 @@ SRCREV_pn-openocd-native ?= "517"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
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-opkg ?= "4235"
+SRCREV_pn-opkg-native ?= "4235"
+SRCREV_pn-opkg-sdk ?= "4235"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pty-forward-native ?= "4214"
============================================================
--- conf/machine/beagleboard.conf c6f1d6f7af44caca6ecaaa5778c9efda3b0f55a9
+++ conf/machine/beagleboard.conf 1143999fa2292dd52e80f29182a3b2a17ddd0494
@@ -19,7 +19,7 @@ IMAGE_FSTYPES ?= "tar.bz2"
IMAGE_FSTYPES ?= "tar.bz2"
# Guesswork
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "115200 ttyS2"
# No kernel recipe yet
PREFERRED_PROVIDER_virtual/kernel = "linux-beagleboard"
============================================================
--- conf/machine/omap5912osk.conf 0e95b09a1be375036ac3d8c2bde78501405ef4e3
+++ conf/machine/omap5912osk.conf 550c9fd932094e999a41c4ac6321b068c9efec66
@@ -8,6 +8,8 @@ PREFERRED_PROVIDER_virtual/kernel = "lin
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
+UBOOT_ENTRYPOINT="0x10c08000"
+
# PREFERRED_VERSION_u-boot = "1.1.6"
SERIAL_CONSOLE ?= "115200 ttyS0"
@@ -26,6 +28,8 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modu
kernel-module-nls-base \
kernel-module-vfat \
kernel-module-ohci-hcd \
+ kernel-module-tlv320aic23 \
+ kernel-module-snd-omap-alsa-aic23 \
"
RDEPENDS_kernel-base = ""
============================================================
--- packages/gtk+/gtk+.inc 1aaf588548db151300913d0a15d5cc12dc7cdaa8
+++ packages/gtk+/gtk+.inc 8aedbf6c56434aa2961e5238b7863e3537faba35
@@ -23,6 +23,7 @@ FILES_${PN}-dev += " \
${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
${bindir}/gdk-pixbuf-csource \
${bindir}/gtk-builder-convert"
============================================================
--- packages/gtk+/gtk+_2.12.0.bb 08e63663afbf9b3a26edfaf43148e2e60683e7df
+++ packages/gtk+/gtk+_2.12.0.bb b7951643e667231ff2d092dd865e23dde9666222
@@ -1,6 +1,6 @@ require gtk+.inc
require gtk+.inc
-PR = "r1"
+PR = "r2"
DEPENDS += "cairo"
============================================================
--- packages/gtk+/gtk+_2.12.3.bb 7160ff887391b65883e37a5a1fbb1007a4356f49
+++ packages/gtk+/gtk+_2.12.3.bb 0d9c399ba649e1291ca7948faac117dd90dce289
@@ -1,6 +1,6 @@ require gtk+.inc
require gtk+.inc
-PR = "r0"
+PR = "r1"
DEPENDS += "cairo"
============================================================
--- packages/openmoko-projects/illume_svn.bb e5d4b34ba7ffcc19cf76941aa5f700a687147d15
+++ packages/openmoko-projects/illume_svn.bb c0608172fae13bd898686c009658f6f8179e9c46
@@ -2,11 +2,13 @@ LICENSE = "MIT/BSD"
HOMEPAGE = "http://illume.projects.openmoko.org/"
LICENSE = "MIT/BSD"
-DEPENDS = "eet evas ecore edje embryo efreet edbus edje-native embryo-native"
+DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native"
PV = "0.0+svnr${SRCREV}"
+PR = "r1"
-SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https"
+SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \
+ file://illume-fix-includes.patch;patch=1;pnum=0;minrev=14"
S = "${WORKDIR}/${PN}"
@@ -17,6 +19,7 @@ EXTRA_OECONF = "--x-includes=${STAGING_I
--enable-simple-x11 \
--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
+export CFLAGS += "-DE_TYPEDEFS=1"
do_configure_append() {
find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
============================================================
--- packages/pango/pango_1.8.2.bb a17979a78d6ca8ee7191f00fd631befaadc5dcac
+++ packages/pango/pango_1.8.2.bb c5167cdc5d3b91d13bdc3a6bbbd7d2c772f3dedf
@@ -11,7 +11,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
FULL_OPTIMIZATION_arm = "-O2"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2 \
- file://no-tests.patch;patch=1"
+ file://no-tests.patch;patch=1 \
+ file://pkgconfig_fixes.patch;patch=1"
inherit autotools pkgconfig
============================================================
--- packages/sysvinit/sysvinit_2.86.bb 1c35cfa24576ba16dc1ae7020b0b5c61ddd20533
+++ packages/sysvinit/sysvinit_2.86.bb 0288b0c48e4b35bdad86e6eb8ae993fa4686e6fb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://freshmeat.net/project
SECTION = "base"
LICENSE = "GPL"
HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r39"
+PR = "r40"
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
#
# mt diff -rf7df80732af56b59315ef203e69f092313ec2ddd -r809d7d650e2852bbb5de2df34e3496d61b6c4523
#
#
#
# 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 "conf/distro/include/preferred-om-2008-versions.inc"
# content [45c4fabe80b7601dd86c45ad8f64a6773594d4e7]
#
# 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/distro/include/sane-srcrevs.inc"
# from [55633da67c926669fe7beb444ae99d39d9af5462]
# to [eae76e457c389303e93597d7d4217f114ed95ff9]
#
# patch "packages/alsa/alsa-state.bb"
# from [b78fa244fb9c836713118514b9b2a32dd5f3bd88]
# to [64e43b8b24e43885d00500fd5632f439c9579f8f]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [7212c808e7087d92aab3ce2cda5c8d3ba3ee695b]
# to [55a8f8ba59b243e3e3dbc006935894e21d721aa6]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 45c4fabe80b7601dd86c45ad8f64a6773594d4e7
+++ conf/distro/include/preferred-om-2008-versions.inc 45c4fabe80b7601dd86c45ad8f64a6773594d4e7
@@ -0,0 +1,15 @@
+PREFERRED_VERSION_asterisk = "1.4.17"
+PREFERRED_VERSION_busybox = "1.9.1"
+PREFERRED_VERSION_dbus = "1.1.20"
+PREFERRED_VERSION_dbus-glib = "0.74"
+PREFERRED_VERSION_gnash = "0.8.2"
+PREFERRED_VERSION_gpsdrive = "2.10pre4"
+PREFERRED_VERSION_gst-pulse = "0.9.7"
+PREFERRED_VERSION_intltool = "0.35.5"
+PREFERRED_VERSION_intltool-native = "0.35.5"
+PREFERRED_VERSION_libtool = "1.5.24"
+PREFERRED_VERSION_midori = "0.0.17"
+PREFERRED_VERSION_pulseaudio = "0.9.9"
+PREFERRED_VERSION_udev = "118"
+PREFERRED_VERSION_vte = "0.16.9"
+
============================================================
--- 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
+ commen%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list