Control: tags -1 + pending On 2013-09-23 09:40:34, Uwe Hermann wrote: > Hi, > > On Sun, Sep 22, 2013 at 10:45:49PM +0200, Sebastian Ramacher wrote: > > Would you mind if I'd upload a NMU in the meantime? > > Ok, go ahead, I'll do another upload then after the transition is > through.
I've uploaded the NMU to DELAYED/2 versioned as 4.0.4-1.1. I had to do some more changes. I've missed that miro uses the ffmpeg binary which is also going away. The attached patch additionally converts from ffmpeg to avconv (from libav-tools) and changes the parameters used to do the conversions to what avconv expects. Cheers -- Sebastian Ramacher
diff -Nru miro-4.0.4/debian/changelog miro-4.0.4/debian/changelog
--- miro-4.0.4/debian/changelog 2012-01-02 23:11:27.000000000 +0100
+++ miro-4.0.4/debian/changelog 2013-09-24 03:51:12.000000000 +0200
@@ -1,3 +1,14 @@
+miro (4.0.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches:
+ - 130_libav9.patch: Fix building with libav 9. (Closes: #720810)
+ - 140_use_avconv.patch: Use avconv instead of ffmpeg which is no longer
+ built by libav.
+ * debian/control: Change Suggests on ffmpeg to libav-tools.
+
+ -- Sebastian Ramacher <sramac...@debian.org> Tue, 24 Sep 2013 03:51:11 +0200
+
miro (4.0.4-1) unstable; urgency=low
* New upstream release.
diff -Nru miro-4.0.4/debian/control miro-4.0.4/debian/control
--- miro-4.0.4/debian/control 2012-01-02 22:58:15.000000000 +0100
+++ miro-4.0.4/debian/control 2013-09-24 03:16:08.000000000 +0200
@@ -41,7 +41,7 @@
python-notify,
gstreamer0.10-plugins-ugly (>= 0.10.0),
libavahi-compat-libdnssd1,
- ffmpeg,
+ libav-tools,
ffmpeg2theora
Conflicts: miro-data (<< 1.2.1)
Description: GTK+ based RSS video aggregator
diff -Nru miro-4.0.4/debian/patches/130_libav9.patch
miro-4.0.4/debian/patches/130_libav9.patch
--- miro-4.0.4/debian/patches/130_libav9.patch 1970-01-01 01:00:00.000000000
+0100
+++ miro-4.0.4/debian/patches/130_libav9.patch 2013-09-24 02:09:43.000000000
+0200
@@ -0,0 +1,118 @@
+Description: Port to libav 9 API
+Author: Sebastian Ramacher <sramac...@debian.org>
+Bug-Debian: http://bugs.debian.org/720810
+Last-Update: 2013-09-24
+
+--- a/linux/miro-segmenter.c
++++ b/linux/miro-segmenter.c
+@@ -40,7 +40,11 @@
+ AVCodecContext *output_codec_context;
+ AVStream *output_stream;
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 54
++ output_stream = avformat_new_stream(output_format_context, 0);
++#else
+ output_stream = av_new_stream(output_format_context, 0);
++#endif
+ if (!output_stream) {
+ fprintf(stderr, "Could not allocate stream\n");
+ exit(1);
+@@ -156,13 +160,21 @@
+ exit(1);
+ }
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 54
++ ret = avformat_open_input(&ic, input, ifmt, NULL);
++#else
+ ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
++#endif
+ if (ret != 0) {
+ fprintf(stderr, "Could not open input file, make sure it is an mpegts
file: %d\n", ret);
+ exit(1);
+ }
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 54
++ if (avformat_find_stream_info(ic, NULL) < 0) {
++#else
+ if (av_find_stream_info(ic) < 0) {
++#endif
+ fprintf(stderr, "Could not read stream information\n");
+ exit(1);
+ }
+@@ -215,12 +227,16 @@
+ }
+ }
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 54
++ av_dump_format(oc, 0, input, 1);
++#else
+ if (av_set_parameters(oc, NULL) < 0) {
+ fprintf(stderr, "Invalid output format parameters\n");
+ exit(1);
+ }
+
+ dump_format(oc, 0, input, 1);
++#endif
+
+ if (video_st) {
+ codec = avcodec_find_decoder(video_st->codec->codec_id);
+@@ -228,17 +244,29 @@
+ fprintf(stderr, "Could not find video decoder, key frames will
not be honored\n");
+ }
+
++#if LIBAVCODEC_VERSION_MAJOR >= 54
++ if (avcodec_open2(video_st->codec, codec, NULL) < 0) {
++#else
+ if (avcodec_open(video_st->codec, codec) < 0) {
++#endif
+ fprintf(stderr, "Could not open video decoder, key frames will
not be honored\n");
+ }
+ }
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 54
++ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
++#else
+ if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++#endif
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ exit(1);
+ }
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 54
++ if (avformat_write_header(oc, NULL)) {
++#else
+ if (av_write_header(oc)) {
++#endif
+ fprintf(stderr, "Could not write mpegts header to first output
file\n");
+
+ exit(1);
+@@ -274,10 +302,17 @@
+ }
+
+ if (segment_time - prev_segment_time >= segment_duration) {
++#if LIBAVFORMAT_VERSION_MAJOR >= 54
++ avio_flush(oc->pb);
++ avio_close(oc->pb);
++
++ if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
++#else
+ put_flush_packet(oc->pb);
+ url_fclose(oc->pb);
+
+ if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++#endif
+ fprintf(stderr, "Could not open '%s'\n", output_filename);
+ break;
+ }
+@@ -307,7 +342,11 @@
+ av_freep(&oc->streams[i]);
+ }
+
++#if LIBAVFORMAT_VERSION_MAJOR >= 54
++ avio_close(oc->pb);
++#else
+ url_fclose(oc->pb);
++#endif
+ av_free(oc);
+
+ /* End-of-transcode marker. */
diff -Nru miro-4.0.4/debian/patches/140_use_avconv.patch
miro-4.0.4/debian/patches/140_use_avconv.patch
--- miro-4.0.4/debian/patches/140_use_avconv.patch 1970-01-01
01:00:00.000000000 +0100
+++ miro-4.0.4/debian/patches/140_use_avconv.patch 2013-09-24
03:51:02.000000000 +0200
@@ -0,0 +1,74 @@
+Description: Use avconv instead of ffmpeg
+Author: Sebastian Ramacher <sramac...@debian.org>
+Last-Update: 2013-09-24
+
+--- a/linux/plat/options.py
++++ b/linux/plat/options.py
+@@ -51,7 +51,7 @@
+
+ FFMPEG_BINARY = LinuxPref(
+ key="ffmpegBinary",
+- default="/usr/bin/ffmpeg",
++ default="/usr/bin/avconv",
+ alias="ffmpeg",
+ helptext="Absolute path for ffmpeg binary.")
+
+--- a/resources/conversions/android.conv
++++ b/resources/conversions/android.conv
+@@ -2,7 +2,7 @@
+ name: Android Devices
+ executable: ffmpeg
+ extension: mp4
+-parameters: -i {input} -y -acodec aac -ab 160k -s {ssize} -vcodec libx264
-vpre slow -vpre ipod640 -f mp4 -threads 0 {output}
++parameters: -i {input} -y -strict experimental -acodec aac -b:a 160k -s
{ssize} -vcodec libx264 -pre:v slow -pre:v ipod640 -f mp4 -threads 0 {output}
+ mediatype: video
+
+ [G2]
+--- a/resources/conversions/apple.conv
++++ b/resources/conversions/apple.conv
+@@ -3,7 +3,7 @@
+ executable: ffmpeg
+ extension: mp4
+ ssize: 480x320
+-parameters: -i {input} -acodec aac -ab 160k -s {ssize} -vcodec libx264 -vpre
slow -vpre ipod640 -b 1200k -f mp4 -threads 0 {output}
++parameters: -i {input} -strict experimental -acodec aac -b:a 160k -s {ssize}
-vcodec libx264 -pre:v slow -pre:v ipod640 -b:v 1200k -f mp4 -threads 0 {output}
+ mediatype: video
+
+ [iPhone]
+--- a/resources/conversions/others.conv
++++ b/resources/conversions/others.conv
+@@ -4,7 +4,7 @@
+ [Playstation Portable (PSP)]
+ executable: ffmpeg
+ extension: mp4
+-parameters: -i {input} -s 320x240 -b 512000 -ar 24000 -ab 64000 -f psp -r
29.97 {output}
++parameters: -i {input} -s 320x240 -b:v 512000 -ar 24000 -b:a 64000 -f psp -r
29.97 {output}
+ mediatype: video
+
+ [Kindle Fire]
+@@ -12,7 +12,7 @@
+ executable: ffmpeg
+ extension: mp4
+ bitrate: 700000
+-parameters: -i {input} -acodec aac -ab 96k -vcodec libx264 -vpre slow -f mp4
-crf 22 {output}
++parameters: -i {input} -strict experimental -acodec aac -b:a 96k -vcodec
libx264 -pre:v slow -f mp4 -crf 22 {output}
+ mediatype: video
+ ssize: 1024x600
+
+@@ -20,14 +20,14 @@
+ only_on: osx
+ executable: ffmpeg
+ extension: webm
+-parameters: -i {input} -f webm -vcodec libvpx -acodec libvorbis -ab 160000
-sameq {output}
++parameters: -i {input} -f webm -vcodec libvpx -acodec libvorbis -b:a 160000
-sameq {output}
+ mediatype: video
+
+ [MP4]
+ extension: mp4
+ executable: ffmpeg
+ extension: mp4
+-parameters: -i {input} -acodec aac -ab 96k -vcodec libx264 -vpre slow -f mp4
-crf 22 {output}
++parameters: -i {input} -strict experimental -acodec aac -b:a 96k -vcodec
libx264 -pre:v slow -f mp4 -crf 22 {output}
+ mediatype: video
+
+ [MP3]
diff -Nru miro-4.0.4/debian/patches/series miro-4.0.4/debian/patches/series
--- miro-4.0.4/debian/patches/series 2012-01-02 23:09:25.000000000 +0100
+++ miro-4.0.4/debian/patches/series 2013-09-24 03:16:35.000000000 +0200
@@ -2,3 +2,5 @@
50_miro_debug_fix.patch
100_catch_keyerror_in_update_items.patch
120_miro.desktop.patch
+130_libav9.patch
+140_use_avconv.patch
signature.asc
Description: Digital signature
