Package: miro
Version: 4.0.4-1.1
Severity: serious
Justification: fails to build from source
Tags: patch
Dear Maintainer,
miro currently fails to build in sid:
cc -I/usr/include/ffmpeg -c
/tmp/buildd/miro-4.0.4/linux/miro-segmenter.c -o
/tmp/buildd/miro-4.0.4/./build/miro-segmenter/tmp/buildd/miro-4.0.4/linux/miro-segmenter.o
/tmp/buildd/miro-4.0.4/linux/miro-segmenter.c: In function
'add_output_stream':
/tmp/buildd/miro-4.0.4/linux/miro-segmenter.c:81:92: error:
'CODEC_ID_MP3' undeclared (first use in this function)
if ((input_codec_context->block_align == 1 &&
input_codec_context->codec_id == CODEC_ID_MP3) ||
input_codec_context->codec_id == CODEC_ID_AC3) {
^
/tmp/buildd/miro-4.0.4/linux/miro-segmenter.c:81:92: note: each
undeclared identifier is reported only once for each function it appears in
/tmp/buildd/miro-4.0.4/linux/miro-segmenter.c:81:142: error:
'CODEC_ID_AC3' undeclared (first use in this function)
if ((input_codec_context->block_align == 1 &&
input_codec_context->codec_id == CODEC_ID_MP3) ||
input_codec_context->codec_id == CODEC_ID_AC3) {
^
error: command 'cc' failed with exit status 1
/usr/share/cdbs/1/class/python-distutils.mk:105: recipe for target
'debian/python-module-stampdir/miro' failed
make: *** [debian/python-module-stampdir/miro] Error 1
dpkg-buildpackage: error: debian/rules build gave error exit status 2
Attached is a patch fixing this problem.
Best regards,
Andreas
diff --git a/debian/patches/CodecID.patch b/debian/patches/CodecID.patch
new file mode 100644
index 0000000..4e59be1
--- /dev/null
+++ b/debian/patches/CodecID.patch
@@ -0,0 +1,19 @@
+Description: Rename CODEC_ID_* to AV_CODEC_ID_*
+
+Author: Andreas Cadhalpun <andreas.cadhal...@googlemail.com>
+Last-Update: <2014-05-21>
+
+--- miro-4.0.4.orig/linux/miro-segmenter.c
++++ miro-4.0.4/linux/miro-segmenter.c
+@@ -78,7 +78,11 @@ static AVStream *add_output_stream(AVFor
+ output_codec_context->sample_rate = input_codec_context->sample_rate;
+ output_codec_context->channels = input_codec_context->channels;
+ output_codec_context->frame_size = input_codec_context->frame_size;
++#if LIBAVCODEC_VERSION_MAJOR > 54
++ if ((input_codec_context->block_align == 1 && input_codec_context->codec_id == AV_CODEC_ID_MP3) || input_codec_context->codec_id == AV_CODEC_ID_AC3) {
++#else
+ if ((input_codec_context->block_align == 1 && input_codec_context->codec_id == CODEC_ID_MP3) || input_codec_context->codec_id == CODEC_ID_AC3) {
++#endif
+ output_codec_context->block_align = 0;
+ }
+ else {
diff --git a/debian/patches/series b/debian/patches/series
index d1cc606..a7b7305 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
120_miro.desktop.patch
130_libav9.patch
140_use_avconv.patch
+CodecID.patch
