[oe-commits] org.oe.dev merge of '40d52bf1bf72c125584b4da643b7f704470ad4fc'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Oct 18 16:36:30 UTC 2007
merge of '40d52bf1bf72c125584b4da643b7f704470ad4fc'
and 'f3f1577d966df858daae7d11db4c333547563bfa'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 5b0629623adb33a44bd86d1522665dfeb7647103
ViewMTN: http://monotone.openembedded.org/revision/info/5b0629623adb33a44bd86d1522665dfeb7647103
Files:
1
packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch
conf/distro/include/sane-srcrevs.inc
packages/angstrom/angstrom-version.bb
packages/gstreamer/gst-meta-base_0.10.bb
packages/gstreamer/gst-plugins-ugly_0.10.6.bb
contrib/source-checker/oe-source-checker.py
Diffs:
#
# mt diff -r40d52bf1bf72c125584b4da643b7f704470ad4fc -r5b0629623adb33a44bd86d1522665dfeb7647103
#
#
#
# add_file "packages/gstreamer/gst-plugins-ugly/gstmad_16bit.patch"
# content [8f08d4ff350ac0e64ecbd5238a9a8e1327106932]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [094e6ff87045ec722ce3d1558347fe856bcf813c]
# to [e872d5cafbecf63d079a2ffaafcf06f792aa5288]
#
# patch "packages/angstrom/angstrom-version.bb"
# from [ff131aaba95a9bcd3a37ebca6e4718b621306acf]
# to [defa19a91820c9e7dabd4292ad9625039cd8163a]
#
# patch "packages/gstreamer/gst-meta-base_0.10.bb"
# from [b0453dd87de58747f8ba3b55a8c39fcbf1b851a1]
# to [48b37c86c01f0e9c728ce5b6e448e32185e1bbc6]
#
# patch "packages/gstreamer/gst-plugins-ugly_0.10.6.bb"
# from [4abb994fb91c9f798af210780f9db761ea010eb5]
# to [a797c052361775643172a8cb270f3ea30d3da281]
#
============================================================
--- 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/distro/include/sane-srcrevs.inc 094e6ff87045ec722ce3d1558347fe856bcf813c
+++ conf/distro/include/sane-srcrevs.inc e872d5cafbecf63d079a2ffaafcf06f792aa5288
@@ -64,7 +64,7 @@ SRCREV_pn-openmoko-libs ?= "2367"
SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3066"
SRCREV_pn-openmoko-keyboard ?= "1631"
SRCREV_pn-openmoko-libs ?= "2367"
-SRCREV_pn-openmoko-mediaplayer2 ?= "3057"
+SRCREV_pn-openmoko-mediaplayer2 ?= "3208"
SRCREV_pn-openmoko-messages ?= "2276"
SRCREV_pn-openmoko-panel-battery ?= "2897"
SRCREV_pn-openmoko-panel-bt ?= "2896"
============================================================
--- packages/angstrom/angstrom-version.bb ff131aaba95a9bcd3a37ebca6e4718b621306acf
+++ packages/angstrom/angstrom-version.bb defa19a91820c9e7dabd4292ad9625039cd8163a
@@ -1,5 +1,6 @@ PR = "r1"
PV = "${DISTRO_VERSION}"
PR = "r1"
+PE = "1"
PACKAGES = "${PN}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
============================================================
--- packages/gstreamer/gst-meta-base_0.10.bb b0453dd87de58747f8ba3b55a8c39fcbf1b851a1
+++ packages/gstreamer/gst-meta-base_0.10.bb 48b37c86c01f0e9c728ce5b6e448e32185e1bbc6
@@ -1,8 +1,8 @@ DEPENDS = "gstreamer gst-plugins-base gs
# Based on its sibling on Poky which is copyright (C) 2006,2007 OpenedHand LTD
DESCRIPTION = "Gstreamer package groups"
DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly"
-PR = "r7"
+PR = "r8"
PACKAGES = "\
gst-meta-base \
@@ -12,18 +12,23 @@ ALLOW_EMPTY = "1"
ALLOW_EMPTY = "1"
-RDEPENDS_gst-meta-base = "\
+REPENDS_gst-meta-base = "\
gstreamer \
gst-plugin-playbin \
gst-plugin-decodebin \
-# gst-plugin-gnomevfs \
- gst-plugin-alsa \
gst-plugin-volume \
- gst-plugin-ximagesink \
gst-plugin-audioconvert \
gst-plugin-audioresample \
gst-plugin-typefindfunctions \
gst-plugin-videoscale \
+ gst-plugin-autodetect"
+
+RRECOMMENDS_gst-meta-base = "\
+ gst-plugin-gnomevfs \
+ gst-plugin-alsa \
+ gst-plugin-ximagesink \
+ gst-plugin-typefindfunctions \
+ gst-plugin-videoscale \
gst-plugin-ffmpegcolorspace \
gst-plugin-autodetect"
============================================================
--- packages/gstreamer/gst-plugins-ugly_0.10.6.bb 4abb994fb91c9f798af210780f9db761ea010eb5
+++ packages/gstreamer/gst-plugins-ugly_0.10.6.bb a797c052361775643172a8cb270f3ea30d3da281
@@ -1,6 +1,7 @@ DEPENDS += "gst-plugins-base"
require gst-plugins.inc
DEPENDS += "gst-plugins-base"
-SRC_URI += "file://cross-compile.patch;patch=1"
+SRC_URI += "file://cross-compile.patch;patch=1 \
+ file://gstmad_16bit.patch;patch=1"
+PR = "r1"
-PR = "r0"
#
# mt diff -rf3f1577d966df858daae7d11db4c333547563bfa -r5b0629623adb33a44bd86d1522665dfeb7647103
#
#
#
# patch "contrib/source-checker/oe-source-checker.py"
# from [5aabcd40189547d5ce2405c8b3bc94bbf81dfb2c]
# to [040be52b885ada3edd5f86a0a2221133340d40ba]
#
============================================================
--- contrib/source-checker/oe-source-checker.py 5aabcd40189547d5ce2405c8b3bc94bbf81dfb2c
+++ contrib/source-checker/oe-source-checker.py 040be52b885ada3edd5f86a0a2221133340d40ba
@@ -47,35 +47,60 @@ if len(sys.argv) < 3:
"""
sys.exit(0)
-import ConfigParser, os
+import ConfigParser, os, itertools
checksums_parser = ConfigParser.ConfigParser()
checksums_parser.read(sys.argv[1])
+parsespin = itertools.cycle( r'|/-\\' )
+
+item = 1;
+files_total = len(checksums_parser.sections())
+files_checked = 0
+files_good = 0
+files_wrong = 0
+
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")
+ if os.isatty(sys.stdout.fileno()):
+ sys.stdout.write("\rChecking files: %s (%04d/%04d) [%2d %%]" % ( parsespin.next(), item, files_total, item*100/files_total ) )
+ sys.stdout.flush()
+ item += 1
+
try:
os.stat(localpath)
except:
continue
+ files_checked += 1
+ file_ok = True
+
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)
+ file_ok = False
+ print "\n%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)
+ file_ok = False
+ print "\n%s has wrong sha: %s instead of %s url: %s" % (archive, shadata, sha, source)
+
+ if file_ok:
+ files_good += 1
+ else:
+ files_wrong += 1
except:
pass
+
+print "\nChecked %d files. %d was OK and %d had wrong checksums." % (files_checked, files_good, files_wrong)
More information about the Openembedded-commits
mailing list