./vorbis-tools r36: * Add upstream_r14728-speex_format_validation.diff. closes: #480059.
Clint Adams
schizo at debian.org
Tue May 20 15:18:33 UTC 2008
------------------------------------------------------------
revno: 36
committer: Clint Adams <schizo at debian.org>
branch nick: vorbis-tools
timestamp: Tue 2008-05-20 11:18:33 -0400
message:
* Add upstream_r14728-speex_format_validation.diff. closes: #480059.
* Loosen libflac-dev build dependency to (>> 1.1.4) to facilitate
backports.
added:
debian/patches/upstream_r14728-speex_format_validation.diff
modified:
debian/changelog
debian/control
debian/patches/series
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-03-09 10:21:28 +0000
+++ b/debian/changelog 2008-05-20 15:18:33 +0000
@@ -1,9 +1,15 @@
-vorbis-tools (1.2.0-2) UNRELEASED; urgency=low
+vorbis-tools (1.2.0-2) unstable; urgency=medium
+ [ Adeodato Sim? ]
* Install upstream CHANGES file as changelog.gz. Thanks Bastian Kleineidam.
(Closes: #470133)
- -- Adeodato Sim? <dato at net.com.org.es> Sun, 09 Mar 2008 11:20:20 +0100
+ [ Clint Adams ]
+ * Add upstream_r14728-speex_format_validation.diff. closes: #480059.
+ * Loosen libflac-dev build dependency to (>> 1.1.4) to facilitate
+ backports.
+
+ -- Clint Adams <schizo at debian.org> Tue, 20 May 2008 10:49:09 -0400
vorbis-tools (1.2.0-1) unstable; urgency=low
=== modified file 'debian/control'
--- a/debian/control 2008-03-08 20:31:00 +0000
+++ b/debian/control 2008-05-20 15:18:33 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Xiph.org Maintainers <pkg-xiph-maint at lists.alioth.debian.org>
Uploaders: Adeodato Sim? <dato at net.com.org.es>, Clint Adams <schizo at debian.org>
-Build-Depends: autotools-dev, debhelper, quilt, libcurl4-gnutls-dev, libao-dev, libogg-dev, libflac-dev (>= 1.1.4-1) | liboggflac-dev, libspeex-dev, libvorbis-dev
+Build-Depends: autotools-dev, debhelper, quilt, libcurl4-gnutls-dev, libao-dev, libogg-dev, libflac-dev (>= 1.1.4) | liboggflac-dev, libspeex-dev, libvorbis-dev
Standards-Version: 3.7.3
Vcs-Bzr: http://bzr.debian.org/bzr/pkg-xiph/vorbis-tools
=== modified file 'debian/patches/series'
--- a/debian/patches/series 2008-03-08 20:31:00 +0000
+++ b/debian/patches/series 2008-05-20 15:18:33 +0000
@@ -1,3 +1,4 @@
+upstream_r14728-speex_format_validation.diff
for_upstream-mention_alsa09_in_ogg123.1.diff
for_upstream-manpage_typos.diff
no_debian_subdir.diff
=== added file 'debian/patches/upstream_r14728-speex_format_validation.diff'
--- a/debian/patches/upstream_r14728-speex_format_validation.diff 1970-01-01 00:00:00 +0000
+++ b/debian/patches/upstream_r14728-speex_format_validation.diff 2008-05-20 15:18:33 +0000
@@ -0,0 +1,167 @@
+--- a/ogg123/speex_format.c
++++ b/ogg123/speex_format.c
+@@ -103,7 +103,7 @@
+ int len;
+
+ len = source->transport->peek(source, buf, sizeof(char), 36);
+-
++
+ if (len >= 32 && memcmp(buf, "OggS", 4) == 0
+ && memcmp(buf+28, "Speex ", 8) == 0) /* 3 trailing spaces */
+ return 1;
+@@ -181,7 +181,7 @@
+ if (priv->bos) {
+
+ ret = read_speex_header(decoder);
+-
++
+ if (!ret) {
+ *eos = 1;
+ return 0; /* Bail out! */
+@@ -200,7 +200,7 @@
+ while (nbytes) {
+ char *data;
+ int i, j, nb_read;
+-
++
+ /* First see if there is anything left in the output buffer and
+ empty it out */
+ if (priv->output_left > 0) {
+@@ -209,7 +209,7 @@
+ to_copy *= audio_fmt->channels;
+
+ to_copy = priv->output_left < to_copy ? priv->output_left : to_copy;
+-
++
+ /* Integerify it! */
+ for (i = 0; i < to_copy; i++)
+ out[i]=(ogg_int16_t)priv->output[i+priv->output_start];
+@@ -217,18 +217,18 @@
+ out += to_copy;
+ priv->output_start += to_copy;
+ priv->output_left -= to_copy;
+-
++
+ priv->currentsample += to_copy / audio_fmt->channels;
+
+ nbytes -= to_copy * 2;
+ } else if (ogg_stream_packetout(&priv->os, &priv->op) == 1) {
+ float *temp_output = priv->output;
+ /* Decode some more samples */
+-
++
+ /*Copy Ogg packet to Speex bitstream*/
+ speex_bits_read_from(&priv->bits, (char*)priv->op.packet,
+ priv->op.bytes);
+-
++
+ for (j = 0;j < priv->frames_per_packet; j++) {
+ /*Decode frame*/
+ speex_decode(priv->st, &priv->bits, temp_output);
+@@ -257,7 +257,7 @@
+ ogg_stream_pagein(&priv->os, &priv->og);
+ } else if (!priv->eof) {
+ /* Finally, pull in some more data and try again on the next pass */
+-
++
+ /*Get the ogg buffer for writing*/
+ data = ogg_sync_buffer(&priv->oy, 200);
+ /*Read bitstream from input file*/
+@@ -274,7 +274,7 @@
+ break;
+ }
+ }
+-
++
+ return bytes_requested - nbytes;
+ }
+
+@@ -411,7 +411,7 @@
+ temp[len] = '\0';
+
+ cb->printf_metadata(callback_arg, 3, _("Encoded by: %s"), temp);
+-
++
+
+ /* Parse out user comments */
+
+@@ -440,7 +440,7 @@
+ free(temp);
+ return;
+ }
+-
++
+ if (temp_len < len + 1) {
+ temp_len = len + 1;
+ temp = realloc(temp, sizeof(char) * temp_len);
+@@ -449,7 +449,7 @@
+
+ strncpy(temp, c, len);
+ temp[len] = '\0';
+-
++
+ print_vorbis_comment(temp, cb, callback_arg);
+
+ c += len;
+@@ -469,13 +469,13 @@
+ int modeID;
+ SpeexCallback callback;
+ int enhance = ENHANCE_AUDIO;
+-
++
+ *header = speex_packet_to_header((char*)op->packet, op->bytes);
+ if (!*header) {
+ cb->printf_error(callback_arg, ERROR, _("Cannot read header"));
+ return NULL;
+ }
+- if ((*header)->mode >= SPEEX_NB_MODES) {
++ if ((*header)->mode >= SPEEX_NB_MODES || (*header)->mode < 0) {
+ cb->printf_error(callback_arg, ERROR,
+ _("Mode number %d does not (any longer) exist in this version"),
+ (*header)->mode);
+@@ -484,7 +484,7 @@
+
+ modeID = (*header)->mode;
+ mode = speex_mode_list[modeID];
+-
++
+ if (mode->bitstream_version < (*header)->mode_bitstream_version) {
+ cb->printf_error(callback_arg, ERROR, _("The file was encoded with a newer version of Speex.\n You need to upgrade in order to play it.\n"));
+ return NULL;
+@@ -493,11 +493,11 @@
+ cb->printf_error(callback_arg, ERROR, _("The file was encoded with an older version of Speex.\nYou would need to downgrade the version in order to play it."));
+ return NULL;
+ }
+-
++
+ st = speex_decoder_init(mode);
+ speex_decoder_ctl(st, SPEEX_SET_ENH, &enhance);
+ speex_decoder_ctl(st, SPEEX_GET_FRAME_SIZE, frame_size);
+-
++
+ callback.callback_id = SPEEX_INBAND_STEREO;
+ callback.func = speex_std_stereo_request_handler;
+ callback.data = stereo;
+@@ -521,11 +521,11 @@
+ while (packet_count < 2) {
+ /*Get the ogg buffer for writing*/
+ data = ogg_sync_buffer(&priv->oy, 200);
+-
++
+ /*Read bitstream from input file*/
+ nb_read = trans->read(decoder->source, data, sizeof(char), 200);
+ ogg_sync_wrote(&priv->oy, nb_read);
+-
++
+ /*Loop for all complete pages we got (most likely only one)*/
+ while (ogg_sync_pageout(&priv->oy, &priv->og)==1) {
+
+@@ -533,7 +533,7 @@
+ ogg_stream_init(&priv->os, ogg_page_serialno(&priv->og));
+ stream_init = 1;
+ }
+-
++
+ /*Add page to the bitstream*/
+ ogg_stream_pagein(&priv->os, &priv->og);
+
More information about the pkg-xiph-commits
mailing list