[oe-commits] org.oe.dev merge of 'af4511b13e8cbd8513fd3d5de1d714c59d17fa8c'

oe commit openembedded-commits at lists.openembedded.org
Mon Jan 7 20:13:04 UTC 2008 

merge of 'af4511b13e8cbd8513fd3d5de1d714c59d17fa8c'
     and 'c5064c11a779b0221a750ff7350a339c75859576'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 7c59f852fb0468818597fb2c9a2184e31692952b
ViewMTN: http://monotone.openembedded.org/revision/info/7c59f852fb0468818597fb2c9a2184e31692952b
Files:
1
packages/gnome-mplayer/gnome-mplayer_cvs.bb
packages/flite/flite-1.2
packages/flite/flite-1.2/configure-with-audio.patch
packages/flite/flite-1.2/fix-read-only-assignments.patch
packages/linux/linux-rp-2.6.16
packages/linux/linux-rp-2.6.16/00-hostap.patch
packages/linux/linux-rp-2.6.16/10-pcnet.patch
packages/linux/linux-rp-2.6.16/add-oz-release-string.patch
packages/linux/linux-rp-2.6.16/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.16/defconfig-akita
packages/linux/linux-rp-2.6.16/defconfig-c7x0
packages/linux/linux-rp-2.6.16/defconfig-collie
packages/linux/linux-rp-2.6.16/defconfig-hx2000
packages/linux/linux-rp-2.6.16/defconfig-poodle
packages/linux/linux-rp-2.6.16/defconfig-qemuarm
packages/linux/linux-rp-2.6.16/defconfig-spitz
packages/linux/linux-rp-2.6.16/defconfig-tosa
packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp-2.6.16/locomo-kbd-hotkeys.patch
packages/linux/linux-rp-2.6.16/locomo-lcd-def-bightness.patch
packages/linux/linux-rp-2.6.16/locomo-sysrq+keyrepeat.patch
packages/linux/linux-rp-2.6.16/maxpower-message.patch
packages/linux/linux-rp-2.6.16/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.16/rmk-mmc1.patch
packages/linux/linux-rp-2.6.16/rmk-mmc2.patch
packages/linux/linux-rp-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.16/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.17
packages/linux/linux-rp-2.6.17/00-hostap.patch
packages/linux/linux-rp-2.6.17/10-pcnet.patch
packages/linux/linux-rp-2.6.17/add-oz-release-string.patch
packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch
packages/linux/linux-rp-2.6.17/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.17/defconfig-akita
packages/linux/linux-rp-2.6.17/defconfig-c7x0
packages/linux/linux-rp-2.6.17/defconfig-collie
packages/linux/linux-rp-2.6.17/defconfig-hx2000
packages/linux/linux-rp-2.6.17/defconfig-poodle
packages/linux/linux-rp-2.6.17/defconfig-qemuarm
packages/linux/linux-rp-2.6.17/defconfig-qemux86
packages/linux/linux-rp-2.6.17/defconfig-spitz
packages/linux/linux-rp-2.6.17/defconfig-tosa
packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch
packages/linux/linux-rp-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch
packages/linux/linux-rp-2.6.17/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.17/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.17/tosa-lcdnoise-r0.patch
packages/linux/linux-rp-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch
packages/linux/linux-rp-2.6.17/wm9712-reset-loop-r2.patch
packages/linux/linux-rp-2.6.17/wm9712-suspend-cold-res-r2.patch
packages/linux/linux-rp-2.6.17/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp-2.6.21
packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch
packages/linux/linux-rp-2.6.21/connectplus-remove-ide-HACK.patch
packages/linux/linux-rp-2.6.21/defconfig-akita
packages/linux/linux-rp-2.6.21/defconfig-bootcdx86
packages/linux/linux-rp-2.6.21/defconfig-c7x0
packages/linux/linux-rp-2.6.21/defconfig-collie
packages/linux/linux-rp-2.6.21/defconfig-hx2000
packages/linux/linux-rp-2.6.21/defconfig-poodle
packages/linux/linux-rp-2.6.21/defconfig-qemuarm
packages/linux/linux-rp-2.6.21/defconfig-qemux86
packages/linux/linux-rp-2.6.21/defconfig-spitz
packages/linux/linux-rp-2.6.21/defconfig-tosa
packages/linux/linux-rp-2.6.21/hostap-monitor-mode.patch
packages/linux/linux-rp-2.6.21/orinoco-remove-all-which-are-in-hostap-HACK.patch
packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch
packages/linux/linux-rp-2.6.21/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch
packages/linux/linux-rp-2.6.21/sharpsl-rc-r1.patch
packages/linux/linux-rp-2.6.21/squashfs3.0-2.6.15.patch
packages/linux/linux-rp-2.6.21/vesafb-tng-1.0-rc2-2.6.20-rc2.patch
packages/linux/linux-rp-2.6.21/wm97xx-lcdnoise-r0.patch
packages/linux/linux-rp_2.6.16.bb
packages/linux/linux-rp_2.6.17.bb
packages/linux/linux-rp_2.6.21.bb
packages/cmake/cmake-native_2.2.3.bb
packages/cmake/cmake.inc
packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff
packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff
packages/flite/flite-1.3
packages/flite/flite-alsa-1.3
packages/flite/flite_1.2.bb
packages/flite/flite-alsa_1.2.bb
packages/flite/flite_1.3.bb
packages/flite/flite-alsa_1.3.bb
packages/linux/linux-ixp4xx/defconfig-2.6.23.8
packages/linux/linux-ixp4xx/defconfig-2.6.23.12
packages/linux/linux-ixp4xx_2.6.23.8.bb
packages/linux/linux-ixp4xx_2.6.23.12.bb
packages/flite/flite-alsa-1.2
packages/linux/mainstone-kernel/mainstone
packages/cmake/cmake-native_2.4.7.bb
packages/cmake/cmake_2.4.7.bb
packages/distcc/files/no-man.patch
packages/flite/flite-1.3/flite-1.3-Makefile.patch
packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch
packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch
packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch
packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch
packages/linux/mainstone-kernel/flash-unlock.patch
packages/linux/mainstone-kernel/mainstone/defconfig
classes/base.bbclass
classes/sanity.bbclass
conf/checksums.ini
conf/distro/include/sane-srcrevs.inc
packages/bluez/bluez-cups-backend_3.24.bb
packages/bluez/bluez-gstreamer-plugin_3.24.bb
packages/bluez/bluez-libs_3.24.bb
packages/bluez/bluez-utils-alsa_3.24.bb
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.24.bb
packages/distcc/distcc_2.18.3.bb
packages/docbook-utils/docbook-utils-native_0.6.13.bb
packages/flite/flite.inc
packages/hal/hal_0.5.9.bb
packages/linux/linux-ixp4xx.inc
packages/linux/mainstone-kernel_2.6.18.bb
packages/qmake/qmake2-native.inc
packages/qpegps/qpegps.inc
packages/qpegps/qpegps_0.9.2.3.3.bb
packages/qpegps/qpegps_0.9.3.1.bb
packages/qpegps/qpegps_svn.bb
packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
Diffs:

#
# mt diff -raf4511b13e8cbd8513fd3d5de1d714c59d17fa8c -r7c59f852fb0468818597fb2c9a2184e31692952b
#
# 
# 
# patch "packages/gnome-mplayer/gnome-mplayer_cvs.bb"
#  from [c34de96207774639cc00196181f1fb56aadbf586]
#    to [8364ceed9a6f7763168e7bd6b5d97884a56b4015]
# 
============================================================
--- packages/gnome-mplayer/gnome-mplayer_cvs.bb	c34de96207774639cc00196181f1fb56aadbf586
+++ packages/gnome-mplayer/gnome-mplayer_cvs.bb	8364ceed9a6f7763168e7bd6b5d97884a56b4015
@@ -5,7 +5,7 @@ PV = "0.5.3+cvs${SRCDATE}"
 RDEPENDS = "mplayer"
 SRCDATE = "20080101"
 PV = "0.5.3+cvs${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 inherit autotools pkgconfig gconf
 


#
# mt diff -rc5064c11a779b0221a750ff7350a339c75859576 -r7c59f852fb0468818597fb2c9a2184e31692952b
#
# 
# 
# delete "packages/flite/flite-1.2"
# 
# delete "packages/flite/flite-1.2/configure-with-audio.patch"
# 
# delete "packages/flite/flite-1.2/fix-read-only-assignments.patch"
# 
# delete "packages/linux/linux-rp-2.6.16"
# 
# delete "packages/linux/linux-rp-2.6.16/00-hostap.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/10-pcnet.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/add-oz-release-string.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/connectplus-remove-ide-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/defconfig-akita"
# 
# delete "packages/linux/linux-rp-2.6.16/defconfig-c7x0"
# 
# delete "packages/linux/linux-rp-2.6.16/defconfig-collie"
# 
# delete "packages/linux/linux-rp-2.6.16/defconfig-hx2000"
# 
# delete "packages/linux/linux-rp-2.6.16/defconfig-poodle"
# 
# delete "packages/linux/linux-rp-2.6.16/defconfig-qemuarm"
# 
# delete "packages/linux/linux-rp-2.6.16/defconfig-spitz"
# 
# delete "packages/linux/linux-rp-2.6.16/defconfig-tosa"
# 
# delete "packages/linux/linux-rp-2.6.16/hrw-pcmcia-ids-r5.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/locomo-kbd-hotkeys.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/locomo-lcd-def-bightness.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/locomo-sysrq+keyrepeat.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/maxpower-message.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/pxa-serial-hack.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/rmk-mmc1.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/rmk-mmc2.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
# 
# delete "packages/linux/linux-rp-2.6.16/squashfs3.0-2.6.15.patch"
# 
# delete "packages/linux/linux-rp-2.6.17"
# 
# delete "packages/linux/linux-rp-2.6.17/00-hostap.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/10-pcnet.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/add-oz-release-string.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/asoc-v0.12.4_2.6.17.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/connectplus-remove-ide-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/defconfig-akita"
# 
# delete "packages/linux/linux-rp-2.6.17/defconfig-c7x0"
# 
# delete "packages/linux/linux-rp-2.6.17/defconfig-collie"
# 
# delete "packages/linux/linux-rp-2.6.17/defconfig-hx2000"
# 
# delete "packages/linux/linux-rp-2.6.17/defconfig-poodle"
# 
# delete "packages/linux/linux-rp-2.6.17/defconfig-qemuarm"
# 
# delete "packages/linux/linux-rp-2.6.17/defconfig-qemux86"
# 
# delete "packages/linux/linux-rp-2.6.17/defconfig-spitz"
# 
# delete "packages/linux/linux-rp-2.6.17/defconfig-tosa"
# 
# delete "packages/linux/linux-rp-2.6.17/hrw-pcmcia-ids-r5.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/orinoco-remove-all-which-are-in-hostap-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/pxa-serial-hack.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/squashfs3.0-2.6.15.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/tosa-lcdnoise-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/vesafb-tng-1.0-rc2-git-20060629.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/wm9712-reset-loop-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/wm9712-suspend-cold-res-r2.patch"
# 
# delete "packages/linux/linux-rp-2.6.17/wm97xx-lcdnoise-r0.patch"
# 
# delete "packages/linux/linux-rp-2.6.21"
# 
# delete "packages/linux/linux-rp-2.6.21/connectplus-prevent-oops-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.21/connectplus-remove-ide-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-akita"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-bootcdx86"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-c7x0"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-collie"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-hx2000"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-poodle"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-qemuarm"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-qemux86"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-spitz"
# 
# delete "packages/linux/linux-rp-2.6.21/defconfig-tosa"
# 
# delete "packages/linux/linux-rp-2.6.21/hostap-monitor-mode.patch"
# 
# delete "packages/linux/linux-rp-2.6.21/orinoco-remove-all-which-are-in-hostap-HACK.patch"
# 
# delete "packages/linux/linux-rp-2.6.21/pxa-serial-hack.patch"
# 
# delete "packages/linux/linux-rp-2.6.21/serial-add-support-for-non-standard-xtals-to-16c950-driver.patch"
# 
# delete "packages/linux/linux-rp-2.6.21/sharpsl-rc-r1.patch"
# 
# delete "packages/linux/linux-rp-2.6.21/squashfs3.0-2.6.15.patch"
# 
# delete "packages/linux/linux-rp-2.6.21/vesafb-tng-1.0-rc2-2.6.20-rc2.patch"
# 
# delete "packages/linux/linux-rp-2.6.21/wm97xx-lcdnoise-r0.patch"
# 
# delete "packages/linux/linux-rp_2.6.16.bb"
# 
# delete "packages/linux/linux-rp_2.6.17.bb"
# 
# delete "packages/linux/linux-rp_2.6.21.bb"
# 
# rename "packages/cmake/cmake-native_2.2.3.bb"
#     to "packages/cmake/cmake.inc"
# 
# rename "packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff"
#     to "packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff"
# 
# rename "packages/flite/flite-1.3"
#     to "packages/flite/flite-alsa-1.3"
# 
# rename "packages/flite/flite_1.2.bb"
#     to "packages/flite/flite-alsa_1.2.bb"
# 
# rename "packages/flite/flite_1.3.bb"
#     to "packages/flite/flite-alsa_1.3.bb"
# 
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.23.8"
#     to "packages/linux/linux-ixp4xx/defconfig-2.6.23.12"
# 
# rename "packages/linux/linux-ixp4xx_2.6.23.8.bb"
#     to "packages/linux/linux-ixp4xx_2.6.23.12.bb"
# 
# add_dir "packages/flite/flite-1.2"
# 
# add_dir "packages/flite/flite-1.3"
# 
# add_dir "packages/flite/flite-alsa-1.2"
# 
# add_dir "packages/linux/mainstone-kernel/mainstone"
# 
# add_file "packages/cmake/cmake-native_2.4.7.bb"
#  content [253a8635e2bef253afccbc433df9b9f65649cb40]
# 
# add_file "packages/cmake/cmake_2.4.7.bb"
#  content [15b0b49ebb8470a51c6d1374f3871d8bd2d8b215]
# 
# add_file "packages/distcc/files/no-man.patch"
#  content [d340b667a5cb5703952649cdcc5321e6e14dea85]
# 
# add_file "packages/flite/flite-1.2/configure-with-audio.patch"
#  content [51281d10af50cb7d69e65c6b59a357490d0b5fc5]
# 
# add_file "packages/flite/flite-1.2/fix-read-only-assignments.patch"
#  content [13a1266caed6464bcc2d4357d5fb7e7e990f8d6d]
# 
# add_file "packages/flite/flite-1.3/flite-1.3-Makefile.patch"
#  content [f2208d1dc30d77bc15b330bfc05c8404cca58bc5]
# 
# add_file "packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch"
#  content [2af7b248ab36843084ea0c656ce6275cddd3a823]
# 
# add_file "packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch"
#  content [e19d2914968d435bccd36e6b7c9b1cd84fb3d1bc]
# 
# add_file "packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch"
#  content [3a6d9039bab26a16b7fcf80cfdc6837d960f817e]
# 
# add_file "packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch"
#  content [cc03d11902b592fb0607c6c6645f912d0bdfc8cd]
# 
# add_file "packages/flite/flite_1.2.bb"
#  content [8c135052fbbe90b46e8aa42bad184915303766fe]
# 
# add_file "packages/flite/flite_1.3.bb"
#  content [d0dede73dd4e7eced5a2b87fa053746ff7208827]
# 
# add_file "packages/linux/mainstone-kernel/flash-unlock.patch"
#  content [7dcbf9e486b99c782a1cc8675ea74ac65309624a]
# 
# add_file "packages/linux/mainstone-kernel/mainstone/defconfig"
#  content [6bfaae48053fbadbfdc06b87b0900b8e791f8079]
# 
# patch "classes/base.bbclass"
#  from [d034cdab57388cbe9087fb1c8dfd47a162e139de]
#    to [583a674a3a555fcc67d3f5d898d5433b6053f2cd]
# 
# patch "classes/sanity.bbclass"
#  from [ebf6cc13d544c4d677c13e3ea8dd18655c21e172]
#    to [c93bcb7294008f5c9b589ee59a39efbdb9a82616]
# 
# patch "conf/checksums.ini"
#  from [18e72ca2a2d5b3a7586fc3fe6bed5093235eab58]
#    to [6107a0e5221d7dd5b1ba6940f49cfd2a8d3e256c]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [11acb028456fb05345111447a0655b656a67d690]
#    to [6d7b2bbfb57a80d4d3d27fe559300eeca5f0af22]
# 
# patch "packages/bluez/bluez-cups-backend_3.24.bb"
#  from [6d3dd18f0576378f8bae0c3e251bce0ca132176e]
#    to [bbc6e898d777728d2c44cb4d9f44e8df7e8208e3]
# 
# patch "packages/bluez/bluez-gstreamer-plugin_3.24.bb"
#  from [f67c210c4018f045ec0a87f2baff07aefd2c19ae]
#    to [2a854ed03c58172e0bc5fdf51dea09a195c89a16]
# 
# patch "packages/bluez/bluez-libs_3.24.bb"
#  from [dc7c9ab3cf4931c0678271b1a5ef7511ebb7b82d]
#    to [cc5798bd1455575a8b11c2a31429c900514e1336]
# 
# patch "packages/bluez/bluez-utils-alsa_3.24.bb"
#  from [b7eb82c734b71cf61ac35a052d87da836df665d4]
#    to [871128c26bebfbfe05f1833f15b7efd83d0e25af]
# 
# patch "packages/bluez/bluez-utils3.inc"
#  from [4e06e74f7b9a84e626e018ff0d2e9969bdd5ac67]
#    to [f1cbdfc74564a82c238bb6862de2fcbadb369e01]
# 
# patch "packages/bluez/bluez-utils_3.24.bb"
#  from [e19b966dd298ba92c4980f3df32211c2eeffc8f1]
#    to [9b5873bc1f92f70365ffaf73cb383d0478d2a749]
# 
# patch "packages/cmake/cmake.inc"
#  from [2619d3cba1049cef77c63787f7dba5f2b33db1fb]
#    to [6d2ae923a2e4014772f56c1ccc93b209400347d9]
# 
# patch "packages/distcc/distcc_2.18.3.bb"
#  from [980168c7626a06af4ee3c091da786c662f16fad8]
#    to [761cc7f2560dbb4f9a2c2717f0b21dd831649fb3]
# 
# patch "packages/docbook-utils/docbook-utils-native_0.6.13.bb"
#  from [a7ee2c212558f566489c117e06527d0e0f46fc6c]
#    to [5a30863d8af8a1ace0ae926650c01cdf83d4af2e]
# 
# patch "packages/flite/flite-alsa_1.2.bb"
#  from [e32b2aed362684c9c359d98839bc237d62603eef]
#    to [e8edd2a409969b99b767f9b4b499f49fea258110]
# 
# patch "packages/flite/flite-alsa_1.3.bb"
#  from [363795c4972e7ad5e6d61f99a42533e41f8eaed7]
#    to [018fd7644c74a32e20b9c2874bdbd9083ab556bd]
# 
# patch "packages/flite/flite.inc"
#  from [85bb5fbc859a7afa126494a7ae04c8024d9e2dd7]
#    to [5bb4dcb463910dfe6f9fe31bfb88baf7160a3547]
# 
# patch "packages/hal/hal_0.5.9.bb"
#  from [994ba969732d514b1c0e8f71493297a10204818c]
#    to [8a4f7ba573f4caf381e0238b6dea2f89becf45a8]
# 
# patch "packages/linux/linux-ixp4xx.inc"
#  from [104c898701b243728e14a24a5ac89d50ede467ad]
#    to [22f02122239bf39a17155973a510c77a0e4d9de9]
# 
# patch "packages/linux/linux-ixp4xx_2.6.23.12.bb"
#  from [5072d1cda9fcc89b0db1894b9225812ec971acc9]
#    to [91f144590f8e37b3d4894d7feebebb9a022be434]
# 
# patch "packages/linux/mainstone-kernel_2.6.18.bb"
#  from [08ce2daf2b8f1e478a29ccade5b10df1891a1bbc]
#    to [06ce52f0eac17560e7f0c7163cfdd585c005ac3c]
# 
# patch "packages/qmake/qmake2-native.inc"
#  from [fddea3b5f77f8297595bf49e8c4424d359cb4d8c]
#    to [18bf1cd3568fef0b75bb3527dc1810cb148196b2]
# 
# patch "packages/qpegps/qpegps.inc"
#  from [ad06c195bd677200966728bcf93101e47b96eeb8]
#    to [6b0786ad10c9ced24f0819dcb121c6824a0b4cf8]
# 
# patch "packages/qpegps/qpegps_0.9.2.3.3.bb"
#  from [5ed209f056be5ae98b7ed0041ffdc771e271b7be]
#    to [020f6ea0ffbee3f4dd735009992f71dd0968f22c]
# 
# patch "packages/qpegps/qpegps_0.9.3.1.bb"
#  from [94d58e717e493f06eaeb86303f48c0952d98b097]
#    to [31dee0d09641f8515b414c0aa0fd7432d35376f5]
# 
# patch "packages/qpegps/qpegps_svn.bb"
#  from [33113854f73f3efe09ce78ca8f3ff118170d1365]
#    to [df4cfb3cf1278b690aa0cb71b15bc4cc5be171e6]
# 
# patch "packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch"
#  from [001e9d4108977248cedd50752029192824293596]
#    to [43da69b536d294f139242a74ac7cccb901f75066]
# 
# patch "packages/speech-dispatcher/speech-dispatcher_0.6.5.bb"
#  from [c0404c61c7a8cf7050862abc2771e72e634cf323]
#    to [734832bdee53cde56e75155ac50c7f9aaa55bfe0]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
#  from [c9837b4198cd07399be8e9f76ed051e1a9919cfe]
#    to [3f44a727a1525cb60f6aa240c365271b2658798b]
# 
============================================================
--- packages/cmake/cmake-native_2.4.7.bb	253a8635e2bef253afccbc433df9b9f65649cb40
+++ packages/cmake/cmake-native_2.4.7.bb	253a8635e2bef253afccbc433df9b9f65649cb40
@@ -0,0 +1,3 @@
+CMAKE_MAJOR_VERSION="2.4"
+require cmake.inc
+inherit native
============================================================
--- packages/cmake/cmake_2.4.7.bb	15b0b49ebb8470a51c6d1374f3871d8bd2d8b215
+++ packages/cmake/cmake_2.4.7.bb	15b0b49ebb8470a51c6d1374f3871d8bd2d8b215
@@ -0,0 +1,2 @@
+CMAKE_MAJOR_VERSION="2.4"
+require cmake.inc
============================================================
--- packages/distcc/files/no-man.patch	d340b667a5cb5703952649cdcc5321e6e14dea85
+++ packages/distcc/files/no-man.patch	d340b667a5cb5703952649cdcc5321e6e14dea85
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.in	2008-01-06 16:44:45.696595605 +0100
++++ distcc-2.18.3/Makefile.in	2008-01-06 16:44:56.879181132 +0100
+@@ -556,7 +556,7 @@
+ # install-sh can't handle multiple arguments, but we don't need any
+ # tricky features so mkinstalldirs and cp will do
+ 
+-install: showpaths install-doc install-man install-programs install-example @INSTALL_GNOME@
++install: showpaths install-doc install-programs install-example @INSTALL_GNOME@
+ 
+ install-programs: $(bin_PROGRAMS)
+ 	$(mkinstalldirs) $(DESTDIR)$(bindir)
============================================================
--- packages/flite/flite-1.2/configure-with-audio.patch	51281d10af50cb7d69e65c6b59a357490d0b5fc5
+++ packages/flite/flite-1.2/configure-with-audio.patch	51281d10af50cb7d69e65c6b59a357490d0b5fc5
@@ -0,0 +1,20 @@
+*** flite-1.2-release/configure.in~	Tue Feb 18 01:45:45 2003
+--- flite-1.2-release/configure.in	Mon Jul 18 22:01:25 2005
+***************
+*** 144,150 ****
+  dnl
+  AC_ARG_WITH( audio,
+  	[  --with-audio          with specific audio support (none linux freebsd etc) ],
+!         AUDIODRIVER=$with_audio )
+  
+  if test "x$AUDIODEFS" = x; then
+      case "$AUDIODRIVER" in
+--- 144,151 ----
+  dnl
+  AC_ARG_WITH( audio,
+  	[  --with-audio          with specific audio support (none linux freebsd etc) ],
+!         [AUDIODRIVER=$with_audio
+!          AUDIODEFS=])
+  
+  if test "x$AUDIODEFS" = x; then
+      case "$AUDIODRIVER" in
============================================================
--- packages/flite/flite-1.2/fix-read-only-assignments.patch	13a1266caed6464bcc2d4357d5fb7e7e990f8d6d
+++ packages/flite/flite-1.2/fix-read-only-assignments.patch	13a1266caed6464bcc2d4357d5fb7e7e990f8d6d
@@ -0,0 +1,16 @@
+diff -urN flite-1.2-release.orig/include/cst_sts.h flite-1.2-release/include/cst_sts.h
+--- flite-1.2-release.orig/include/cst_sts.h	2002-12-23 16:55:05.000000000 +0100
++++ flite-1.2-release/include/cst_sts.h	2004-10-04 21:10:22.000000000 +0200
+@@ -47,9 +47,9 @@
+ /* else where, this information plus the indexes in the Unit relation */
+ /* allow reconstruction of the signal itself                          */
+ struct cst_sts_struct {
+-    const unsigned short *frame;  
+-    const int size;      /* in samples */
+-    const unsigned char *residual;
++    unsigned short *frame;  
++    int size;      /* in samples */
++    unsigned char *residual;
+ };
+ typedef struct cst_sts_struct cst_sts;
+ 
============================================================
--- packages/flite/flite-1.3/flite-1.3-Makefile.patch	f2208d1dc30d77bc15b330bfc05c8404cca58bc5
+++ packages/flite/flite-1.3/flite-1.3-Makefile.patch	f2208d1dc30d77bc15b330bfc05c8404cca58bc5
@@ -0,0 +1,405 @@
+Index: lang/usenglish/Makefile
+===================================================================
+--- flite-1.3-release/lang/usenglish/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/usenglish/Makefile	(.../release-1.2)	(revision 7)
+@@ -38,6 +38,7 @@
+ DIRNAME=lang/usenglish
+ BUILD_DIRS = 
+ ALL_DIRS= 
++include $(TOP)/config/config
+ H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \
+     us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h
+ SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \
+@@ -45,7 +46,11 @@
+        us_phoneset.c us_ffeatures.c us_phrasing_cart.c \
+        us_gpos.c us_text.c us_expand.c us_postlex.c \
+        us_nums_cart.c us_aswd.c usenglish.c 
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_usenglish
+
+Index: lang/cmu_us_kal/Makefile
+===================================================================
+--- flite-1.3%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list