tags 377608 + pending patch thanks This was indeed a problem due to a change in libavformat-dev. The change was made upstream in July 2005 [1], but just to be sure I updated the dependency version to the latest one in the archive.
Also, as I was testing the package, I found out that a behavioral change in cdbs made the manpage turn up in the wrong location and thus not be installed. Therefore, I fixed this as well, and updated cdbs's dependency version. I'm attaching the full NMU diff, and the patch for the new libavformat-dev. I intend to upload the NMU to the 3-day delayed queue. Marga. [1]: http://lists.mplayerhq.hu/pipermail/ffmpeg-cvslog/2005-July/000531.html -- Bessos, Maggie.
diff -u gnusound-0.7.4/debian/patches/01_manpage.patch
gnusound-0.7.4/debian/patches/01_manpage.patch
--- gnusound-0.7.4/debian/patches/01_manpage.patch
+++ gnusound-0.7.4/debian/patches/01_manpage.patch
@@ -1,5 +1,5 @@
---- doc/gnusound.1.orig
-+++ doc/gnusound.1
+--- gnusound/doc/gnusound.1.orig
++++ gnusound/doc/gnusound.1
@@ -0,0 +1,346 @@
+.\"Generated by db2man.xsl. Don't modify this, modify the source.
+.de Sh \" Subsection
diff -u gnusound-0.7.4/debian/control gnusound-0.7.4/debian/control
--- gnusound-0.7.4/debian/control
+++ gnusound-0.7.4/debian/control
@@ -2,7 +2,7 @@
Section: sound
Priority: optional
Maintainer: Marc Dequènes (Duck) <[EMAIL PROTECTED]>
-Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, patchutils (>= 0.2.25),
debhelper (>= 4.2.21), libglade2-dev, libgnome2-dev, libgnomeui-dev,
libpng12-dev, libaudiofile-dev, libsamplerate0-dev, libxml2-utils, xsltproc,
docbook-xsl, docbook-xml, libsndfile1-dev (>= 1.0.4), libvorbis-dev,
libavcodec-dev (>= 0.cvs20050811-2), libavformat-dev(>= 0.cvs20050811-2),
libflac-dev (>= 1.1.2-1), libasound2-dev (>= 1.0.2), libjack0.100.0-dev,
libtheora-dev
+Build-Depends: cdbs (>= 0.4.40), autotools-dev, patchutils (>= 0.2.25),
debhelper (>= 4.2.21), libglade2-dev, libgnome2-dev, libgnomeui-dev,
libpng12-dev, libaudiofile-dev, libsamplerate0-dev, libxml2-utils, xsltproc,
docbook-xsl, docbook-xml, libsndfile1-dev (>= 1.0.4), libvorbis-dev,
libavcodec-dev (>= 0.cvs20060329-4), libavformat-dev(>= 0.cvs20060329-4),
libflac-dev (>= 1.1.2-1), libasound2-dev (>= 1.0.2), libjack0.100.0-dev,
libtheora-dev
Standards-Version: 3.6.2.1
Package: gnusound
diff -u gnusound-0.7.4/debian/changelog gnusound-0.7.4/debian/changelog
--- gnusound-0.7.4/debian/changelog
+++ gnusound-0.7.4/debian/changelog
@@ -1,3 +1,13 @@
+gnusound (0.7.4-4.1) unstable; urgency=medium
+
+ * NMU to fix problems with new versions of libavformat-dev: added
+ debian/patches/11_ffmpeg_codec_struct.patch; and updated the
+ dependency version to avoid backwards problems. (Closes: #377608).
+ * Fix debian/patches/01_manpage.patch so that it installs at the correct
+ location (Due to a behavioural change in cdbs >= 0.4.40).
+
+ -- Margarita Manterola <[EMAIL PROTECTED]> Mon, 17 Jul 2006 18:00:19 -0300
+
gnusound (0.7.4-4) unstable; urgency=high
* Applied patch fixing FTBFS on amd64 from Andreas Jochens (Closes:
only in patch2:
unchanged:
--- gnusound-0.7.4.orig/debian/patches/11_ffmpeg_codec_struct.patch
+++ gnusound-0.7.4/debian/patches/11_ffmpeg_codec_struct.patch
@@ -0,0 +1,39 @@
+--- gnusound-0.7.4/modules/file_ffmpeg.c 2005-06-19 12:44:25.000000000
-0300
++++ gnusound-0.7.4-fixed/modules/file_ffmpeg.c 2006-07-17 17:13:53.741117370
-0300
+@@ -146,7 +146,7 @@
+ return cmd_new_error_val("Could not open audio stream");
+ }
+
+- codec = avcodec_find_decoder(fc->streams[audio_index]->codec.codec_id);
++ codec = avcodec_find_decoder(fc->streams[audio_index]->codec->codec_id);
+ snprintf(ffmpeg_data->format_name, sizeof(ffmpeg_data->format_name),
+ "%s/%s", fc->iformat->name, codec->name);
+
+@@ -155,8 +155,8 @@
+ ffmpeg_data->audio_stream = fc->streams[audio_index];
+
+ params->sample_type = SAMPLE_TYPE_INT_16;
+- params->sample_rate = ffmpeg_data->audio_stream->codec.sample_rate;
+- params->channels = ffmpeg_data->audio_stream->codec.channels;
++ params->sample_rate = ffmpeg_data->audio_stream->codec->sample_rate;
++ params->channels = ffmpeg_data->audio_stream->codec->channels;
+ params->frame_count = -1;
+
+ av_read_play(fc);
+@@ -274,14 +274,14 @@
+ * could save a memcpy() here, but this is cleaner.
+ */
+
+- copied = MIN(count * ffmpeg_data->audio_stream->codec.channels * 2,
++ copied = MIN(count * ffmpeg_data->audio_stream->codec->channels * 2,
+ ffmpeg_data->decode_buf_avail);
+ memcpy(buf, ffmpeg_data->decode_buf + ffmpeg_data->decode_buf_offset,
+ copied);
+ ffmpeg_data->decode_buf_offset += copied;
+ ffmpeg_data->decode_buf_avail -= copied;
+
+- return copied / (ffmpeg_data->audio_stream->codec.channels * 2);
++ return copied / (ffmpeg_data->audio_stream->codec->channels * 2);
+ }
+
+ static long
--- gnusound-0.7.4/modules/file_ffmpeg.c 2005-06-19 12:44:25.000000000
-0300
+++ gnusound-0.7.4-fixed/modules/file_ffmpeg.c 2006-07-17 17:13:53.741117370
-0300
@@ -146,7 +146,7 @@
return cmd_new_error_val("Could not open audio stream");
}
- codec = avcodec_find_decoder(fc->streams[audio_index]->codec.codec_id);
+ codec = avcodec_find_decoder(fc->streams[audio_index]->codec->codec_id);
snprintf(ffmpeg_data->format_name, sizeof(ffmpeg_data->format_name),
"%s/%s", fc->iformat->name, codec->name);
@@ -155,8 +155,8 @@
ffmpeg_data->audio_stream = fc->streams[audio_index];
params->sample_type = SAMPLE_TYPE_INT_16;
- params->sample_rate = ffmpeg_data->audio_stream->codec.sample_rate;
- params->channels = ffmpeg_data->audio_stream->codec.channels;
+ params->sample_rate = ffmpeg_data->audio_stream->codec->sample_rate;
+ params->channels = ffmpeg_data->audio_stream->codec->channels;
params->frame_count = -1;
av_read_play(fc);
@@ -274,14 +274,14 @@
* could save a memcpy() here, but this is cleaner.
*/
- copied = MIN(count * ffmpeg_data->audio_stream->codec.channels * 2,
+ copied = MIN(count * ffmpeg_data->audio_stream->codec->channels * 2,
ffmpeg_data->decode_buf_avail);
memcpy(buf, ffmpeg_data->decode_buf + ffmpeg_data->decode_buf_offset,
copied);
ffmpeg_data->decode_buf_offset += copied;
ffmpeg_data->decode_buf_avail -= copied;
- return copied / (ffmpeg_data->audio_stream->codec.channels * 2);
+ return copied / (ffmpeg_data->audio_stream->codec->channels * 2);
}
static long
signature.asc
Description: Digital signature
