[oe-commits] org.oe.dev merge of '334f1ee81c31102eb71d125911c2b1de3f3804d2'
crofton commit
openembedded-commits at lists.openembedded.org
Mon Sep 17 19:26:47 UTC 2007
merge of '334f1ee81c31102eb71d125911c2b1de3f3804d2'
and 'e9a6786ef2e7a6c087283a96dd0a224bae8a9927'
Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: aa794d08e1cb6a4c86e5d72f46667ad1f4332813
ViewMTN: http://monotone.openembedded.org/revision/info/aa794d08e1cb6a4c86e5d72f46667ad1f4332813
Files:
1
conf/machine/include/gumstix.inc
packages/gnome/libwnck_2.10.2.bb
packages/gnome/libwnck_2.12.1.bb
packages/gnome/libwnck_2.8.1.bb
packages/alsa/alsa-state/akita
packages/alsa/alsa-fpu.inc
packages/alsa/alsa-state/akita/asound.state
packages/linux/linux-openmoko-devel/printascii.patch
packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch
packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch
packages/alsa/alsa-lib_1.0.14.bb
packages/alsa/alsa-state/c7x0/asound.state
packages/alsa/alsa-state.bb
packages/gnome/libwnck_2.13.5.bb
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/gtk+/gtk+.inc
packages/gtk+/gtk+_2.12.0.bb
packages/linux/linux-openmoko-devel_svn.bb
packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/openmoko2/openmoko-sound-theme-standard2_svn.bb
packages/pkgconfig/pkgconfig.inc
Diffs:
#
# mt diff -r334f1ee81c31102eb71d125911c2b1de3f3804d2 -raa794d08e1cb6a4c86e5d72f46667ad1f4332813
#
#
#
# patch "conf/machine/include/gumstix.inc"
# from [a9b8b761a9a47e6df416c842987c359d772d4580]
# to [917537468325dc5643453f037aad76fbeb9bb147]
#
============================================================
--- conf/machine/include/gumstix.inc a9b8b761a9a47e6df416c842987c359d772d4580
+++ conf/machine/include/gumstix.inc 917537468325dc5643453f037aad76fbeb9bb147
@@ -12,6 +12,7 @@ module_autoload_g_ether = "g_ether"
module_autoload_mmc_block = "mmc_block"
module_autoload_gumstix_gadget = "gumstix_gadget"
module_autoload_g_ether = "g_ether"
+module_autoload_smc91x = "smc91x"
UBOOT_ENTRYPOINT = "a0008000"
@@ -20,6 +21,10 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian
EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash"
+# Install all kernel modules
+#MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-modules"
+
+# Install only selected kernel modules, comment out line above also
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \
kernel-module-rtc-core \
kernel-module-rtc-dev \
#
# mt diff -re9a6786ef2e7a6c087283a96dd0a224bae8a9927 -raa794d08e1cb6a4c86e5d72f46667ad1f4332813
#
#
#
# delete "packages/gnome/libwnck_2.10.2.bb"
#
# delete "packages/gnome/libwnck_2.12.1.bb"
#
# delete "packages/gnome/libwnck_2.8.1.bb"
#
# add_dir "packages/alsa/alsa-state/akita"
#
# add_file "packages/alsa/alsa-fpu.inc"
# content [45095284a3c8495d92d991a7651f06d033e745ea]
#
# add_file "packages/alsa/alsa-state/akita/asound.state"
# content [799c8bd0c2ed692f4558b6e6803920404254941a]
#
# add_file "packages/linux/linux-openmoko-devel/printascii.patch"
# content [e7cfe3969d58b5690e047b0ce584a1b841f2b494]
#
# add_file "packages/matchbox-keyboard/files/matchbox-keyboard-hide-delay.patch"
# content [d136e98d1e89f12fec85b8f247c99a11530c5a16]
#
# add_file "packages/pkgconfig/pkgconfig-0.22/sysroot-support.patch"
# content [d81ad979dfb003512eb32bfc73d71e68d07159fb]
#
# patch "packages/alsa/alsa-lib_1.0.14.bb"
# from [60431b66fbe642b84eebb662e02f977ce4cf8e9d]
# to [ec18e1786e732df88269f903aa646f5b8d1fc5e0]
#
# patch "packages/alsa/alsa-state/c7x0/asound.state"
# from [3a47c899cf3efa3d3a425936383fcf5da59476b0]
# to [95f37176e753dfc75b69c3360f4f163af24062fc]
#
# patch "packages/alsa/alsa-state.bb"
# from [69fceb77079fc74157e916309a95f6d27dc0998e]
# to [87b0604266eaf34469b6a192b574a846d8b290d5]
#
# patch "packages/gnome/libwnck_2.13.5.bb"
# from [e27ae70e709683b3a8e98a233980cfbd9dce7543]
# to [5a389262f2f82c0a1df0911dc237ff1497323bca]
#
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
# from [6b749d9ef772b8e60588711e9d902b4292a7e84b]
# to [3c5317edbfb2de05bfdcc53497f5a76d49e833db]
#
# patch "packages/gtk+/gtk+.inc"
# from [ffdca8e93dd38acb3bb2afdd28ab143a8438af91]
# to [96ca94f87b25f43f0517b4454a035d2d1c5e107c]
#
# patch "packages/gtk+/gtk+_2.12.0.bb"
# from [4b06154f496fb45640853f54b964720268a461de]
# to [08e63663afbf9b3a26edfaf43148e2e60683e7df]
#
# patch "packages/linux/linux-openmoko-devel_svn.bb"
# from [0c4e0a1a3b5984a92e7255acd3c74e12e71fd37f]
# to [caff0d74c55eaddbfbb6f991685014f4afe718f1]
#
# patch "packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb"
# from [c83b2518da5c8c31d03ed19d8aed54afa6d26d38]
# to [9a0b682073222bc2809e001ffe275c358bde77ed]
#
# patch "packages/openmoko2/openmoko-sound-system2_0.1.0.bb"
# from [d2d7385073d2de3086a6fc7137fa76d25390a2c1]
# to [2bbb752f84f5cd5d332df9a98b5ab1922ccc2320]
#
# patch "packages/openmoko2/openmoko-sound-theme-standard2_svn.bb"
# from [bfa0e09f44be1950d51c8251ab99fdf9fce69bea]
# to [8d7ac8b5a6221ab35c4c0a274a2edef6f114e8a9]
#
# patch "packages/pkgconfig/pkgconfig.inc"
# from [4721122cb57ad9aec15fca1982b594f2e74d5e95]
# to [9605cd8789e993b3b4b021d69e0e9ee94821a5a5]
#
============================================================
--- packages/alsa/alsa-fpu.inc 45095284a3c8495d92d991a7651f06d033e745ea
+++ packages/alsa/alsa-fpu.inc 45095284a3c8495d92d991a7651f06d033e745ea
@@ -0,0 +1,6 @@
+
+def get_alsa_fpu_setting(bb, d):
+ if bb.data.getVar('TARGET_FPU', d, 1) in [ 'soft' ]:
+ return "--with-softfloat"
+ return ""
+
============================================================
--- packages/alsa/alsa-state/akita/asound.state 799c8bd0c2ed692f4558b6e6803920404254941a
+++ packages/alsa/alsa-state/akita/asound.state 799c8bd0c2ed692f4558b6e6803920404254941a
@@ -0,0 +1,619 @@
+state.Spitz {
+ control.1 {
+ 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.2 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.3 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Capture Switch'
+ value.0 false
+ value.1 false
+ }
+ control.4 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Headphone Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.5 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 2
+ iface MIXER
+ name 'Speaker Playback ZC Switch'
+ value.0 false
+ value.1 false
+ }
+ control.6 {
+ 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 'Playback De-emphasis'
+ value None
+ }
+ control.7 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Normal
+ comment.item.1 'L Invert'
+ comment.item.2 'R Invert'
+ comment.item.3 'L + R Invert'
+ iface MIXER
+ name 'Capture Polarity'
+ value Normal
+ }
+ control.8 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback 6dB Attenuate'
+ value false
+ }
+ control.9 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Capture 6dB Attenuate'
+ value false
+ }
+ control.10 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 255'
+ iface MIXER
+ name 'PCM Volume'
+ value.0 255
+ value.1 255
+ }
+ control.11 {
+ 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.12 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '130Hz @ 48kHz'
+ comment.item.1 '200Hz @ 48kHz'
+ iface MIXER
+ name 'Bass Filter'
+ value '130Hz @ 48kHz'
+ }
+ control.13 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Bass Volume'
+ value 11
+ }
+ control.14 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'Treble Volume'
+ value 11
+ }
+ control.15 {
+ 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.16 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name '3D Switch'
+ value false
+ }
+ control.17 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name '3D Volume'
+ value 9
+ }
+ control.18 {
+ 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.19 {
+ 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.20 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Capture
+ comment.item.1 Playback
+ iface MIXER
+ name '3D Mode'
+ value Playback
+ }
+ control.21 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Target Volume'
+ value 3
+ }
+ control.22 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 7'
+ iface MIXER
+ name 'ALC Capture Max Volume'
+ value 7
+ }
+ control.23 {
+ 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.24 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture ZC Switch'
+ value false
+ }
+ control.25 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Hold Time'
+ value 0
+ }
+ control.26 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Decay Time'
+ value 3
+ }
+ control.27 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 15'
+ iface MIXER
+ name 'ALC Capture Attack Time'
+ value 2
+ }
+ control.28 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 31'
+ iface MIXER
+ name 'ALC Capture NG Threshold'
+ value 0
+ }
+ control.29 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 '2.2kHz'
+ comment.item.1 '1.5kHz'
+ iface MIXER
+ name 'ALC Capture NG Type'
+ value '2.2kHz'
+ }
+ control.30 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ALC Capture NG Switch'
+ value false
+ }
+ control.31 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 255'
+ iface MIXER
+ name 'Left ADC Capture Volume'
+ value 195
+ }
+ control.32 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 255'
+ iface MIXER
+ name 'Right ADC Capture Volume'
+ value 0
+ }
+ control.33 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'ZC Timeout Switch'
+ value false
+ }
+ control.34 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Playback Invert Switch'
+ value false
+ }
+ control.35 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Speaker Playback Invert Switch'
+ value true
+ }
+ control.36 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 3'
+ iface MIXER
+ name 'Mic Boost'
+ value.0 0
+ value.1 0
+ }
+ control.37 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Left Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.38 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Right Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.39 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 7'
+ iface MIXER
+ name 'Bypass Mono Playback Volume'
+ value.0 0
+ value.1 0
+ }
+ control.40 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Playback ZC Switch'
+ value false
+ }
+ control.41 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Headphone Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.42 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 2
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Speaker Playback Volume'
+ value.0 121
+ value.1 121
+ }
+ control.43 {
+ comment.access 'read write'
+ comment.type INTEGER
+ comment.count 1
+ comment.range '0 - 127'
+ iface MIXER
+ name 'Mono Playback Volume'
+ value 0
+ }
+ control.44 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Mono (Left)'
+ comment.item.2 'Mono (Right)'
+ comment.item.3 'Digital Mono'
+ iface MIXER
+ name 'Right ADC Mux'
+ value 'Mono (Left)'
+ }
+ control.45 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Stereo
+ comment.item.1 'Mono (Left)'
+ comment.item.2 'Mono (Right)'
+ comment.item.3 'Digital Mono'
+ iface MIXER
+ name 'Left ADC Mux'
+ value 'Mono (Left)'
+ }
+ control.46 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ iface MIXER
+ name 'Differential Mux'
+ value 'Line 1'
+ }
+ control.47 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 VREF
+ comment.item.1 'ROUT1 + Vol'
+ comment.item.2 MonoOut
+ comment.item.3 ROUT1
+ iface MIXER
+ name 'Out3 Mux'
+ value VREF
+ }
+ control.48 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ comment.item.2 'Line 3'
+ comment.item.3 PGA
+ comment.item.4 Differential
+ iface MIXER
+ name 'Right Line Mux'
+ value 'Line 2'
+ }
+ control.49 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ comment.item.2 'Line 3'
+ comment.item.3 PGA
+ comment.item.4 Differential
+ iface MIXER
+ name 'Left Line Mux'
+ value 'Line 1'
+ }
+ control.50 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ comment.item.2 'Line 3'
+ comment.item.3 Differential
+ iface MIXER
+ name 'Right PGA Mux'
+ value 'Line 2'
+ }
+ control.51 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'Line 1'
+ comment.item.1 'Line 2'
+ comment.item.2 'Line 3'
+ comment.item.3 Differential
+ iface MIXER
+ name 'Left PGA Mux'
+ value 'Line 1'
+ }
+ control.52 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Left Playback Switch'
+ value false
+ }
+ control.53 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Left Bypass Switch'
+ value false
+ }
+ control.54 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Right Playback Switc'
+ value false
+ }
+ control.55 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Mono Mixer Right Bypass Switch'
+ value false
+ }
+ control.56 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Left Playback Switc'
+ value false
+ }
+ control.57 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Left Bypass Switch'
+ value false
+ }
+ control.58 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Playback Switch'
+ value true
+ }
+ control.59 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Right Mixer Right Bypass Switch'
+ value false
+ }
+ control.60 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Playback Switch'
+ value true
+ }
+ control.61 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Left Bypass Switch'
+ value false
+ }
+ control.62 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Right Playback Switc'
+ value false
+ }
+ control.63 {
+ comment.access 'read write'
+ comment.type BOOLEAN
+ comment.count 1
+ iface MIXER
+ name 'Left Mixer Right Bypass Switch'
+ value false
+ }
+ control.64 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 Headphone
+ comment.item.1 Mic
+ comment.item.2 Line
+ comment.item.3 Headset
+ comment.item.4 Off
+ iface MIXER
+ name 'Jack Function'
+ value Off
+ }
+ control.65 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 On
+ comment.item.1 Off
+ iface MIXER
+ name 'Speaker Function'
+ value On
+ }
+}
============================================================
--- packages/linux/linux-openmoko-devel/printascii.patch e7cfe3969d58b5690e047b0ce584a1b841f2b494
+++ packages/linux/linux-openmoko-devel/printascii.patch e7cfe3969d58b5690e047b0ce584a1b841f2b494
@@ -0,0 +1,12 @@
+Index: linux-2.6.22.5/kernel/printk.c
+===================================================================
+--- linux-2.6.22.5.orig/kernel/printk.c
++++ linux-2.6.22.5/kernel/printk.c
+@@ -535,6 +535,7 @@ asmlinkage int vprintk(const char *fmt,
+
+ /* Emit the o%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list