[oe-commits] org.oe.dev merge of '4751c499f21f8617037586caaf287ddbb137be0b'
xora commit
openembedded-commits at lists.openembedded.org
Thu Oct 18 12:06:14 UTC 2007
merge of '4751c499f21f8617037586caaf287ddbb137be0b'
and 'ada400c152f3d86308fbd602f1ddf750e4f21570'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: d46c4661bf8a227094ce244e37836233fb938268
ViewMTN: http://monotone.openembedded.org/revision/info/d46c4661bf8a227094ce244e37836233fb938268
Files:
1
contrib/source-checker
contrib/source-checker/oe-source-checker.py
packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch
conf/checksums.ini
conf/distro/include/sane-srcrevs.inc
conf/machine/em-x270.conf
packages/gstreamer/gst-plugins-ugly_0.10.6.bb
packages/mathomatic/mathomatic_unstable.bb
Diffs:
#
# mt diff -r4751c499f21f8617037586caaf287ddbb137be0b -rd46c4661bf8a227094ce244e37836233fb938268
#
#
#
# add_dir "contrib/source-checker"
#
# add_file "contrib/source-checker/oe-source-checker.py"
# content [5aabcd40189547d5ce2405c8b3bc94bbf81dfb2c]
#
# add_file "packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch"
# content [8f08d4ff350ac0e64ecbd5238a9a8e1327106932]
#
# patch "conf/checksums.ini"
# from [2927572869e798b2edf07bc1c3d8eb5c87280286]
# to [e31bcb4fdc3ac02f80ec7361769fdb09ed15804b]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [fd3b599a675b126dc6c1a594f1e7a96e7b2cfca5]
# to [e872d5cafbecf63d079a2ffaafcf06f792aa5288]
#
# patch "conf/machine/em-x270.conf"
# from [2068d979d6158266b6c75fe1b8ff553e77308e04]
# to [5345e7b2b7ee8722993816968ec1019cd30e3669]
#
# patch "packages/gstreamer/gst-plugins-ugly_0.10.6.bb"
# from [4abb994fb91c9f798af210780f9db761ea010eb5]
# to [a797c052361775643172a8cb270f3ea30d3da281]
#
# patch "packages/mathomatic/mathomatic_unstable.bb"
# from [6415fc5e8875f15658434e2993e1ece85d0e0e83]
# to [cb7aa5947be2f04f81a1c2aefae16a00de43bf00]
#
============================================================
--- contrib/source-checker/oe-source-checker.py 5aabcd40189547d5ce2405c8b3bc94bbf81dfb2c
+++ contrib/source-checker/oe-source-checker.py 5aabcd40189547d5ce2405c8b3bc94bbf81dfb2c
@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+# ex:ts=4:sw=4:sts=4:et
+
+# Copyright (C) 2007 OpenedHand
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+#
+# OpenEmbedded source checksums checker
+#
+# This script parse conf/checksums.ini and check does files contained in
+# source archive are the same as the one used to generate checksums.
+#
+# Run it:
+#
+# oe-source-checker.py path-to-conf/checksums.ini path-to-sources
+#
+#
+# How to deal with output:
+#
+# 1. download each failed entry
+# 2. check md5 and sha256 of file
+# 3. correct checksums.ini if needed
+# 4. share changes
+#
+
+
+import sys
+
+if len(sys.argv) < 3:
+ print """
+ OpenEmbedded source checker script require two arguments:
+
+ 1. location of conf/checksums.ini
+ 2. path to DL_DIR (without "/" at the end)
+ """
+ sys.exit(0)
+
+import ConfigParser, os
+
+checksums_parser = ConfigParser.ConfigParser()
+checksums_parser.read(sys.argv[1])
+
+for source in checksums_parser.sections():
+ archive = source.split("/")[-1]
+ localpath = os.path.join(sys.argv[2], archive)
+ md5 = checksums_parser.get(source, "md5")
+ sha = checksums_parser.get(source, "sha256")
+
+ try:
+ os.stat(localpath)
+ except:
+ continue
+
+ try:
+ md5pipe = os.popen('md5sum ' + localpath)
+ md5data = (md5pipe.readline().split() or [ "" ])[0]
+ md5pipe.close()
+
+ if md5 != md5data:
+ print "%s has wrong md5: %s instead of %s url: %s" % (archive, md5data, md5, source)
+
+ shapipe = os.popen("oe_sha256sum " + localpath)
+ shadata = (shapipe.readline().split() or [ "" ])[0]
+ shapipe.close()
+
+ if shadata != "" and sha != shadata:
+ print "%s has wrong sha: %s instead of %s url: %s" % (archive, shadata, sha, source)
+ except:
+ pass
============================================================
--- packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch 8f08d4ff350ac0e64ecbd5238a9a8e1327106932
+++ packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch 8f08d4ff350ac0e64ecbd5238a9a8e1327106932
@@ -0,0 +1,109 @@
+--- gst-plugins-ugly-0.10.6/ext/mad/gstmad.c.orig 2007-06-13 11:21:25.000000000 +0200
++++ gst-plugins-ugly-0.10.6/ext/mad/gstmad.c 2007-09-16 22:45:04.000000000 +0200
+@@ -119,8 +119,8 @@
+ GST_STATIC_CAPS ("audio/x-raw-int, "
+ "endianness = (int) " G_STRINGIFY (G_BYTE_ORDER) ", "
+ "signed = (boolean) true, "
+- "width = (int) 32, "
+- "depth = (int) 32, "
++ "width = (int) 16, "
++ "depth = (int) 16, "
+ "rate = (int) { 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 }, "
+ "channels = (int) [ 1, 2 ]")
+ );
+@@ -458,7 +458,7 @@
+
+ mad = GST_MAD (GST_PAD_PARENT (pad));
+
+- bytes_per_sample = MAD_NCHANNELS (&mad->frame.header) * 4;
++ bytes_per_sample = MAD_NCHANNELS (&mad->frame.header) << 1;
+
+ switch (src_format) {
+ case GST_FORMAT_BYTES:
+@@ -870,13 +870,11 @@
+ return res;
+ }
+
+-static inline gint32
++static inline gint16
+ scale (mad_fixed_t sample)
+ {
+-#if MAD_F_FRACBITS < 28
+ /* round */
+- sample += (1L << (28 - MAD_F_FRACBITS - 1));
+-#endif
++ sample += (1L << (MAD_F_FRACBITS - 16));
+
+ /* clip */
+ if (sample >= MAD_F_ONE)
+@@ -884,13 +882,8 @@
+ else if (sample < -MAD_F_ONE)
+ sample = -MAD_F_ONE;
+
+-#if MAD_F_FRACBITS < 28
+ /* quantize */
+- sample >>= (28 - MAD_F_FRACBITS);
+-#endif
+-
+- /* convert from 29 bits to 32 bits */
+- return (gint32) (sample << 3);
++ return sample >> (MAD_F_FRACBITS + 1 - 16);
+ }
+
+ /* do we need this function? */
+@@ -1277,8 +1270,8 @@
+ caps = gst_caps_new_simple ("audio/x-raw-int",
+ "endianness", G_TYPE_INT, G_BYTE_ORDER,
+ "signed", G_TYPE_BOOLEAN, TRUE,
+- "width", G_TYPE_INT, 32,
+- "depth", G_TYPE_INT, 32,
++ "width", G_TYPE_INT, 16,
++ "depth", G_TYPE_INT, 16,
+ "rate", G_TYPE_INT, rate, "channels", G_TYPE_INT, nchannels, NULL);
+
+ gst_pad_set_caps (mad->srcpad, caps);
+@@ -1576,7 +1569,7 @@
+ to skip and send the remaining pcm samples */
+
+ GstBuffer *outbuffer = NULL;
+- gint32 *outdata;
++ gint16 *outdata;
+ mad_fixed_t const *left_ch, *right_ch;
+
+ if (mad->need_newsegment) {
+@@ -1594,7 +1587,7 @@
+ /* will attach the caps to the buffer */
+ result =
+ gst_pad_alloc_buffer_and_set_caps (mad->srcpad, 0,
+- nsamples * mad->channels * 4, GST_PAD_CAPS (mad->srcpad),
++ nsamples * mad->channels * 2, GST_PAD_CAPS (mad->srcpad),
+ &outbuffer);
+ if (result != GST_FLOW_OK) {
+ /* Head for the exit, dropping samples as we go */
+@@ -1607,7 +1600,7 @@
+ left_ch = mad->synth.pcm.samples[0];
+ right_ch = mad->synth.pcm.samples[1];
+
+- outdata = (gint32 *) GST_BUFFER_DATA (outbuffer);
++ outdata = (gint16 *) GST_BUFFER_DATA (outbuffer);
+
+ GST_DEBUG ("mad out timestamp %" GST_TIME_FORMAT,
+ GST_TIME_ARGS (time_offset));
+@@ -1621,14 +1614,14 @@
+ gint count = nsamples;
+
+ while (count--) {
+- *outdata++ = scale (*left_ch++) & 0xffffffff;
++ *outdata++ = scale (*left_ch++) & 0xffff;
+ }
+ } else {
+ gint count = nsamples;
+
+ while (count--) {
+- *outdata++ = scale (*left_ch++) & 0xffffffff;
+- *outdata++ = scale (*right_ch++) & 0xffffffff;
++ *outdata++ = scale (*left_ch++) & 0xffff;
++ *outdata++ = scale (*right_ch++) & 0xffff;
+ }
+ }
+
============================================================
--- conf/checksums.ini 2927572869e798b2edf07bc1c3d8eb5c87280286
+++ conf/checksums.ini e31bcb4fdc3ac02f80ec7361769fdb09ed15804b
@@ -219,8 +219,8 @@ sha256=45299a4db47c9c08c3649d4f62b211ae7
sha256=45299a4db47c9c08c3649d4f62b211ae79ef5143360c264a40371a728f6ad99b
[ftp://ftp.debian.org/debian/pool/main/f/fakechroot/fakechroot_2.5.orig.tar.gz]
-md5=e2d4dd31f06c116685d0bdbccef84d00
-sha256=8961b4d552493bf0a00cbee21010fdf5344ebd7f29f304349c8c5023218c0227
+md5=b885951b98f4316f9686699e9853513d
+sha256=990cd830ea362ba2cb88ca7b59cd3f4d115a054621450b5cf211cadebed23ee0
[ftp://ftp.debian.org/debian/pool/main/f/fetchmail/fetchmail_6.2.5.orig.tar.gz]
md5=9956b30139edaa4f5f77c4d0dbd80225
@@ -1286,10 +1286,6 @@ sha256=8fdbc7da376b22796879d6e3b756f71a8
md5=9519eccf0638c9962f73a7b20da77e0e
sha256=8fdbc7da376b22796879d6e3b756f71a8800ed1b35fc88aa76cddffd6f1fd883
-[ftp://ftp.trolltech.com/pub/qt/source/qtopia-core-opensource-src-4.3.1.tar.gz]
-md5=8b2f59b22f1cfbcd86234867e432cae3
-sha256=73975dca4c345f1e41558ef8704532a1525d96a9b149d6f6729eb24c372bb577
-
[ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-base-0.17.tar.gz]
md5=1f0193358e92559ec0f598b09ccbc0ec
sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
@@ -1695,8 +1691,8 @@ sha256=639f8bd48c58b1fa4f24a65bc8aa3e532
sha256=639f8bd48c58b1fa4f24a65bc8aa3e53219e7d48726e63e7c40f0701d1d89b9c
[http://cheeseshop.python.org/packages/source/F/FormEncode/FormEncode-0.4.tar.gz]
-md5=bc5d1f77f9548a1c8c22e5ec1692e799
-sha256=042ed2bb4b15bbc1f1457447cd3ce0c14b339671ebfd3f68b4174e0aa039c043
+md5=797852a19505f7d919db96dd994d0484
+sha256=2c0de0243ce1853bf62ed9b2da122472b6682a117843af0cce4b4cf9588194ff
[http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-0.7.0.tar.gz]
md5=dccb921b5df6a15312b56630ac4ac205
@@ -3363,8 +3359,8 @@ sha256=138d2e59569f76f1a5d35bd5d85e7006e
sha256=138d2e59569f76f1a5d35bd5d85e7006eeebc4f48cd3dac902e2824ed50c3d80
[http://downloads.sourceforge.net/shfs/shfs-0.35.tar.gz]
-md5=f250003d998daea29af6bf81b5e7a1b4
-sha256=34cfa1df400b07d553488a3ab24bc445127b44fb2e8e6f4868f34ce9b3a7c3b8
+md5=016f49d71bc32eee2b5d11fc1600cfbe
+sha256=0d48ffe4d801180c15466f20aaa5802adb9d22067e8941e051dc3c64717ec3c2
[http://downloads.sourceforge.net/slotsig/slotsig-0.6.tar.bz2]
md5=dfe9f5d3f17075ec23eb923899ac5f24
@@ -3874,10 +3870,6 @@ sha256=6e932e73818697ea9ec8909bed535a87b
md5=40a93def0f37f1577c5edc638fcb35a5
sha256=6e932e73818697ea9ec8909bed535a87ba34651031bbbedb63a42e4cdc423284
-[http://freedesktop.org/Software/desktop-file-utils/releases/desktop-file-utils-0.6.tar.gz]
-md5=0d6b6d4fa861f73e0b4225e93077578f
-sha256=64c05a48e91850627cfaa7314d4b4b847547bc4333fa9345994fa49c79276f3d
-
[http://freedesktop.org/Software/startup-notification/releases/startup-notification-0.5.tar.gz]
md5=c7a96f4615b07ed847061b0a9a0be989
sha256=7d2f388f7b50fc5c929ef173c2df900c588329ab07c16184dee3745a26ac54ae
@@ -6162,18 +6154,6 @@ sha256=2c14ada1ac7d272e03b430d3a530d60fc
md5=34b0f354819217e6a345f48ebbd8f13e
sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2]
-md5=2e230d005c002fb3d38a3ca07c0200d0
-sha256=73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2]
-md5=2cc2fd4d521dc5d7cfce0d8a9d1b3472
-sha256=d4e67c0935ffb2a4158234bff92cc791b83177866009fc9b2214104e0038dbdb
-
-[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.23.1.tar.bz2]
-md5=518d57e08fdacd88907166a3bfe383b7
-sha256=35bcba56edf2a24f5d38bac0e530b2ce0e06eb094ba083b4a679c903077a671c
-
[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
md5=e921200f074ca97184e150ef5a4af825
sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -6354,10 +6334,6 @@ sha256=dd4d680ce95e586a1bbe767e1a7b25e1c
md5=5d139b1fb16f0e93f0c84290ad2aaff8
sha256=dd4d680ce95e586a1bbe767e1a7b25e1c53f842b8be6cf4e30e89cfa8232dd90
-[http://libtomcrypt.org/files/crypt-0.97b.tar.bz2]
-md5=ae5f51ac4dd94404a51d3b4601cab6d1
-sha256=68959ec2463ff0936db670370f50818bfdfc5bd3399f8547d04e6ac688529147
-
[http://links.twibright.com/download/links-2.1pre26.tar.bz2]
md5=841af2540c789e254b8465e07e24c684
sha256=c89f10d42be2a0be8a017e1084897b1aabc5bca76817e9dab43b758dff051c56
@@ -6418,10 +6394,6 @@ sha256=17b82323151925ff5a7ad09a21781a0fa
md5=866ba97420f5ce978b6a6b1cb4338890
sha256=17b82323151925ff5a7ad09a21781a0fa50ead4b87a339cee262271e4ededa13
-[http://llvm.org/releases/2.1/llvm-2.1.tar.gz]
-md5=b930e7213b37acc934d0d163cf13af18
-sha256=8cabd422f249ada736d864fc8a1f4d14aabefacb6f860c9beefbc53f93e0f96c
-
[http://lsc.fie.umich.mx/%7esadit/spyro/download/SPyDI-0.9.3.tar.gz]
md5=9f54fc8a40e26edd61ce67902b315a66
sha256=07675051b60343820b235a818f2c2d528b86d2a19c2f56833213e3f574f9cd1a
@@ -6754,10 +6726,6 @@ sha256=fcee22d7e31a936cde4672ac318ffabb9
md5=d227a37a8a7b036eed44e4278db45735
sha256=fcee22d7e31a936cde4672ac318ffabb9d39b7fc3b74de391bdade1419c59dfd
-[http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-1.0.49.tar.gz]
-md5=fbe492dbf3d68abb1d86c2322e7ed44a
-sha256=20acb0aa347f1629c4d5529ab8afbe4986fe820555049af3f905653300e5ea74
-
[http://people.openezx.org/ao2/fbgrab_network_mode.diff]
md5=71bf1218c52a6e4a1f38406748285255
sha256=e8cf4fe15d7e99e86016db3ddc1f403c35c49f40c4d37209d76cd5785c541aa8
@@ -6766,10 +6734,6 @@ sha256=f399428e0e191233b4dcead88afbe78a2
md5=002e9d7d85a2f0e6261b6bf501c53a3e
sha256=f399428e0e191233b4dcead88afbe78a26cc16bd9a47e305f6dd3299e011ef18
-[http://people.redhat.com/dcantrel/dhcdbd/dhcdbd-2.0.tar.bz2]
-md5=c3ae0208e6815491612bbd8586482ffe
-sha256=514bec6c457d3d503b5c0ba2e84db2c4da44857b5092bd00f2ff9a8e62351e88
-
[http://people.redhat.com/jvdias/dhcdbd/dhcdbd-1.14.tar.gz]
md5=1180dee7a51a4384d55768650634cf93
sha256=e5facfcab28377d32fd4c70aa1fe0820d3dba4abdfc48bd15eda712c8815e505
@@ -7258,10 +7222,6 @@ sha256=3b732ed179dd34c17d1ba17867b60a36f
md5=4dbdbe9a85c8f7f98dd0ee015a3c7b4f
sha256=3b732ed179dd34c17d1ba17867b60a36f20d82a3f0eca7b084fcb5396aa2b30c
-[http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz]
-md5=7b407c7ff5a38216f85d648365d81894
-sha256=bfa16a53bf481178f0b1bb51fadf539e96312fc3b84f1e54c650d2bae6f1eccb
-
[http://rohanpm.net/files/inotify-tools-2.1.tar.gz]
md5=8053f441fc3fe0f0c73cf483399da17b
sha256=84a111a6a979152cd25b60825b4945da4b167f19fb9ec115f9c59b4b49927547
@@ -8698,10 +8658,6 @@ sha256=e3ed263ee98971674f3f3cf55e42b7f2e
md5=a13e49376594c51fbfa74067f8d14d45
sha256=e3ed263ee98971674f3f3cf55e42b7f2e79755b0f931f8a105676108185e8010
-[http://www.kflog.org/fileadmin/user_upload/cumulus_snapshots/cumulus-snapshot.tbz]
-md5=854fd2826d96367999e5c252e16afbf5
-sha256=b82fbb74475244f2631247feaa77be49da3b8fd8ecc5cc9e9103f1d3227e01bf
-
[http://www.kismetwireless.net/code/kismet-2005-04-R1.tar.gz]
md5=19b4f192eb11a418ed3f6bf65c1226af
sha256=921fcd3033ecfd97d33cad2d940c0a5e5bbf8cb36fd7a62646fd486993a5a96f
@@ -9030,10 +8986,6 @@ sha256=88b11a3e89db847e1db51e6f2b0c69e2a
md5=eca63798136caeeaf7fd4b24c3e10783
sha256=88b11a3e89db847e1db51e6f2b0c69e2afa0035fb4a47f523d264765eedb2958
-[http://www.panix.com/~gesslein/am.tgz]
-md5=f7e4a6e3a214a82b035d0f69ae4bbc13
-sha256=988cce287562f67466ab512b7beef26e793d90c2a0793321c9f404e20d7a4423
-
[http://www.pdaxrom.org/download/1.1.0beta4/src/mb-applet-tasks-1.0.0.tar.bz2]
md5=3442d374f459c607395fd56998a6d7b0
sha256=ae72570a433f4e928c4b424dde003c5035fee765fad23c8df76f4062d67c53a0
@@ -9074,10 +9026,6 @@ sha256=6f0145ab1802092308adeb8dfa285f58e
md5=c389d3ffba0e69a179de2ec650f1fdcc
sha256=6f0145ab1802092308adeb8dfa285f58e104f0822fa266e5ec97e9d27f0e1923
-[http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz]
-md5=016e68eb361d542f8bfc2ef1a7bd6c95
-sha256=31909921a3c00d0ab13e0137541531415648c7bd51802f5ca9a3b11a0d1bd9f0
-
[http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.1.tar.bz2]
md5=b5789bb7eeaed0809c5c82d0efda571d
sha256=4e8a7fecd44807343b6867e1f2440aa0e09613d6d69a7385ac48f4e5e7737a73
@@ -11926,14 +11874,6 @@ sha256=9bb7412a03a76da4219215d2f92addf71
md5=3d0f372fb213e09b8d04826f3a0bc2eb
sha256=9bb7412a03a76da4219215d2f92addf71305ab3fcc7d9315bb6f9c41fbe851fd
-[http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.5.tar.bz2]
-md5=e34320c97d768191217424af64de380a
-sha256=f8e9efccbccbe1326a0a2579eb86651cf65e0937a38fae1afaec2269208d24a1
-
-[http://downloads.sourceforge.net/navit/navit-0.0.1.tar.gz]
-md5=521fbc102a804f7c26d4240b3f970380
-sha256=d79151209bf6b2d470773968b62258c56313bf857cda8ef27f8e321dd1a9d084
-
[http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.12.tar.gz]
md5=76596823cc1a6d1cdf7779b782ff0ee6
sha256=39e7c9f8644d1af310d076c1a5cc648040%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rada400c152f3d86308fbd602f1ddf750e4f21570 -rd46c4661bf8a227094ce244e37836233fb938268
#
#
# no changes
#
More information about the Openembedded-commits
mailing list