[oe-commits] org.oe.dev merge of '68b307acdcebbfa76e48b811ca400ec5c07e768c'
xora commit
oe at amethyst.openembedded.net
Fri Apr 25 15:39:53 UTC 2008
merge of '68b307acdcebbfa76e48b811ca400ec5c07e768c'
and '95d7aafb111c8d8a347b6e51672855a431552234'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: b3924176ab199bec172a9ce81f5a0ef0672fdcca
ViewMTN: http://monotone.openembedded.org/revision/info/b3924176ab199bec172a9ce81f5a0ef0672fdcca
Files:
1
packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch
packages/openmoko-projects/tangogps
packages/qtopia-phone/qtopia-phone-x11/Xsession.d
packages/gnash/gnash_0.8.2.bb
packages/images/openmoko-qtopia-x11-image.bb
packages/openmoko-projects/tangogps/global-config-h.patch
packages/openmoko-projects/tangogps_0.7.bb
packages/python/python-pygtk/nodocs.patch
packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
packages/tasks/task-openmoko-qtopia-x11.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/alsa/alsa-state/fic-gta02/gsmhandset.state
packages/alsa/alsa-state.bb
packages/gnash/gnash.inc
packages/gtk-webcore/midori_0.0.17.bb
packages/gypsy/gypsy.inc
packages/openmoko-projects/diversity-daemon_svn.bb
packages/openmoko-projects/diversity-nav_svn.bb
packages/packagekit/packagekit_git.bb
packages/python/python-pygtk_2.10.4.bb
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
packages/tasks/task-openmoko-feed.bb
packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb
Diffs:
#
# mt diff -r68b307acdcebbfa76e48b811ca400ec5c07e768c -rb3924176ab199bec172a9ce81f5a0ef0672fdcca
#
#
# no changes
#
#
# mt diff -r95d7aafb111c8d8a347b6e51672855a431552234 -rb3924176ab199bec172a9ce81f5a0ef0672fdcca
#
#
#
# delete "packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch"
#
# add_dir "packages/openmoko-projects/tangogps"
#
# add_dir "packages/qtopia-phone/qtopia-phone-x11/Xsession.d"
#
# add_file "packages/gnash/gnash_0.8.2.bb"
# content [50014de2c3904a6950c775be0eda4815399cb573]
#
# add_file "packages/images/openmoko-qtopia-x11-image.bb"
# content [fd1679f4eb35ac9f3302c6a11f82e975921a169f]
#
# add_file "packages/openmoko-projects/tangogps/global-config-h.patch"
# content [1f14bafd396575e8b2246ac3aafe3903fd5a3317]
#
# add_file "packages/openmoko-projects/tangogps_0.7.bb"
# content [9bfda29d9c3b350217af6cc0ac304b8ee2340584]
#
# add_file "packages/python/python-pygtk/nodocs.patch"
# content [50abf04fa1f14dd2f24ef8908651dcb30227d518]
#
# add_file "packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia"
# content [a8d4a67e0c7769a5e892d61f199fcb66eb0a671a]
#
# add_file "packages/tasks/task-openmoko-qtopia-x11.bb"
# content [38da0e6335542addd488373f6e8cee974a877a58]
#
# patch "conf/distro/include/preferred-om-2008-versions.inc"
# from [5a0ecf3748dcaf57e0ba68cdc943a467f6cc6c46]
# to [3e26a4b08d293f6d4ea1fa7e1b48e112d2e6d907]
#
# patch "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
# from [22f8a7307f48f6bc8245fd1f3a1b6aae87fe1117]
# to [3db54371d119d26931ec5dc3eacd2f5658fb0982]
#
# patch "packages/alsa/alsa-state.bb"
# from [e5436e264cee1a75607428ab2567cb9a4227c219]
# to [04a21acd1a3c8a25e536a0f87bf515c1909367e0]
#
# patch "packages/gnash/gnash.inc"
# from [7f99a7149dd2fcb8a9df24834ec6d6ac432d96f8]
# to [66c805eb5cfd0e18a89770e022d4420ee9013566]
#
# patch "packages/gtk-webcore/midori_0.0.17.bb"
# from [91913de32cf7b037f663c05eaf6700983c2818e1]
# to [3d8f7815947175065c2271654f26e21a970b8305]
#
# patch "packages/gypsy/gypsy.inc"
# from [8d8453a16ed137b880d7f2c4c5fa0698bff47db7]
# to [85b5dc8a1cf38b17b7eae3af2cd38122493263fa]
#
# patch "packages/openmoko-projects/diversity-daemon_svn.bb"
# from [999b1e20ed0a67ee79e83a1483e4de1d18c21e1f]
# to [d791f5379c76cef1135ea42eb1ad3e1199c7320c]
#
# patch "packages/openmoko-projects/diversity-nav_svn.bb"
# from [735e09ebf7933d1a68caa20982cd25a68e8dae54]
# to [dd3619fc28f05cad72d65a94fbe062468b4920b0]
#
# patch "packages/packagekit/packagekit_git.bb"
# from [8fe65fd15a32dc4664adf3b54c04374d3aff362c]
# to [0c24a5e5353dfdb7388797f10cb564ae32860786]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [97365313b90449385ae4470aba6254d39ecdd2ab]
# to [fea6fa33b56f90fb6590ac797faea3276a26a642]
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [5465bfaf66d8a3ef425cf40b6f027b07edf56c50]
# to [0d30f0e2f203011597df480fb0ec8c0bd4d438ba]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [7d43d2e53f32c8b0e07bf9fd81220d696a824a49]
# to [f668de304d6dbe5d8fd3192db4c38f78cd6fbb96]
#
# patch "packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb"
# from [5379ad2dc442e5311c7f1903f8ac2900f7886323]
# to [6d801f6abfc58aaf724ee5f32f75326a83882415]
#
============================================================
--- packages/gnash/gnash_0.8.2.bb 50014de2c3904a6950c775be0eda4815399cb573
+++ packages/gnash/gnash_0.8.2.bb 50014de2c3904a6950c775be0eda4815399cb573
@@ -0,0 +1 @@
+require gnash.inc
============================================================
--- packages/images/openmoko-qtopia-x11-image.bb fd1679f4eb35ac9f3302c6a11f82e975921a169f
+++ packages/images/openmoko-qtopia-x11-image.bb fd1679f4eb35ac9f3302c6a11f82e975921a169f
@@ -0,0 +1,7 @@
+#------------------------------------------------------
+# OpenMoko Qtopia/X11 Image Recipe
+#------------------------------------------------------
+
+require openmoko-minimal-image.bb
+
+IMAGE_INSTALL += "task-openmoko-qtopia-x11"
============================================================
--- packages/openmoko-projects/tangogps/global-config-h.patch 1f14bafd396575e8b2246ac3aafe3903fd5a3317
+++ packages/openmoko-projects/tangogps/global-config-h.patch 1f14bafd396575e8b2246ac3aafe3903fd5a3317
@@ -0,0 +1,30 @@
+Index: tangoGPS-0.7/src/globals.c
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.c 2008-03-13 14:21:02.000000000 +0800
++++ tangoGPS-0.7/src/globals.c 2008-03-13 14:28:49.000000000 +0800
+@@ -3,11 +3,11 @@
+ * License GPLv2
+ ****************************************************************************/
+
++#include "globals.h"
++
+ #include <gtk/gtk.h>
+ #include <gps.h>
+
+-#include "globals.h"
+-
+ GdkPixmap *pixmap = NULL;
+ GtkWidget *window1 = NULL;
+ GtkWidget *window2 = NULL;
+Index: tangoGPS-0.7/src/globals.h
+===================================================================
+--- tangoGPS-0.7.orig/src/globals.h 2008-03-13 14:27:46.000000000 +0800
++++ tangoGPS-0.7/src/globals.h 2008-03-13 14:27:48.000000000 +0800
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++# include <config.h>
++#endif
++
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
+
============================================================
--- packages/openmoko-projects/tangogps_0.7.bb 9bfda29d9c3b350217af6cc0ac304b8ee2340584
+++ packages/openmoko-projects/tangogps_0.7.bb 9bfda29d9c3b350217af6cc0ac304b8ee2340584
@@ -0,0 +1,17 @@
+DESCRIPTION = "tangoGPS map"
+AUTHOR = "Marcus Bauer <marcus.bauer at gmail.com>"
+HOMEPAGE = "http://tangogps.org/"
+SECTION = "openmoko/pim"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+DEPENDS = "curl gtk+ gpsd"
+PR = "r1"
+
+SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \
+ file://global-config-h.patch;patch=1"
+
+S = "${WORKDIR}/tangoGPS-0.7"
+
+inherit autotools
+
+CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/"
============================================================
--- packages/python/python-pygtk/nodocs.patch 50abf04fa1f14dd2f24ef8908651dcb30227d518
+++ packages/python/python-pygtk/nodocs.patch 50abf04fa1f14dd2f24ef8908651dcb30227d518
@@ -0,0 +1,13 @@
+Index: pygtk-2.10.4/Makefile.am
+===================================================================
+--- pygtk-2.10.4.orig/Makefile.am
++++ pygtk-2.10.4/Makefile.am
+@@ -4,7 +4,7 @@ if BUILD_GTK
+ GTK_SUBDIR = gtk
+ endif
+
+-SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs
++SUBDIRS = codegen . $(GTK_SUBDIR) examples tests
+
+ PLATFORM_VERSION = 2.0
+
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia a8d4a67e0c7769a5e892d61f199fcb66eb0a671a
+++ packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia a8d4a67e0c7769a5e892d61f199fcb66eb0a671a
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# path setup
+export QPEDIR=/opt/Qtopia
+export PATH=$QPEDIR/bin:$PATH
+export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH
+
+#tell how to inform illume on incoming phone calls
+#export ILLUME_PHONE_CALL=
+
+
+# xmodmap to allow the soft-menu to work
+xmodmap -e "keycode 223 = 0x11000601"
+xmodmap -e "keycode 224 = 0x11000602"
+xmodmap -e "keycode 225 = 0x11000603"
+xmodmap -e "keycode 226 = 0x11000604"
+xmodmap -e "keycode 227 = 0x11000605"
+xmodmap -e "keycode 228 = 0x11000606"
+xmodmap -e "keycode 229 = 0x11000607"
+xmodmap -e "keycode 230 = 0x11000608"
+xmodmap -e "keycode 231 = 0x11000609"
+xmodmap -e "keycode 232 = 0x1100060A"
+xmodmap -e "keycode 232 = 0x1100060B"
+xmodmap -e "keycode 233 = 0x1100060B"
+xmodmap -e "keycode 232 = 0x1100060A"
+xmodmap -e "keycode 234 = 0x1100060C"
+xmodmap -e "keycode 235 = 0x1100060D"
+xmodmap -e "keycode 236 = 0x1100060E"
+xmodmap -e "keycode 237 = 0x1100060F"
+xmodmap -e "keycode 238 = 0x11000610"
+xmodmap -e "keycode 239 = 0x1008ff26"
+
+# Now start Qtopia
+exec qpe
============================================================
--- packages/tasks/task-openmoko-qtopia-x11.bb 38da0e6335542addd488373f6e8cee974a877a58
+++ packages/tasks/task-openmoko-qtopia-x11.bb 38da0e6335542addd488373f6e8cee974a877a58
@@ -0,0 +1,35 @@
+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+LICENSE = "MIT"
+PR = "r46"
+
+inherit task
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+PACKAGES = "task-openmoko-qtopia-x11"
+
+#
+# task-openmoko-qtopia-x11
+#
+DESCRIPTION_task-openmoko-qtopia-x11 = "OpenMoko: The Qtopia/X11 based User Interface"
+RDEPENDS_task-openmoko-qtopia-x11 = "\
+ alsa-state \
+ bluez-hcidump \
+ readline \
+ qtopia-phone-x11 \
+ e-wm \
+ illume \
+ ${XSERVER} \
+ xserver-kdrive-common \
+ xserver-nodm-init \
+ xauth \
+ xhost \
+ xset \
+ xrandr \
+ neod \
+ libnotify \
+"
+
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc 5a0ecf3748dcaf57e0ba68cdc943a467f6cc6c46
+++ conf/distro/include/preferred-om-2008-versions.inc 3e26a4b08d293f6d4ea1fa7e1b48e112d2e6d907
@@ -2,7 +2,7 @@ PREFERRED_VERSION_dbus-glib = "0.74"
PREFERRED_VERSION_busybox = "1.9.1"
PREFERRED_VERSION_dbus = "1.1.20"
PREFERRED_VERSION_dbus-glib = "0.74"
-PREFERRED_VERSION_gnash = "0.8.1"
+PREFERRED_VERSION_gnash = "0.8.2"
PREFERRED_VERSION_gpsdrive = "2.10pre4"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_intltool = "0.35.5"
============================================================
--- packages/alsa/alsa-state/fic-gta02/gsmhandset.state 22f8a7307f48f6bc8245fd1f3a1b6aae87fe1117
+++ packages/alsa/alsa-state/fic-gta02/gsmhandset.state 3db54371d119d26931ec5dc3eacd2f5658fb0982
@@ -26,8 +26,8 @@ state.neo1973gta02 {
comment.range '0 - 127'
iface MIXER
name 'Headphone Playback Volume'
- value.0 121
- value.1 121
+ value.0 0
+ value.1 0
}
control.4 {
comment.access 'read write'
@@ -46,7 +46,7 @@ state.neo1973gta02 {
comment.range '0 - 127'
iface MIXER
name 'Mono Playback Volume'
- value 115
+ value 121
}
control.6 {
comment.access 'read write'
@@ -85,7 +85,7 @@ state.neo1973gta02 {
iface MIXER
name 'Headphone Playback ZC Switch'
value.0 false
- value.1 true
+ value.1 false
}
control.10 {
comment.access 'read write'
@@ -94,7 +94,7 @@ state.neo1973gta02 {
iface MIXER
name 'Speaker Playback ZC Switch'
value.0 false
- value.1 true
+ value.1 false
}
control.11 {
comment.access 'read write'
@@ -103,7 +103,7 @@ state.neo1973gta02 {
comment.range '0 - 7'
iface MIXER
name 'Mono Bypass Playback Volume'
- value 3
+ value 2
}
control.12 {
comment.access 'read write'
@@ -112,7 +112,7 @@ state.neo1973gta02 {
comment.range '0 - 7'
iface MIXER
name 'Mono Sidetone Playback Volume'
- value 1
+ value 2
}
control.13 {
comment.access 'read write'
@@ -121,7 +121,7 @@ state.neo1973gta02 {
comment.range '0 - 7'
iface MIXER
name 'Mono Voice Playback Volume'
- value 1
+ value 2
}
control.14 {
comment.access 'read write'
@@ -171,7 +171,7 @@ state.neo1973gta02 {
comment.range '0 - 15'
iface MIXER
name 'Treble Volume'
- value 7
+ value 0
}
control.19 {
comment.access 'read write'
@@ -209,8 +209,8 @@ state.neo1973gta02 {
comment.range '0 - 63'
iface MIXER
name 'Capture Volume'
- value.0 24
- value.1 24
+ value.0 23
+ value.1 23
}
control.23 {
comment.access 'read write'
@@ -276,7 +276,7 @@ state.neo1973gta02 {
comment.range '0 - 7'
iface MIXER
name 'ALC Capture Max Volume'
- value 1
+ value 7
}
control.30 {
comment.access 'read write'
@@ -288,7 +288,7 @@ state.neo1973gta02 {
comment.item.3 Stereo
iface MIXER
name 'ALC Capture Function'
- value Stereo
+ value Left
}
control.31 {
comment.access 'read write'
@@ -305,7 +305,7 @@ state.neo1973gta02 {
comment.range '0 - 15'
iface MIXER
name 'ALC Capture Hold Time'
- value 7
+ value 15
}
control.33 {
comment.access 'read write'
@@ -495,6 +495,16 @@ state.neo1973gta02 {
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
comment.item.0 'Mic 1'
comment.item.1 'Mic 2'
comment.item.2 'Mic 3'
@@ -502,7 +512,7 @@ state.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
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.neo1973gta02 {
name 'Out4 Mux'
value VREF
}
- control.71 {
+ control.72 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -692,7 +702,7 @@ state.neo1973gta02 {
name 'Out3 Mux'
value VREF
}
- control.72 {
+ control.73 {
comment.access 'read write'
comment.type ENUMERATED
comment.count 1
@@ -704,7 +714,7 @@ state.neo1973gta02 {
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.neo1973gta02 {
name 'Mono Mixer Left Playback Switch'
value false
}
- contro%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list