[oe-commits] org.oe.dev merge of '27a990a9e4bdc09a026f0125d6d771ab891d2156'
john_lee commit
oe at amethyst.openembedded.net
Fri Apr 25 15:40:35 UTC 2008
merge of '27a990a9e4bdc09a026f0125d6d771ab891d2156'
and '754b0cba2322be2fda45270a756d32e5e3eedb7a'
Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: 4e8fc928c91c0964c0e9bae0acf10a680372f9d9
ViewMTN: http://monotone.openembedded.org/revision/info/4e8fc928c91c0964c0e9bae0acf10a680372f9d9
Files:
1
packages/qtopia-phone/qtopia-phone-x11/qtopia.sh
packages/alsa/alsa-state/fic-gta01/asound.state
packages/alsa/alsa-state/fic-gta01/capturehandset.state
packages/alsa/alsa-state/fic-gta01/captureheadset.state
packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state
packages/alsa/alsa-state/fic-gta01/gsmhandset.state
packages/alsa/alsa-state/fic-gta01/gsmheadset.state
packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state
packages/alsa/alsa-state/fic-gta01/stereoout.state
packages/alsa/alsa-state/fic-gta01/voip-handset.state
packages/alsa/alsa-state/fic-gta01/voip-headset.state
packages/efl1/edbus_cvs.bb
packages/efl1/exml_cvs.bb
packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
packages/openmoko2/openmoko-session2.bb
Diffs:
#
# mt diff -r27a990a9e4bdc09a026f0125d6d771ab891d2156 -r4e8fc928c91c0964c0e9bae0acf10a680372f9d9
#
#
#
# add_file "packages/qtopia-phone/qtopia-phone-x11/qtopia.sh"
# content [c955894686aae5510c5b36db674c9f457416616c]
#
# patch "packages/alsa/alsa-state/fic-gta01/asound.state"
# from [1caaafe9a0c00ae1dd0487d2cbb65dd85e68c043]
# to [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# patch "packages/alsa/alsa-state/fic-gta01/capturehandset.state"
# from [3d006b5dd4cd49bd5200ef7265aea7707a94742d]
# to [e9daf2ba483a71ce163925f4f8123f9b21fae829]
#
# patch "packages/alsa/alsa-state/fic-gta01/captureheadset.state"
# from [8d61d9d7df8eeca1b6d6b869e34092846cd6255d]
# to [c2a0fa104836312145b8705962462a0ab4f9049a]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state"
# from [3675af3b763a03a1931c72f602dcf9c10785d352]
# to [8f6dd94826572a3e21eb710a31de17c94b4ff6e5]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmhandset.state"
# from [e26913ea8ef767872f2a1bed7529a897a38a0528]
# to [88e380e6c174c2c8e0d067f5f3bf5cc23d9279a9]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmheadset.state"
# from [81f4f5e844fcec82dba762247aa29f3d0fcb49d7]
# to [d136d1e7e79a80885e9b7a0a03c442fdc032cc61]
#
# patch "packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state"
# from [bd1a1a0426f6ee33355f8a327e980e6dfea4b84e]
# to [534365ba106105f05e94a03aea74c9c6da59a017]
#
# patch "packages/alsa/alsa-state/fic-gta01/stereoout.state"
# from [1caaafe9a0c00ae1dd0487d2cbb65dd85e68c043]
# to [24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28]
#
# patch "packages/alsa/alsa-state/fic-gta01/voip-handset.state"
# from [c5b60d82c1897991c9945ce182c4b0ffca5a9d12]
# to [4d28d6e6a2f7c934263fadf690327fe6208168fd]
#
# patch "packages/alsa/alsa-state/fic-gta01/voip-headset.state"
# from [6e7478155fdc57345e3112db7c8de2755a5e931e]
# to [9693cce22afbd9cb814e2f71ff566df3306c8649]
#
# patch "packages/efl1/edbus_cvs.bb"
# from [132848ec2182987753b4827a0c27d567ca12cce7]
# to [3c44c1091be07a94b0aeebd75bf2d9693bdb0298]
#
# patch "packages/efl1/exml_cvs.bb"
# from [2564777dc378cdf2b521b0e39fe35257f04e8314]
# to [36dc5bf1bc769d147967195abcd043d4bce849c6]
#
# patch "packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia"
# from [a8d4a67e0c7769a5e892d61f199fcb66eb0a671a]
# to [8aa8d733fbdbb97a512816a89d64a38de5d7ca55]
#
# patch "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf"
# from [47f4986691cbfef366a68a69bf18b72b28cbc6a9]
# to [1837587a445fc55215e998d2aeaaf17942dbb91f]
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [0d30f0e2f203011597df480fb0ec8c0bd4d438ba]
# to [3499b3560c9eb16353ef331101f9fa2075374572]
#
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/qtopia.sh c955894686aae5510c5b36db674c9f457416616c
+++ packages/qtopia-phone/qtopia-phone-x11/qtopia.sh c955894686aae5510c5b36db674c9f457416616c
@@ -0,0 +1,4 @@
+#!/bin/sh
+export QPEDIR=/opt/Qtopia
+export PATH=$PATH=$QPEDIR/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QPEDIR/lib
============================================================
--- packages/alsa/alsa-state/fic-gta01/asound.state 1caaafe9a0c00ae1dd0487d2cbb65dd85e68c043
+++ packages/alsa/alsa-state/fic-gta01/asound.state 24c88d006bc4b79644d0fd7d8c92b27d5b3d3c28
@@ -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
============================================================
--- packages/alsa/alsa-state/fic-gta01/capturehandset.state 3d006b5dd4cd49bd5200ef7265aea7707a94742d
+++ packages/alsa/alsa-state/fic-gta01/capturehandset.state e9daf2ba483a71ce163925f4f8123f9b21fae829
@@ -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 {
co%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r754b0cba2322be2fda45270a756d32e5e3eedb7a -r4e8fc928c91c0964c0e9bae0acf10a680372f9d9
#
#
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [ec58d62219eb5fa1b3bed5608b3790a16aaba3cd]
# to [26ae36265f0efa54a6da1e33133c200e862bba74]
#
============================================================
--- packages/openmoko2/openmoko-session2.bb ec58d62219eb5fa1b3bed5608b3790a16aaba3cd
+++ packages/openmoko2/openmoko-session2.bb 26ae36265f0efa54a6da1e33133c200e862bba74
@@ -1,10 +1,10 @@ SECTION = "x11"
DESCRIPTION = "Custom Matchbox session files for OpenMoko"
LICENSE = "GPL"
SECTION = "x11"
-RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
+RDEPENDS = "matchbox-panel-2"
RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
RCONFLICTS_${PN} = "openmoko-session matchbox-common"
-PR = "r64"
+PR = "r65"
SRC_URI = "\
file://etc \
More information about the Openembedded-commits
mailing list