Package: gnusound
Version: 0.7.4-4
Severity: normal
Tags: patch
Hi,
Attached is the diff for my gnusound 0.7.4-4.1 NMU.
diff -u gnusound-0.7.4/debian/rules gnusound-0.7.4/debian/rules
--- gnusound-0.7.4/debian/rules
+++ gnusound-0.7.4/debian/rules
@@ -27,7 +27,7 @@
binary-install/gnusound::
# man page
- dh_installman -pgnusound doc/gnusound.1
+ dh_installman -pgnusound doc/C/gnusound.1
# Better stripping for modules
find debian/gnusound/usr/lib/gnusound/modules/ -name "*.so" -type f
-exec strip --remove-section=.comment --remove-section=.note --strip-unneeded
{} \;
# Wrapper to set LADSPA_PATH
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=high
+
+ * Non-maintainer upload.
+ * Let dh_installman look in doc/C/, not doc/ -- for some reason the
+ manpage moved.
+ * Add a new patch to adjust to ffmpeg API changes; fixes FTBFS.
+ (Closes: #377608)
+
+ -- Steinar H. Gunderson <[EMAIL PROTECTED]> Mon, 17 Jul 2006 22:01:48 +0200
+
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_api_changes.patch
+++ gnusound-0.7.4/debian/patches/11_ffmpeg_api_changes.patch
@@ -0,0 +1,39 @@
+--- modules/file_ffmpeg.c 2005-06-19 17:44:25.000000000 +0200
++++ modules/file_ffmpeg.c 2006-07-17 22:00:41.000000000 +0200
+@@ -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
