[oe-commits] org.oe.dev merge of '3a9c0f4a00528662d37b097973dd3b51287562c4'
florian commit
openembedded-commits at lists.openembedded.org
Tue Jan 15 16:13:26 UTC 2008
merge of '3a9c0f4a00528662d37b097973dd3b51287562c4'
and '841845db4cfff04ccff4ec075f181561fb3ad63f'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: e1ff6c067cf71593cf346579bbde3ddb8880cc0c
ViewMTN: http://monotone.openembedded.org/revision/info/e1ff6c067cf71593cf346579bbde3ddb8880cc0c
Files:
1
packages/navit/files/compile-fix.patch
packages/navit/navit_0.0.1.bb
packages/navit/navit_0.0.2.bb
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/linux/linux-2.6.22.6/mx31moboard
packages/netbase/netbase/mx31moboard
packages/supertux/files
conf/machine/mx31moboard.conf
packages/alsa/alsa-state/fic-gta02/asound.state
packages/alsa/alsa-state/fic-gta02/stereoout.state
packages/gcc/gcc-cross-sdk_4.2.2.bb
packages/gtk+/gtk+-2.10.14/small-gtkfilechooser.patch
packages/linux/linux-2.6.22.6/mx31moboard/defconfig
packages/netbase/netbase/mx31moboard/interfaces
packages/roadmap/files/options.mk.patch
packages/roadmap/roadmap-gtk2.inc
packages/supertux/files/supertux.png
classes/sanity.bbclass
classes/sdl.bbclass
conf/distro/include/angstrom-2007-preferred-versions.inc
conf/distro/include/angstrom.inc
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.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/collie-2.6.inc
conf/machine/include/motorola-ezx-base.inc
conf/machine/include/qemu.inc
conf/machine/include/zaurus-2.6.inc
packages/agg/agg_2.5.bb
packages/alsa/alsa-state.bb
packages/efl1/ecore-native_cvs.bb
packages/efl1/ecore.inc
packages/efl1/ecore_cvs.bb
packages/efl1/evas_cvs.bb
packages/gtk+/gtk+_2.10.14.bb
packages/images/opie-image-16mb.bb
packages/images/opie-image.bb
packages/linux/linux-openmoko/gta02-sound.patch
packages/linux/linux-openmoko.inc
packages/linux/linux-openmoko_2.6.22.5.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-collie
packages/linux/linux-rp.inc
packages/linux/linux_2.6.22.6.bb
packages/navit/navit.inc
packages/navit/navit_0.0.3.bb
packages/navit/navit_cvs.bb
packages/openjade/openjade-native_1.3.2.bb
packages/python/python-efl.bb
packages/qpf-fonts/qpf-unismall_1.0.0.bb
packages/roadmap/roadmap-gtk2_1.1.0.bb
packages/roadmap/roadmap-gtk2_cvs.bb
packages/supertux/supertux_0.1.2.bb
packages/tasks/task-base.bb
packages/tasks/task-openmoko-feed.bb
packages/ttf-fonts/ttf.inc
mtn:manual_merge
true
packages/gpephone/addressbook_svn.bb
packages/gpephone/contact_svn.bb
packages/gpephone/firewall_svn.bb
packages/gpephone/gpe-applauncher_svn.bb
packages/gpephone/libabenabler2_svn.bb
packages/gpephone/libabenabler_svn.bb
packages/gpephone/libcalenabler2_svn.bb
packages/gpephone/libmsgenabler_1.0.bb
packages/gpephone/librecord2_svn.bb
packages/gpephone/libsettings_svn.bb
packages/gpephone/machined_svn.bb
packages/gpephone/ptim-engine_svn.bb
packages/gpephone/ptim-headers_svn.bb
packages/gpephone/ptim-helper_svn.bb
packages/gpephone/ptim-manager_svn.bb
packages/gpephone/quickdial_svn.bb
packages/gpephone/useen_svn.bb
Diffs:
#
# mt diff -r3a9c0f4a00528662d37b097973dd3b51287562c4 -re1ff6c067cf71593cf346579bbde3ddb8880cc0c
#
#
#
# delete "packages/navit/files/compile-fix.patch"
#
# delete "packages/navit/navit_0.0.1.bb"
#
# delete "packages/navit/navit_0.0.2.bb"
#
# 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/linux/linux-2.6.22.6/mx31moboard"
#
# add_dir "packages/netbase/netbase/mx31moboard"
#
# add_dir "packages/supertux/files"
#
# add_file "conf/machine/mx31moboard.conf"
# content [4fbbc4efbfa3c6a7e53d028698e453da918a952c]
#
# add_file "packages/alsa/alsa-state/fic-gta02/asound.state"
# content [1757352784f5374c1f573a503aae63c17415a14a]
#
# add_file "packages/alsa/alsa-state/fic-gta02/stereoout.state"
# content [1757352784f5374c1f573a503aae63c17415a14a]
#
# add_file "packages/gcc/gcc-cross-sdk_4.2.2.bb"
# content [8ef30993fffbbd19108406cd37d0b36449e5143d]
#
# add_file "packages/gtk+/gtk+-2.10.14/small-gtkfilechooser.patch"
# content [771b5f95c8458b42a196b4b69130f7954dadfe6d]
#
# add_file "packages/linux/linux-2.6.22.6/mx31moboard/defconfig"
# content [f34bbca781351493141d2ae81b724e47a950b9ac]
#
# add_file "packages/netbase/netbase/mx31moboard/interfaces"
# content [54e9b7d4b6227cfd47e2a88d7fe76e1f12f56795]
#
# add_file "packages/roadmap/files/options.mk.patch"
# content [400094f1965f7aa3f864a63465d0fbe56e3ca672]
#
# add_file "packages/roadmap/roadmap-gtk2.inc"
# content [fc58e3e70037346d52758067318eda8023e6b2be]
#
# add_file "packages/supertux/files/supertux.png"
# content [daa562a438fed2ba9a887bdc0f6e98b0b024d5e4]
#
# patch "classes/sanity.bbclass"
# from [c93bcb7294008f5c9b589ee59a39efbdb9a82616]
# to [ebf6cc13d544c4d677c13e3ea8dd18655c21e172]
#
# patch "classes/sdl.bbclass"
# from [3ddeb18d45e65c5c010d546459991244e42573ea]
# to [5f1c659d9ecfa56214c29c1ef56adb91b4aab3d0]
#
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
# from [b63adaffd19f973e76be44bc0544e96ff3e9c602]
# to [cb176be489c8cc84cc322cac2f96f85758f594fe]
#
# patch "conf/distro/include/angstrom.inc"
# from [6d2902857b621e681b3f0d4780dcd51ee236074e]
# to [d7101c0944e02681c38c2ba79d8a78e3d4005df9]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [cfb2470633befb35503cc4ec17fdc9cf0aa0e3f3]
# to [0ee8e930339f1d201ab01060c7de4f6f0e484056]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [6d7b2bbfb57a80d4d3d27fe559300eeca5f0af22]
# to [19eeddbb17547a5f563e66f8bdc1c1baf1c8a54b]
#
# 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/collie-2.6.inc"
# from [a71f2479ea4e652346eccf4594034af29bb74651]
# to [2858f44a6c2ce67dc7346721a699db944961f936]
#
# patch "conf/machine/include/motorola-ezx-base.inc"
# from [f5993e521de6d914bfbeae8f9176fb7d1f227f3c]
# to [d5cfb7d52855969fe44f35731389ab20bbe67a0e]
#
# patch "conf/machine/include/qemu.inc"
# from [298c9ee68a35039a8a520bff72b70c1f9f939c4a]
# to [f4d52db83b15750777ba577b34575b3260213b7c]
#
# patch "conf/machine/include/zaurus-2.6.inc"
# from [7ecb352669b5b71228489192cdeb5826dc02b46a]
# to [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
#
# patch "packages/agg/agg_2.5.bb"
# from [5441580bb562201cc3991bc4ff439dbf07fde4c4]
# to [afcd52de254ae4cb5f6968371a8c1cd669a753e2]
#
# patch "packages/alsa/alsa-state.bb"
# from [01b3bf425533199f948a122a8612b2535773c47b]
# to [790f2ce45c0d7d9471cb29f1a157071adb29ea3b]
#
# 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/gtk+/gtk+_2.10.14.bb"
# from [04c9956cab18c353c456a1340133ce32f3ec30af]
# to [3313c2f35c6f628c61f3ba5b11f173ecd26a3a8d]
#
# patch "packages/images/opie-image-16mb.bb"
# from [3a0a66249e372569c26b37c7367ab42831e5d656]
# to [1228a8f171a2b91c0604a288575a91fcdf3d258c]
#
# patch "packages/images/opie-image.bb"
# from [eab510fa58a1cbe34c8c15ea7cacb18bf5bd9d92]
# to [a1c62875ee2fbe52f0ba014c4931559c768b671c]
#
# patch "packages/linux/linux-openmoko/gta02-sound.patch"
# from [dc9eb450c1546c84d1510d4b606a7ae621abedeb]
# to [1a85c8c783ad6d9988742415b3ac93ea2fb1e9d2]
#
# patch "packages/linux/linux-openmoko.inc"
# from [26ac1c3cd91125014bb4e3b9e4f80b93fc877ccb]
# to [6f24382b0e0681456daf075975f293e1e06b0fb2]
#
# patch "packages/linux/linux-openmoko_2.6.22.5.bb"
# from [10ba1238090620db23914c0dccd22badc39f2ce4]
# to [48a109b0b7e850da45a142398cd214191154e96e]
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc0+git/defconfig-collie"
# from [1d0a3e54d0540b9d7fb266e65df279c450fcc317]
# to [f8c89cefc2aacd273421cdd6abb162f6197a7640]
#
# patch "packages/linux/linux-rp.inc"
# from [fae5978f66ce47eb9bd8319f1cd9e61ed9288f26]
# to [8510326c44fc879b7ce77ca7c20f62ab901eae48]
#
# patch "packages/linux/linux_2.6.22.6.bb"
# from [33440b039d1b3f79c8cee378f99b407bc4ea9b53]
# to [7d7b7a022c79819fa6c66941604363b05407cb5a]
#
# patch "packages/navit/navit.inc"
# from [dc36e11d9155034cfe2c407959f0b757b5a483de]
# to [4e36ed086e689535bed08a5953f1f330300dc53f]
#
# patch "packages/navit/navit_0.0.3.bb"
# from [1127602c440a00440088e7587bf88d3c760f05c4]
# to [15b167521e9d10044612c9a9841fd32e13f97363]
#
# patch "packages/navit/navit_cvs.bb"
# from [d22f4f689826ebf7d008a0bc66a88d56cc149e05]
# to [08dc55cf2a02719d9345a11b1fac91807d8b2e86]
#
# 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/qpf-fonts/qpf-unismall_1.0.0.bb"
# from [741c55eb9c92ef7b6cdcbb362c71275e527da262]
# to [a0687b8d3aa7109652db6607c32dd8d9f959e12f]
#
# 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/supertux/supertux_0.1.2.bb"
# from [12d13fa1dc913ca88c429f0d90490f3735b10534]
# to [710259857ec8d40cec2249206236924a3d8eb42c]
#
# patch "packages/tasks/task-base.bb"
# from [797b15619704c023c1e4777ddc0474fcea386fcd]
# to [2ef7c7b6aa8d583973deb733c4c4ea6efdffe5eb]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [f61aabaafd0d0b2ab728612f541ce6b90b4d5682]
# to [ae8c99389ab3bc3c8f94dfedf504e3829a6cd608]
#
# patch "packages/ttf-fonts/ttf.inc"
# from [fb8c05c470eee88f979bd7425e143a351654635a]
# to [2a846550f80db27429faf862405989761d2e4243]
#
# set "packages/supertux/files/supertux.png"
# attr "mtn:manual_merge"
# value "true"
#
============================================================
--- conf/machine/mx31moboard.conf 4fbbc4efbfa3c6a7e53d028698e453da918a952c
+++ conf/machine/mx31moboard.conf 4fbbc4efbfa3c6a7e53d028698e453da918a952c
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@Name: EPFL mx31MoBoard
+#@DESCRIPTION: Machine configuration for EPFL MX31MoBoard
+#@Website: http://mobots.epfl.ch/mx31MoBoard.html
+
+TARGET_ARCH = "arm"
+TARGET_FPU_arm = "hard"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget"
+
+GUI_MACHINE_CLASS = "smallscreen"
+PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te armv6"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+require conf/machine/include/tune-arm1136jf-s.inc
+
+#
+# usb networking
+#
+module_conf_g_ether = "alias usb0 g_ether"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "-L 115200 ttymxc0 vt100"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
+
+# to avoid annoying jffs2 messages
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000"
+
+IMAGE_FSTYPES += "tar.gz"
+
============================================================
--- packages/alsa/alsa-state/fic-gta02/asound.state 1757352784f5374c1f573a503aae63c17415a14a
+++ packages/alsa/alsa-state/fic-gta02/asound.state 1757352784f5374c1f573a503aae63c17415a14a
@@ -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'
+ co%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r841845db4cfff04ccff4ec075f181561fb3ad63f -re1ff6c067cf71593cf346579bbde3ddb8880cc0c
#
#
#
# patch "packages/gpephone/addressbook_svn.bb"
# from [109115b4d8175a5c26d96375484eac86020f1fc3]
# to [2f736f148a7f8733f862502f7ea15dc9a7818a00]
#
# patch "packages/gpephone/contact_svn.bb"
# from [2bdcfd37fa7331f354b090527f502870cee6fea5]
# to [7972b2952ee56c26a4f9768c0d579d27d14c9b1f]
#
# patch "packages/gpephone/firewall_svn.bb"
# from [707e5f62435c7c0130c795babdbe705aced3f0e8]
# to [2d0b3255aeb70f0b2d0c7b4926484b4954ed2372]
#
# patch "packages/gpephone/gpe-applauncher_svn.bb"
# from [4d20c813ad46630580e0ffc689c3794f8154fff7]
# to [6440fe8aa26c874ff5b0ef8ba11e739418a62743]
#
# patch "packages/gpephone/libabenabler2_svn.bb"
# from [6cedd4eaaae17335f9912cbdd4124a86765aae34]
# to [22f1cd9eeaa95300a79ed51b8b2a097c6567a0d4]
#
# patch "packages/gpephone/libabenabler_svn.bb"
# from [8fbbb2915a10d96ef59cee640bc880d3fba234cb]
# to [cb7b0bf422e58f8c25ab31340031100f7fcd894d]
#
# patch "packages/gpephone/libcalenabler2_svn.bb"
# from [ca595393866e1e0b2240421e240db9ddbefbedff]
# to [5b6055aa245611a73721654f2dd87047930cbb27]
#
# patch "packages/gpephone/libmsgenabler_1.0.bb"
# from [10f73c41814056d4275d16b2685ca899455ef739]
# to [71441c3a8ea417a1e08ecae7245f9d759c690c3c]
#
# patch "packages/gpephone/librecord2_svn.bb"
# from [b437eb625142c9037b79657bf84ba5305ae560e2]
# to [d22430f9f2e594e66730d1beb973b3690d08702d]
#
# patch "packages/gpephone/libsettings_svn.bb"
# from [3ec47b4c7f7282f6b14237e73d2fc1fec4ec2701]
# to [b0e07271b04905ad3a3458893e93c4b54635fbe3]
#
# patch "packages/gpephone/machined_svn.bb"
# from [b1aa2bc7c8b777a29ced8ae606722efa408e1301]
# to [7e9b0c026c20bc06b7096008d90923bd86524633]
#
# patch "packages/gpephone/ptim-engine_svn.bb"
# from [ef51d9a661f2eb0e31b90b646ef0763265f8e070]
# to [3cbbae29d72d3c01316172678ad3f68817878123]
#
# patch "packages/gpephone/ptim-headers_svn.bb"
# from [f87f52cf9dd3b0fbbcd93b9dc26924797234e78b]
# to [ad9799e1762c1048057c6521901d7c0ca0285b24]
#
# patch "packages/gpephone/ptim-helper_svn.bb"
# from [513ccb848c66db512ec88c73d15970eb5210a843]
# to [aa8aaf8204bc0e79b11602028b16ba56764f4c29]
#
# patch "packages/gpephone/ptim-manager_svn.bb"
# from [e0ddcec53b318d7b7301948e99d5a260791f538f]
# to [52d2b87ce5e5642e3f2f11f97e4e11b64ef8af70]
#
# patch "packages/gpephone/quickdial_svn.bb"
# from [5a7854af3e370761f2adf68476bdf0c2eea3e7d1]
# to [65c4c197535acedd5ba6cfdfc84531ed2906f358]
#
# patch "packages/gpephone/useen_svn.bb"
# from [df6794b692b6307ab4efda6349b60b4a0680e420]
# to [c877d081287cc4561ce042aa75ea9d9a610103b3]
#
============================================================
--- packages/gpephone/addressbook_svn.bb 109115b4d8175a5c26d96375484eac86020f1fc3
+++ packages/gpephone/addressbook_svn.bb 2f736f148a7f8733f862502f7ea15dc9a7818a00
@@ -1,9 +1,9 @@ PR = "r0"
LICENSE = "LiPS"
DESCRIPTION = "LiPS address book"
SECTION = "gpe"
PRIORITY = "optional"
PR = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/contact_svn.bb 2bdcfd37fa7331f354b090527f502870cee6fea5
+++ packages/gpephone/contact_svn.bb 7972b2952ee56c26a4f9768c0d579d27d14c9b1f
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ libgpephone dbus-glib li
DESCRIPTION = "G(PE)^2 address book v2"
SECTION = "gpe"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ libgpephone dbus-glib libabenabler2 librecord2 libgemwidget"
-PV = "0.0+svn-${SRCREV}"
+PV = "0.0+svnr-${SRCREV}"
PR = "r0"
inherit gpephone autotools
============================================================
--- packages/gpephone/firewall_svn.bb 707e5f62435c7c0130c795babdbe705aced3f0e8
+++ packages/gpephone/firewall_svn.bb 2d0b3255aeb70f0b2d0c7b4926484b4954ed2372
@@ -5,8 +5,6 @@ PV = "0.0+svnr-${SRCREV}"
PR = "r0"
PV = "0.0+svnr-${SRCREV}"
-SRCREV_pn-${PN} ?= "1400"
-
DEFAULT_PREFERENCE = "-1"
DEPENDS = "gtk+ libmsgenabler libabenabler libiac libgpewidget libgpephone gconf-dbus"
============================================================
--- packages/gpephone/gpe-applauncher_svn.bb 4d20c813ad46630580e0ffc689c3794f8154fff7
+++ packages/gpephone/gpe-applauncher_svn.bb 6440fe8aa26c874ff5b0ef8ba11e739418a62743
@@ -1,9 +1,9 @@ PR = "r1"
LICENSE = "GPL"
DESCRIPTION = "A cellphone application launcher."
SECTION = "gpe"
PRIORITY = "optional"
PR = "r1"
-PV = "0.11+svn-${SRCREV}"
+PV = "0.11+svnr-${SRCREV}"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/libabenabler2_svn.bb 6cedd4eaaae17335f9912cbdd4124a86765aae34
+++ packages/gpephone/libabenabler2_svn.bb 22f1cd9eeaa95300a79ed51b8b2a097c6567a0d4
@@ -1,17 +1,17 @@ DEPENDS = "glib-2.0 librecord2 gconf sql
DESCRIPTION = "LiPS address book library."
SECTION = "gpe/libs"
PRIORITY = "optional"
LICENSE = "LGPL"
DEPENDS = "glib-2.0 librecord2 gconf sqlite3"
-PV = "0.0+svn-${SRCDATE}"
+PV = "0.0+svnr-${SRCREV}"
PR = "r0"
+inherit gpephone pkgconfig autotools
+
SRC_URI = "${GPEPHONE_SVN}"
S = "${WORKDIR}/${PN}"
-inherit gpephone pkgconfig autotools
-
do_stage () {
autotools_stage_all
}
============================================================
--- packages/gpephone/libabenabler_svn.bb 8fbbb2915a10d96ef59cee640bc880d3fba234cb
+++ packages/gpephone/libabenabler_svn.bb cb7b0bf422e58f8c25ab31340031100f7fcd894d
@@ -1,10 +1,10 @@ PR = "r0"
LICENSE = "LGPL"
DESCRIPTION = "LiPS address book library."
SECTION = "gpe/libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 librecord liblipsevent libim sqlite3"
PR = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/libcalenabler2_svn.bb ca595393866e1e0b2240421e240db9ddbefbedff
+++ packages/gpephone/libcalenabler2_svn.bb 5b6055aa245611a73721654f2dd87047930cbb27
@@ -1,18 +1,17 @@ LICENSE = "LiPS"
DESCRIPTION = "LiPS calendar API."
SECTION = "gpe/libs"
PRIORITY = "optional"
LICENSE = "LiPS"
-DEPENDS = "glib-2.0 sqlite3 libical"
-PV = "0.0+svn-${SRCREV}"
+DEPENDS = "glib-2.0 sqlite3 libical libalmmgr"
+PV = "0.0+svnr-${SRCREV}"
PR = "r0"
-SRC_URI = "${GPEPHONE_SVN}"
-S = "${WORKDIR}/${PN}"
+inherit gpephone pkgconfig autotools
-GPE_TARBALL_SUFFIX = "bz2"
+SRC_URI = "${GPEPHONE_SVN}"
-inherit gpephone pkgconfig autotools
+S = "${WORKDIR}/${PN}"
do_stage () {
autotools_stage_all
============================================================
--- packages/gpephone/libmsgenabler_1.0.bb 10f73c41814056d4275d16b2685ca899455ef739
+++ packages/gpephone/libmsgenabler_1.0.bb 71441c3a8ea417a1e08ecae7245f9d759c690c3c
@@ -1,14 +1,16 @@ DEPENDS = "glib-2.0 dbus-glib librec
LICENSE = "LiPS"
DESCRIPTION = "LiPS message backend library."
SECTION = "gpe/libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 dbus-glib librecord sqlite3"
-PR = "r0"
+PR = "r1"
GPE_TARBALL_SUFFIX = "bz2"
inherit gpephone pkgconfig autotools
+FILES_${PN} += "$(datadir)/libmsgenabler"
+
do_stage () {
autotools_stage_all
}
============================================================
--- packages/gpephone/librecord2_svn.bb b437eb625142c9037b79657bf84ba5305ae560e2
+++ packages/gpephone/librecord2_svn.bb d22430f9f2e594e66730d1beb973b3690d08702d
@@ -1,10 +1,10 @@ PR = "r0"
LICENSE = "LiPS"
DESCRIPTION = "LiPS database API."
SECTION = "gpe/libs"
PRIORITY = "optional"
DEPENDS = "glib-2.0 e2fsprogs-libs sqlite3"
PR = "r0"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/libsettings_svn.bb 3ec47b4c7f7282f6b14237e73d2fc1fec4ec2701
+++ packages/gpephone/libsettings_svn.bb b0e07271b04905ad3a3458893e93c4b54635fbe3
@@ -1,9 +1,9 @@ DEPENDS = "glib-2.0 gconf-dbus"
DESCRIPTION = "G(PE)^2 settings API library"
SECTION = "gpe/libs"
PRIORITY = "required"
LICENSE = "LiPS"
DEPENDS = "glib-2.0 gconf-dbus"
-PV = "0.0+svn-${SRCDATE}"
+PV = "0.0+svnr-${SRCREV}"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/machined_svn.bb b1aa2bc7c8b777a29ced8ae606722efa408e1301
+++ packages/gpephone/machined_svn.bb 7e9b0c026c20bc06b7096008d90923bd86524633
@@ -1,9 +1,9 @@ DEPENDS = "glib-2.0 dbus-glib gtk+"
DESCRIPTION = "Device abstraction and support daemon"
SECTION = "gpephone"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "glib-2.0 dbus-glib gtk+"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
PR = "r0"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/ptim-engine_svn.bb ef51d9a661f2eb0e31b90b646ef0763265f8e070
+++ packages/gpephone/ptim-engine_svn.bb 3cbbae29d72d3c01316172678ad3f68817878123
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ ptim-headers"
DESCRIPTION = "Phone input method engine"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ ptim-headers"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
PR = "r1"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/ptim-headers_svn.bb f87f52cf9dd3b0fbbcd93b9dc26924797234e78b
+++ packages/gpephone/ptim-headers_svn.bb ad9799e1762c1048057c6521901d7c0ca0285b24
@@ -1,9 +1,9 @@ DEPENDS = "gtk+"
DESCRIPTION = "Phone input method - shared headers"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
inherit gpephone pkgconfig autotools
============================================================
--- packages/gpephone/ptim-helper_svn.bb 513ccb848c66db512ec88c73d15970eb5210a843
+++ packages/gpephone/ptim-helper_svn.bb aa8aaf8204bc0e79b11602028b16ba56764f4c29
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ ptim-headers"
DESCRIPTION = "Phone input method helper module"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ ptim-headers"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
PR = "r1"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/ptim-manager_svn.bb e0ddcec53b318d7b7301948e99d5a260791f538f
+++ packages/gpephone/ptim-manager_svn.bb 52d2b87ce5e5642e3f2f11f97e4e11b64ef8af70
@@ -1,9 +1,9 @@ DEPENDS = "gtk+ ptim-headers libiac"
DESCRIPTION = "Phone input method manager module"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ ptim-headers libiac"
-PV = "0.1+svn-${SRCDATE}"
+PV = "0.1+svnr-${SRCREV}"
PR = "r2"
DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/gpephone/quickdial_svn.bb 5a7854af3e370761f2adf68476bdf0c2eea3e7d1
+++ packages/gpephone/quickdial_svn.bb 65c4c197535acedd5ba6cfdfc84531ed2906f358
@@ -5,11 +5,9 @@ PV = "0.0+svnr-${SRCREV}"
PR = "r0"
PV = "0.0+svnr-${SRCREV}"
-SRCREV_pn-${PN} ?= "1393"
-
DEFAULT_PREFERENCE = "-1"
-DEPENDS = "gtk+ librecord2 libgpephone hiker"
+DEPENDS = "gtk+ librecord2 libgpephone"
inherit gpephone autotools pkgconfig
@@ -17,5 +15,6 @@ S = "${WORKDIR}/${PN}"
S = "${WORKDIR}/${PN}"
+EXTRA_OECONF = "--disable-hiker"
FILES_${PN} += "${datadir}/qdial/database"
============================================================
--- packages/gpephone/useen_svn.bb df6794b692b6307ab4efda6349b60b4a0680e420
+++ packages/gpephone/useen_svn.bb c877d081287cc4561ce042aa75ea9d9a610103b3
@@ -5,8 +5,6 @@ PV = "0.0+svnr-${SRCREV}"
PR = "r0"
PV = "0.0+svnr-${SRCREV}"
-SRCREV_pn-${PN} ?= "1400"
-
DEFAULT_PREFERENCE = "-1"
DEPENDS = "glib-2.0"
More information about the Openembedded-commits
mailing list