[oe-commits] org.oe.dev merge of '25c6c2c84233203b8c3f1a65223fc9904814cfe2'

freyther commit openembedded-commits at lists.openembedded.org
Mon Jan 7 00:06:42 UTC 2008 

merge of '25c6c2c84233203b8c3f1a65223fc9904814cfe2'
     and '478b52f76ea3d55c9536816c3480d56ebcccc96d'

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 9b07456c654028eaf93e937279511953f65d594b
ViewMTN: http://monotone.openembedded.org/revision/info/9b07456c654028eaf93e937279511953f65d594b
Files:
1
packages/cmake/cmake-native_2.2.3.bb
packages/cmake/cmake.inc
packages/cmake/cmake-native_2.4.7.bb
packages/cmake/cmake_2.4.7.bb
conf/checksums.ini
packages/qmake/qmake2-native.inc
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/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/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/gpsd/files/fic-gta01/restart_gllin.sh
packages/linux/mainstone-kernel/flash-unlock.patch
packages/linux/mainstone-kernel/mainstone/defconfig
classes/base.bbclass
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/flite/flite.inc
packages/gpsd/gpsd.inc
packages/gpsd/gpsd_2.28.bb
packages/gpsd/gpsd_2.34.bb
packages/gpsd/gpsd_2.36.bb
packages/hal/hal_0.5.9.bb
packages/linux/linux-ixp4xx.inc
packages/linux/mainstone-kernel_2.6.18.bb
packages/speech-dispatcher/files/configSpeechd.conf.in_00.patch
packages/speech-dispatcher/speech-dispatcher_0.6.5.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/xorg-xserver/xserver-kdrive_1.4.bb
Diffs:

#
# mt diff -r25c6c2c84233203b8c3f1a65223fc9904814cfe2 -r9b07456c654028eaf93e937279511953f65d594b
#
# 
# 
# rename "packages/cmake/cmake-native_2.2.3.bb"
#     to "packages/cmake/cmake.inc"
# 
# add_file "packages/cmake/cmake-native_2.4.7.bb"
#  content [253a8635e2bef253afccbc433df9b9f65649cb40]
# 
# add_file "packages/cmake/cmake_2.4.7.bb"
#  content [15b0b49ebb8470a51c6d1374f3871d8bd2d8b215]
# 
# patch "conf/checksums.ini"
#  from [18e72ca2a2d5b3a7586fc3fe6bed5093235eab58]
#    to [6107a0e5221d7dd5b1ba6940f49cfd2a8d3e256c]
# 
# patch "packages/cmake/cmake.inc"
#  from [2619d3cba1049cef77c63787f7dba5f2b33db1fb]
#    to [6d2ae923a2e4014772f56c1ccc93b209400347d9]
# 
# patch "packages/qmake/qmake2-native.inc"
#  from [fddea3b5f77f8297595bf49e8c4424d359cb4d8c]
#    to [18bf1cd3568fef0b75bb3527dc1810cb148196b2]
# 
============================================================
--- 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
============================================================
--- conf/checksums.ini	18e72ca2a2d5b3a7586fc3fe6bed5093235eab58
+++ conf/checksums.ini	6107a0e5221d7dd5b1ba6940f49cfd2a8d3e256c
@@ -602,6 +602,10 @@ sha256=01e693daf4c0e2af2e10082a635559d39
 md5=1ef39fb723f9209109134d6f4860cb21
 sha256=01e693daf4c0e2af2e10082a635559d390f9127556a86d25105abfa646a9b0a3
 
+[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.15.tar.bz2]
+md5=94254ea0d2c966a58184b134e9da29ff
+sha256=f24272f3a32262c5285fc5bae0b9aa65494e8b22ac536313dbb60b8e4231e952
+
 [ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2]
 md5=3106c2d59a329263867fa3dd44133dda
 sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790
@@ -622,6 +626,10 @@ sha256=307d630f0ed15e7e92fa35dc0c961737f
 md5=6d3009c157ac6fc803696d6590a48366
 sha256=307d630f0ed15e7e92fa35dc0c961737fa9aed22bd7a4a6054a72f85145fa5cb
 
+[ftp://ftp.alsa-project.org/pub/utils/alsa-utils-1.0.15.tar.bz2]
+md5=287f46f891581c15018de4f8c0731575
+sha256=3bb546e873df39159812168180eeff14b13620c653d90739ac0a0912e898aeac
+
 [http://osdn.dl.sourceforge.jp/anthy/20510/anthy-7811.tar.gz]
 md5=e3619c07bd175ce5f73d67388c0c2ea5
 sha256=140828e8aa7d690d8f2a9a54faeac38bcbf40ea18c1f44a186af51bd6964cd13
@@ -1110,6 +1118,10 @@ sha256=cf37ac1eb3ec0c473e527f11f068fc5fc
 md5=9d7e02ea9a4c43d8f030500f282ee8bf
 sha256=cf37ac1eb3ec0c473e527f11f068fc5fcc7452d688acc89a0e52553f51fc36bb
 
+[http://bluez.sourceforge.net/download/bluez-libs-3.23.tar.gz]
+md5=8f0368c6213abef36f1e563b44b2eed4
+sha256=3ea7817c91b8cff9cacba23392f4a4163412d92ee09236997622e0d19cad884e
+
 [http://bluez.sourceforge.net/download/bluez-libs-3.4.tar.gz]
 md5=8b73b0ccbcef6a4270468487b1309990
 sha256=6c40f8b2dcf9359cc7f6afa803fc5744652c1d95669c134b975758a8748a87e8
@@ -1134,6 +1146,10 @@ sha256=5ed4245e31fa43789a3090d02a25ed90e
 md5=ef596746d656ed034ed64596f72ef3c2
 sha256=5ed4245e31fa43789a3090d02a25ed90eaee95819cce30cda59d4d09f4fc0db0
 
+[http://bluez.sourceforge.net/download/bluez-utils-3.23.tar.gz]
+md5=767ad814bff4e1806f873ecf2434ba89
+sha256=4f3d52cc207e438018b3a4c307d9969862bf25c35b1e281c0d6201b624acd103
+
 [http://bluez.sourceforge.net/download/bluez-utils-3.4.tar.gz]
 md5=f63b440396baee7dee9259395a205d48
 sha256=44a50104072a39e4f941ab68b6ffce5feb2fec7a94f3dd32f0945939d09eca39
@@ -1506,6 +1522,10 @@ sha256=f0127ba9cd9936b08f982999f6fd9004c
 md5=c0b57a115e24005f9828ca7b53908779
 sha256=f0127ba9cd9936b08f982999f6fd9004c8c4b97401e68bda4d91eec29300d8bd
 
+[http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz]
+md5=4476c423b8f74266136964e42ea88028
+sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
+
 [ftp://ftp.logilab.fr/pub/common/common-0.4.4.tar.gz]
 md5=4cd3ce38efbd27c6cf4223f0ced2a5b5
 sha256=21341f1900b0fe919a2ad057c334f5d7172588e4262b3d1b0904da03a9db0cff
@@ -2382,6 +2402,10 @@ sha256=52b31fa70151b97ef871d44ad9214e902
 md5=3654bbbf01deeb0d804df194e1b1a2b3
 sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
 
+[ftp://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.7.1.tar.gz]
+md5=3654bbbf01deeb0d804df194e1b1a2b3
+sha256=52b31fa70151b97ef871d44ad9214e90279f7cbd95144c6b40da49079ed0f1ce
+
 [ftp://oss.sgi.com/projects/fam/download/stable/fam-2.6.10.tar.gz]
 md5=1c5a2ea659680bdd1e238d7828a857a7
 sha256=885ced3480aef3cee519a459a572e31cd2fd5e24bcd35b1d0c8833361699026e
@@ -2762,6 +2786,11 @@ sha256=63a3d6413182817b91eea327b58c243f1
 md5=f035852f521b54677f2b5c9e2f6d54a4
 sha256=63a3d6413182817b91eea327b58c243f1865acfc40bef61fc52d2b0431341363
 
+[https://stage.maemo.org/svn/maemo/projects/haf/trunk/fontconfig/device_symbols.h]
+md5=c0124afc760d4fe8c24ffcf15ba7f391
+sha256=4e0c1726f9c565deec6d6af9eebda47ca6dea473f3280cc89beb321ae33ff962
+
+
 [http://openzaurus.org/mirror/fonts-bitstream-vera-sans-mono.tar.gz]
 md5=890615fa4b3e6c82cd1b9807b106f042
 sha256=42c15ed555719c27f67990454cdda791cbcd26ab98712fd88ca7e20e6ce3f1fd
@@ -4550,6 +4579,10 @@ sha256=65d8f8eeb61e7609a8c5001b6660d90e7
 md5=a6f532770cf9286e1de38d6570cbc6bc
 sha256=65d8f8eeb61e7609a8c5001b6660d90e7a482c4b74b4e226d09b433dc1a80c9d
 
+[http://people.freedesktop.org/~david/dist/hal-info-20070618.tar.gz]
+md5=c7005ccb1765d8359fd2348350770495
+sha256=bec1b0ad166b6c4d5269e7aa6d7bdbd0eb05c8f2c30042e4dca18993ba5682f0
+
 [http://downloads.sourceforge.net/haserl/haserl-0.8.0.tar.gz]
 md5=bd9195d086566f56634c0bcbbbcbebea
 sha256=ba261a21539e1f204ba74590d313c501007e546b54aa9ae7210a99eaf3c097be
@@ -7898,6 +7931,10 @@ sha256=df551fb075d5e6d0824b74d231962cf0e
 md5=843422d90349800ee721f6710d051c87
 sha256=df551fb075d5e6d0824b74d231962cf0e104c43f646e233675d952ef3c03debc
 
+[http://www.mpfr.org/mpfr-2.3.0/mpfr-2.3.0.tar.bz2]
+md5=cf7c743e4be122e63eb6f372fc58b657
+sha256=359f0d344f92d1f145ddcd37adf54f9b8069aa2ce89c4a19603d080ef17d2d48
+
 [http://downloads.sourceforge.net/mpg321/mpg321-0.2.10.tar.gz]
 md5=bb403b35c2d25655d55f0f616b8f47bb
 sha256=db0c299592b8f1f704f41bd3fc3a2bf138658108588d51af61638c551af1b0d4
@@ -8658,6 +8695,10 @@ sha256=6e3549b8586d8ac3ae8b2251b6cff9065
 md5=6a33888e34c23f7fde09a6e94e4f5950
 sha256=6e3549b8586d8ac3ae8b2251b6cff9065f12a5d648c9c464543988ddb670545b
 
+[http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.2.31.tar.bz2]
+md5=3aa902cb7a57a4aa09427de603ebf17b
+sha256=3d087c88f6e2cc8fde8d2ab12ff2f85ca3ecb2c67754d0483d158f2e5802b015
+
 [http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/pax-utils-0.1.13.tar.bz2]
 md5=5f09df47a16e83462384b44b75310539
 sha256=72f3cdad93b5436070dcc63b67764a06c594f324ccc001e8bfb974a8d1a86f36
@@ -8778,6 +8819,10 @@ sha256=a9d4545b5dfc018cdd33fd21bc73c3f1b
 md5=f9fea77e46ec7a3a16e925e137f146e7
 sha256=a9d4545b5dfc018cdd33fd21bc73c3f1b3c9c207f1bb6843606cc180eb10c6c8
 
+[http://cairographics.org/releases/pixman-0.9.6.tar.gz]
+md5=d2b1071cdbb0b8da18039111ba2dfd22
+sha256=179abc613f5100081cdef833f24a35fe7b646b8a4f0c79647d9609f6bf8222d8
+
 [http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz]
 md5=fd5c547e9d66ba49bc735ccb8c791f2a
 sha256=7e0761b47d604847006e7c6caa9b9cf044530a516ff84395450edcfa3c2febe6
============================================================
--- packages/cmake/cmake-native_2.2.3.bb	2619d3cba1049cef77c63787f7dba5f2b33db1fb
+++ packages/cmake/cmake.inc	6d2ae923a2e4014772f56c1ccc93b209400347d9
@@ -7,14 +7,12 @@ SECTION = "console/utils"
 LICENSE = "Berkely-style license"
 SECTION = "console/utils"
 
-SRC_URI = "http://www.cmake.org/files/v2.2/cmake-${PV}.tar.gz"
+SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz"
 
 inherit autotools
 
 S = "${WORKDIR}/cmake-${PV}"
 
-inherit native
-
 do_configure () {
 	./configure --prefix=${base_prefix} || die "./bootstrap failed"
 }
============================================================
--- packages/qmake/qmake2-native.inc	fddea3b5f77f8297595bf49e8c4424d359cb4d8c
+++ packages/qmake/qmake2-native.inc	18bf1cd3568fef0b75bb3527dc1810cb148196b2
@@ -8,7 +8,7 @@ FILESDIR += "${@os.path.dirname(bb.data.
 QTVER = "qtopia-core-opensource-src-${QTVERSION}"
 
 FILESDIR += "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qmake2-native"
-SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.gz \
            file://0001-fix-mkspecs.patch;patch=1 \
            file://0008-backport-qt-lib-infix.patch;patch=1 \
            file://qt-config.patch;patch=1 \


#
# mt diff -r478b52f76ea3d55c9536816c3480d56ebcccc96d -r9b07456c654028eaf93e937279511953f65d594b
#
# 
# 
# 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"
# 
# 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/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 [fb14a4e6b5f4590b49c33b5ec1ce032cffe413a7]
# 
# add_file "packages/flite/flite_1.3.bb"
#  content [561a0ff7fb4a9081263d72fd32c6cdd3f66add10]
# 
# add_file "packages/gpsd/files/fic-gta01/restart_gllin.sh"
#  content [1dd563bb0bc587c3b75094aef643c8ddc47c7942]
# 
# 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 "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/distcc/distcc_2.18.3.bb"
#  from [980168c7626a06af4ee3c091da786c662f16fad8]
#    to [761cc7f2560dbb4f9a2c2717f0b21dd831649fb3]
# 
# 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 [0e515e9756aeb4a250e89e9ae76603a2e466c2a9]
# 
# patch "packages/gpsd/gpsd.inc"
#  from [650373a23ddc8159bfc209e03a8bb60a2f5c46e4]
#    to [31c98872bb132b08fab52b701f0d91b961f71d9b]
# 
# patch "packages/gpsd/gpsd_2.28.bb"
#  from [19dc03378642fa1ee106c4bf1ba4f49118860903]
#    to [55b0e4d9cd1f621bd6f0f8049044f2512a411011]
# 
# patch "packages/gpsd/gpsd_2.34.bb"
#  from [d07d745ca471b1b1cfe875690c9278e223ca2c9c]
#    to [968a1c12ab0cf22874a5a029daa69b00eedac21c]
# 
# patch "packages/gpsd/gpsd_2.36.bb"
#  from [9cabcd04b6334d04f5b20d7585ad5d051f19a06f]
#    to [e7423c783c6edfa634685a22f2821e44fa28c764]
# 
# 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/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/u-boot/u-boot-openmoko_svn.bb"
#  from [67ec27434d36f171aedd9fb4e06f390505792635]
#    to [d812cd2b7484ad3d696a1616eea6e3e80706d31c]
# 
# patch "packages/xorg-xserver/xserver-kdrive_1.4.bb"
#  from [c9837b4198cd07399be8e9f76ed051e1a9919cfe]
#    to [3f44a727a1525cb60f6aa240c365271b2658798b]
# 
============================================================
--- 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-release/lang/cmu_us_kal/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/cmu_us_kal/Makefile	(.../release-1.2)	(revision 7)
+@@ -43,7 +43,12 @@
+        cmu_us_kal_lpc.c \
+        cmu_us_kal_res.c \
+        cmu_us_kal_residx.c
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_cmu_us_kal
+
+Index: lang/cmu_us_kal16/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmu_us_kal16/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/cmu_us_kal16/Makefile	(.../release-1.2)	(revision 7)
+@@ -44,7 +44,12 @@
+        cmu_us_kal16_lpc.c \
+        cmu_us_kal16_res.c \
+        cmu_us_kal16_residx.c
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_cmu_us_kal16
+
+Index: lang/cmu_time_awb/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmu_time_awb/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/cmu_time_awb/Makefile	(.../release-1.2)	(revision 7)
+@@ -45,7 +45,12 @@
+ 	cmu_time_awb_mcep.c \
+ 	cmu_time_awb_lpc.c \
+ 	cmu_time_awb_lex_entry.c
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_cmu_time_awb
+
+Index: lang/cmulex/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmulex/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/lang/cmulex/Makefile	(.../release-1.2)	(revision 7)
+@@ -38,13 +38,20 @@
+ DIRNAME=lang/cmulex
+ BUILD_DIRS = 
+ ALL_DIRS= 
++
+ H = cmu_lts_model.h cmulex.h
+ SRCS = cmu_lts_rules.c cmu_lts_model.c \
+        cmu_lex.c cmu_lex_entries.c cmu_lex_data.c
+ LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \
+      cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c
+ 
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
++
+ SCRIPTS=make_cmulex  
+ 
+ SCM=
+
+Index: src/hrg/Makefile
+===================================================================
+--- flite-1.3-release/src/hrg/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/hrg/Makefile	(.../release-1.2)	(revision 7)
+@@ -39,9 +39,14 @@
+ BUILD_DIRS = 
+ ALL_DIRS= 
+ H = 
++include $(TOP)/config/config
+ SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \
+        cst_rel_io.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+ 
+Index: src/utils/Makefile
+===================================================================
+--- flite-1.3-release/src/utils/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/utils/Makefile	(.../release-1.2)	(revision 7)
+@@ -44,8 +44,13 @@
+        cst_tokenstream.c cst_val.c cst_features.c \
+        cst_endian.c cst_socket.c cst_val_const.c \
+        cst_val_user.c cst_args.c 
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \
++        $(STDIOTYPE:%=cst_file_%.os)
++else
+ OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \
+         $(STDIOTYPE:%=cst_file_%.o)
++endif
+ FILES = Makefile $(H) $(SRCS) \
+ 	cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \
+ 	cst_file_stdio.c cst_file_wince.c cst_file_palmos.c
+
+Index: src/audio/Makefile
+===================================================================
+--- flite-1.3-release/src/audio/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/audio/Makefile	(.../release-1.2)	(revision 7)
+@@ -43,9 +43,13 @@
+ 
+ BASESRCS = auclient.c auserver.c audio.c 
+ SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c)
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \
+-	au_oss.c au_sun.c au_wince.c au_palmos.c
++	au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c
+ LIBNAME = flite
+ 
+ LOCAL_INCLUDES = -I. $(AUDIODEFS)
+
+Index: src/lexicon/Makefile
+===================================================================
+--- flite-1.3-release/src/lexicon/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/lexicon/Makefile	(.../release-1.2)	(revision 7)
+@@ -38,8 +38,13 @@
+ DIRNAME=src/lexicon
+ BUILD_DIRS = 
+ ALL_DIRS= 
++include $(TOP)/config/config
+ SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(SRCS)
+ LIBNAME = flite
+ 
+Index: src/synth/Makefile
+===================================================================
+--- flite-1.3-release/src/synth/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/synth/Makefile	(.../release-1.2)	(revision 7)
+@@ -38,9 +38,14 @@
+ DIRNAME=src/synth
+ BUILD_DIRS = 
+ ALL_DIRS= 
++include $(TOP)/config/config
+ SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \
+        flite.c 
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(SRCS)
+ LIBNAME = flite
+ 
+Index: src/speech/Makefile
+===================================================================
+--- flite-1.3-release/src/speech/Makefile	(.../flite-1.3-orig)	(revision 7)
++++ flite-1.3-release/src/speech/Makefile	(.../release-1.2)	(revision 7)
+@@ -39,9 +39,14 @@
+ BUILD_DIRS = 
+ ALL_DIRS= 
+ H = 
++include $(TOP)/config/config
+ SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \
+        cst_wave_utils.c cst_lpcres.c rateconv.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+ 
+Index: src/wavesynth/Makefile
+========================%s
>>> DIFF TRUNCATED @ 16K

More information about the Openembedded-commits mailing list