[oe-commits] org.oe.dev merge of '503b3ade200ad628a4b30fab228c365b8c0cf2ea'
Laibsch commit
openembedded-commits at lists.openembedded.org
Fri Jan 11 00:04:12 UTC 2008
merge of '503b3ade200ad628a4b30fab228c365b8c0cf2ea'
and '9910934c4f018cde20787ccaa558640752542098'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 171c5d74e25e7c161bf23648620a923e90cfcc5b
ViewMTN: http://monotone.openembedded.org/revision/info/171c5d74e25e7c161bf23648620a923e90cfcc5b
Files:
1
packages/roadmap/roadmap-gtk2-1.0.12
packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch
packages/roadmap/roadmap-gtk2_1.0.12.bb
packages/roadmap/zroadmap-1.0.12
packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch
packages/roadmap/zroadmap_1.0.12.bb
packages/alsa/alsa-state/fic-gta02
packages/jamvm/files
packages/alsa/alsa-state/fic-gta02/stereoout.state
packages/atk/atk_1.18.0.bb
packages/cacao/cacao-initial_0.98.bb
packages/cacao/cacao-native.inc
packages/cacao/cacao-native_0.98+hg20071001.bb
packages/cacao/files/cacao-0.98-initial.patch
packages/classpath/classpath-initial_0.93.bb
packages/classpath/classpath-native.inc
packages/classpath/classpath-native_0.96.1.bb
packages/classpath/files/gjar-prefix-patch.diff
packages/ecj/ecj-bootstrap-native_3.3.bb
packages/ecj/ecj-initial_3.3.bb
packages/ecj/files/ecj.in
packages/jamvm/files/jamvm_1.5.0-initial.patch
packages/jamvm/jamvm-initial_1.5.0.bb
packages/jikes/jikes-initial.bb
packages/roadmap/files/options.mk.patch
packages/roadmap/roadmap-gtk2.inc
conf/distro/include/sane-srcdates.inc
conf/machine/htcalpine.conf
conf/machine/htcapache.conf
conf/machine/htcblueangel.conf
conf/machine/htchimalaya.conf
conf/machine/htcsable.conf
conf/machine/htctornado.conf
conf/machine/include/motorola-ezx-base.inc
packages/agg/agg_2.5.bb
packages/alsa/alsa-state.bb
packages/atk/atk.inc
packages/atk/atk_1.19.3.bb
packages/atk/atk_1.20.0.bb
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/evas_cvs.bb
packages/jikes/jikes-native_1.21.bb
packages/linux/linux-openmoko.inc
packages/openjade/openjade-native_1.3.2.bb
packages/python/python-efl.bb
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/tasks/task-base.bb
packages/tasks/task-openmoko-feed.bb
mtn:execute
true
conf/machine/include/collie-2.6.inc
conf/machine/include/qemu.inc
conf/machine/include/zaurus-2.6.inc
packages/qpf-fonts/qpf-unismall_1.0.0.bb
packages/ttf-fonts/ttf.inc
Diffs:
#
# mt diff -r503b3ade200ad628a4b30fab228c365b8c0cf2ea -r171c5d74e25e7c161bf23648620a923e90cfcc5b
#
#
#
# delete "packages/roadmap/roadmap-gtk2-1.0.12"
#
# delete "packages/roadmap/roadmap-gtk2-1.0.12/roadgps.desktop.patch"
#
# delete "packages/roadmap/roadmap-gtk2_1.0.12.bb"
#
# delete "packages/roadmap/zroadmap-1.0.12"
#
# delete "packages/roadmap/zroadmap-1.0.12/qt2-fixes.patch"
#
# delete "packages/roadmap/zroadmap_1.0.12.bb"
#
# add_dir "packages/alsa/alsa-state/fic-gta02"
#
# add_dir "packages/jamvm/files"
#
# add_file "packages/alsa/alsa-state/fic-gta02/stereoout.state"
# content [06a189b603f6d13c25deef4e6ce740cff913063d]
#
# add_file "packages/atk/atk_1.18.0.bb"
# content [6463d96261a3b8f2e0e94b0d20d548719c0bd883]
#
# add_file "packages/cacao/cacao-initial_0.98.bb"
# content [154e9de597ec6ab475c760aca2814514979356ea]
#
# add_file "packages/cacao/cacao-native.inc"
# content [cc20995498c174c9ac504a54e5d844cfddfb8f3f]
#
# add_file "packages/cacao/cacao-native_0.98+hg20071001.bb"
# content [b087b9a24b9593dfff241d8dbafef831492c316b]
#
# add_file "packages/cacao/files/cacao-0.98-initial.patch"
# content [0ae2a924095b58fa9168774fc8b8a24c6093e87f]
#
# add_file "packages/classpath/classpath-initial_0.93.bb"
# content [dcbd137250c9fd6e2ca0ca88afc7404e9ede289c]
#
# add_file "packages/classpath/classpath-native.inc"
# content [ce05671105e08fb6217f1907cf4202d41ebfd512]
#
# add_file "packages/classpath/classpath-native_0.96.1.bb"
# content [8b956ee477f32cf28c75a7cd39e9e85373378164]
#
# add_file "packages/classpath/files/gjar-prefix-patch.diff"
# content [d511884813b1b0a0b7ea1f16e8e11c32981eb117]
#
# add_file "packages/ecj/ecj-bootstrap-native_3.3.bb"
# content [defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3]
#
# add_file "packages/ecj/ecj-initial_3.3.bb"
# content [b410a403c3f29b5239ebde0751e23e02f0d3409a]
#
# add_file "packages/ecj/files/ecj.in"
# content [ded1ab42bf6383b2789b01c1f98beeb3a909507f]
#
# add_file "packages/jamvm/files/jamvm_1.5.0-initial.patch"
# content [91a98ee8f2d7c025af1263c9f0e20fc020521ed2]
#
# add_file "packages/jamvm/jamvm-initial_1.5.0.bb"
# content [08d6c4fd24b6e2bf4ac4e75a896b575f9431bfa4]
#
# add_file "packages/jikes/jikes-initial.bb"
# content [acb7ab273c93fa5264bb5d431ef94cf91cb08c8b]
#
# add_file "packages/roadmap/files/options.mk.patch"
# content [400094f1965f7aa3f864a63465d0fbe56e3ca672]
#
# add_file "packages/roadmap/roadmap-gtk2.inc"
# content [fc58e3e70037346d52758067318eda8023e6b2be]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3]
# to [0ee8e930339f1d201ab01060c7de4f6f0e484056]
#
# patch "conf/machine/htcalpine.conf"
# from [802992dbe7902b4d3b3dc7d58c62c2fce6db5692]
# to [d9eb3484a7d4708398e7ed6363886431d2a18272]
#
# patch "conf/machine/htcapache.conf"
# from [e42671ae241f36191c65cf0e671acc0be0ba3d34]
# to [ca163a8e6f831653e8481d29e6ef8b5d1eb23b00]
#
# patch "conf/machine/htcblueangel.conf"
# from [bd67f8166ed61397dc7eacf52aa56206eec3dcf1]
# to [837449c1b0b449905bc94987d63ef6f4d228bb45]
#
# patch "conf/machine/htchimalaya.conf"
# from [5b5a7a0c10307d5ac09035f291fcd391ad86c991]
# to [73cbb2f34e2fb3caf0f42900bcbcf25323263b61]
#
# patch "conf/machine/htcsable.conf"
# from [1c17d91980d832248cff034b882d033d426d3adf]
# to [927960fd249d91ee81b56058c47bdd07574fdee0]
#
# patch "conf/machine/htctornado.conf"
# from [979eaba253df13d5af8e9713eaf8db9ed45856b6]
# to [d94f1b46c1521fbd051ceb07c9cc2ec9bd5cb55b]
#
# patch "conf/machine/include/motorola-ezx-base.inc"
# from [f5993e521de6d914bfbeae8f9176fb7d1f227f3c]
# to [d5cfb7d52855969fe44f35731389ab20bbe67a0e]
#
# patch "packages/agg/agg_2.5.bb"
# from [5441580bb562201cc3991bc4ff439dbf07fde4c4]
# to [afcd52de254ae4cb5f6968371a8c1cd669a753e2]
#
# patch "packages/alsa/alsa-state.bb"
# from [01b3bf425533199f948a122a8612b2535773c47b]
# to [d202502c4b3f8321632d5a88e8bc689646ea6f87]
#
# patch "packages/atk/atk.inc"
# from [c823ee3d1af4afa6bcb287e03e6765369bb78fbd]
# to [2ab6e52b88194beb2fc9643f544884ef33c8b4df]
#
# patch "packages/atk/atk_1.19.3.bb"
# from [e94d8f3fd021065300ad78c840ea3acacdb490d8]
# to [1f58a60fd41519a232f589cdad8fe7d264e9ace7]
#
# patch "packages/atk/atk_1.20.0.bb"
# from [190d05cefc4412792de79e5b9d1dc0f11194d0a3]
# to [be154613042709df815d16321052604d12fbc5e4]
#
# patch "packages/efl1/ecore-native_cvs.bb"
# from [ee1cbaae633a563dca59af7fa44f9ffc26267d24]
# to [4a00d1d0cad23d61b7411ae50b847f83086398ce]
#
# patch "packages/efl1/ecore.inc"
# from [a23578418f9709d9270c1064bb6e9c82c205d509]
# to [5ef6dea417efa9f7631ce9cec1d293af7ba5a110]
#
# patch "packages/efl1/ecore_cvs.bb"
# from [beca187339858acf3df078a145b9583c19f8fbb7]
# to [34fa2c31d706db70d37636189c65cd730d33abc0]
#
# patch "packages/efl1/evas_cvs.bb"
# from [26e997cd12f7bb18a715bc41e044c55a98858c6c]
# to [90e74de5f2fa3fd6a8b49a0bee9105d6ce33103a]
#
# patch "packages/jikes/jikes-native_1.21.bb"
# from [1259d32e2a9d8f19824f3284c5c62601c2dd947b]
# to [ceee4d931ba6e74ba4e24d312663180e70c0db0d]
#
# patch "packages/linux/linux-openmoko.inc"
# from [26ac1c3cd91125014bb4e3b9e4f80b93fc877ccb]
# to [6f24382b0e0681456daf075975f293e1e06b0fb2]
#
# patch "packages/openjade/openjade-native_1.3.2.bb"
# from [a52f31c28f7c08278c660f313341d184d1b82c61]
# to [fe4d7272d3a91055775804bedf2ab7af3fcc45f2]
#
# patch "packages/python/python-efl.bb"
# from [38e140ae1f0addeb5ff6e307653bfd5032f4df82]
# to [8b8f8c4398b8e55f47a8ca673a71204a3e86d9f0]
#
# patch "packages/roadmap/roadmap-gtk2_1.1.0.bb"
# from [2c80d0c130f7c15041a33dfcbc36486ffb5c6a6d]
# to [bf65c63e6c550a015ebf7d3afe59f77c139cc5f3]
#
# patch "packages/roadmap/roadmap-gtk2_cvs.bb"
# from [511a10a8453ed27a0df812a48cdcba14f90788e9]
# to [2790f799a13355e4ee5e15d33a9b0c737fde2269]
#
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
# from [734832bdee53cde56e75155ac50c7f9aaa55bfe0]
# to [b70cba0c2b41cdc634eb88c2b47dabab343b316a]
#
# patch "packages/tasks/task-base.bb"
# from [797b15619704c023c1e4777ddc0474fcea386fcd]
# to [2ef7c7b6aa8d583973deb733c4c4ea6efdffe5eb]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [f61aabaafd0d0b2ab728612f541ce6b90b4d5682]
# to [ae8c99389ab3bc3c8f94dfedf504e3829a6cd608]
#
# set "packages/ecj/files/ecj.in"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/alsa/alsa-state/fic-gta02/stereoout.state 06a189b603f6d13c25deef4e6ce740cff913063d
+++ packages/alsa/alsa-state/fic-gta02/stereoout.state 06a189b603f6d13c25deef4e6ce740cff913063d
@@ -0,0 +1,875 @@
+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 255
+ value.1 255
+ }
+ 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 121
+ value.1 121
+ }
+ control.4 {
+ 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.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 false
+ value.1 false
+ }
+ 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 true
+ }
+ 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 Off
+ }
+ 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
+ }
+ control.50 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count 1
+ comment.item.0 'DAI 0'
+ comment.item.1 'DAI 1'
+ comment.item.2 'DAI 2'
+ comment.item.3 'DAI 3'
+ iface MIXER
+ name 'DAI Mode'
+ value 'DAI 0'
+ }
+ control.51 {
+ comment.access 'read write'
+ comment.type ENUMERATED
+ comment.count%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r9910934c4f018cde20787ccaa558640752542098 -r171c5d74e25e7c161bf23648620a923e90cfcc5b
#
#
#
# patch "conf/machine/include/collie-2.6.inc"
# from [a71f2479ea4e652346eccf4594034af29bb74651]
# to [cc7c687162b52882f755a8824e1a07762b725aca]
#
# patch "conf/machine/include/qemu.inc"
# from [298c9ee68a35039a8a520bff72b70c1f9f939c4a]
# to [f4d52db83b15750777ba577b34575b3260213b7c]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [7ecb352669b5b71228489192cdeb5826dc02b46a]
# to [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
#
# patch "packages/qpf-fonts/qpf-unismall_1.0.0.bb"
# from [741c55eb9c92ef7b6cdcbb362c71275e527da262]
# to [a0687b8d3aa7109652db6607c32dd8d9f959e12f]
#
# patch "packages/ttf-fonts/ttf.inc"
# from [fb8c05c470eee88f979bd7425e143a351654635a]
# to [2a846550f80db27429faf862405989761d2e4243]
#
============================================================
--- conf/machine/include/collie-2.6.inc a71f2479ea4e652346eccf4594034af29bb74651
+++ conf/machine/include/collie-2.6.inc cc7c687162b52882f755a8824e1a07762b725aca
@@ -6,28 +6,3 @@ MACHINE_POSTPROCESS_COMMAND = "zaurus_ma
MACHINE_EXTRA_RDEPENDS = "kernel-modules"
MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
-
-zaurus_make_installkit () {
- cd ${DEPLOY_DIR_IMAGE}
- rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
- mkdir ${IMAGE_NAME}-installkit/
- # Get the latest kernel using the zImage-<machine>.bin symlink
- cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
- if [ "${MACHINE}" = "spitz" ]; then
- cp gnu-tar ${IMAGE_NAME}-installkit/
- cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
- else
- [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
- fi
-
- # All zaurus machines except collie need updater.sh
- if [ "${MACHINE}" != "collie" ]; then
- cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
- fi
-
- tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
- md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
- rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
-}
-
-
============================================================
--- conf/machine/include/qemu.inc 298c9ee68a35039a8a520bff72b70c1f9f939c4a
+++ conf/machine/include/qemu.inc f4d52db83b15750777ba577b34575b3260213b7c
@@ -1,7 +1,6 @@ GUI_MACHINE_CLASS = "bigscreen"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
============================================================
--- conf/machine/include/zaurus-2.6.inc 7ecb352669b5b71228489192cdeb5826dc02b46a
+++ conf/machine/include/zaurus-2.6.inc 7d4d7255328d5d3f3d61e09ec7b527085533b4d6
@@ -49,7 +49,7 @@ zaurus_make_installkit () {
mkdir ${IMAGE_NAME}-installkit/
# Get the latest kernel using the zImage-<machine>.bin symlink
- cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+ cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
if [ "${MACHINE}" = "spitz" ]; then
cp gnu-tar ${IMAGE_NAME}-installkit/
============================================================
--- packages/qpf-fonts/qpf-unismall_1.0.0.bb 741c55eb9c92ef7b6cdcbb362c71275e527da262
+++ packages/qpf-fonts/qpf-unismall_1.0.0.bb a0687b8d3aa7109652db6607c32dd8d9f959e12f
@@ -1,10 +1,10 @@ RPROVIDES = "virtual/japanese-font"
DESCRIPTION = "Lightweight Japanese font in 10 point suitable for 320x240 display"
SECTION = "opie/fonts"
PRIORITY = "optional"
LICENSE = "GPL"
HOMEPAGE = "http://sourceforge.jp/projects/zaurus-ja/"
RPROVIDES = "virtual/japanese-font"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://osdn.dl.sourceforge.jp/zaurus-ja/773/unismall-${PV}.tar.gz"
@@ -22,3 +22,5 @@ inherit qpf
}
inherit qpf
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/ttf-fonts/ttf.inc fb8c05c470eee88f979bd7425e143a351654635a
+++ packages/ttf-fonts/ttf.inc 2a846550f80db27429faf862405989761d2e4243
@@ -1,4 +1,4 @@
-SECTION = "x11/fonts"
+SECTION = "fonts"
PRIORITY = "optional"
PACKAGE_ARCH = "all"
#DEPENDS = "fontconfig opie-ttf-support"
More information about the Openembedded-commits
mailing list