Add patch from upstream to fix build with ffmpeg-0.11, part of bug #443212

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 87 insertions, 4 deletions

diff --git a/media-video/miro/ChangeLog b/media-video/miro/ChangeLog
index ae97429132b2..c8e99cb013e9 100644
--- a/media-video/miro/ChangeLog
+++ b/media-video/miro/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/miro
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.20 2012/12/26 17:07:25 jdhore Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.21 2013/01/26 14:39:18 aballier Exp $
+
+  26 Jan 2013; Alexis Ballier <aballier@gentoo.org> miro-5.0.4.ebuild,
+  +files/miro-5.0.4-ffmpeg-1.patch:
+  Add patch from upstream to fix build with ffmpeg-0.11, part of bug #443212
 
 *miro-5.0.4 (26 Dec 2012)
 
diff --git a/media-video/miro/files/miro-5.0.4-ffmpeg-1.patch b/media-video/miro/files/miro-5.0.4-ffmpeg-1.patch
new file mode 100644
index 000000000000..93e92ed583ae
--- /dev/null
+++ b/media-video/miro/files/miro-5.0.4-ffmpeg-1.patch
@@ -0,0 +1,78 @@
+commit efe8bec33931522f60719102f53099f1796c7b75
+Author: Ben Dean-Kawamura <ben@pculture.org>
+Date:   Fri Aug 31 16:30:59 2012 -0400
+
+    Update segmenter code to not use deprecated functions
+
+diff --git a/tv/linux/miro-segmenter.c b/tv/linux/miro-segmenter.c
+index 1bfdda3..fd2a726 100644
+--- a/tv/linux/miro-segmenter.c
++++ b/tv/linux/miro-segmenter.c
+@@ -156,7 +156,7 @@ int main(int argc, char **argv)
+         exit(1);
+     }
+ 
+-    ret = av_open_input_file(&ic, input, ifmt, 0, NULL);
++    ret = avformat_open_input(&ic, input, ifmt, 0);
+     if (ret != 0) {
+         fprintf(stderr, "Could not open input file, make sure it is an mpegts file: %d\n", ret);
+         exit(1);
+@@ -215,12 +215,7 @@ int main(int argc, char **argv)
+         }
+     }
+ 
+-    if (av_set_parameters(oc, NULL) < 0) {
+-        fprintf(stderr, "Invalid output format parameters\n");
+-        exit(1);
+-    }
+-
+-    dump_format(oc, 0, input, 1);
++    av_dump_format(oc, 0, input, 1);
+ 
+     if (video_st) {
+         codec = avcodec_find_decoder(video_st->codec->codec_id);
+@@ -233,12 +228,12 @@ int main(int argc, char **argv)
+         }
+     }
+ 
+-    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++    if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
+         fprintf(stderr, "Could not open '%s'\n", output_filename);
+         exit(1);
+     }
+ 
+-    if (av_write_header(oc)) {
++    if (avformat_write_header(oc, NULL)) {
+         fprintf(stderr, "Could not write mpegts header to first output file\n");
+ 
+         exit(1);
+@@ -274,10 +269,10 @@ int main(int argc, char **argv)
+         }
+ 
+         if (segment_time - prev_segment_time >= segment_duration) {
+-            put_flush_packet(oc->pb);
+-            url_fclose(oc->pb);
++            avio_flush(oc->pb);
++            avio_close(oc->pb);
+ 
+-            if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++            if (avio_open(&oc->pb, output_filename, AVIO_FLAG_WRITE) < 0) {
+                 fprintf(stderr, "Could not open '%s'\n", output_filename);
+                 break;
+             }
+@@ -307,13 +302,13 @@ int main(int argc, char **argv)
+         av_freep(&oc->streams[i]);
+     }
+ 
+-    url_fclose(oc->pb);
++    avio_close(oc->pb);
+     av_free(oc);
+ 
+     /* End-of-transcode marker. */
+     {
+         struct sockaddr_in sockaddr;
+-	int rc, s;
++        int rc, s;
+ 
+         memset(&sockaddr, 0, sizeof(sockaddr));
+         sockaddr.sin_family = AF_INET;
diff --git a/media-video/miro/miro-5.0.4.ebuild b/media-video/miro/miro-5.0.4.ebuild
index 72e2c8ede934..acf3ee42f345 100644
--- a/media-video/miro/miro-5.0.4.ebuild
+++ b/media-video/miro/miro-5.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-5.0.4.ebuild,v 1.1 2012/12/26 17:07:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-5.0.4.ebuild,v 1.2 2013/01/26 14:39:18 aballier Exp $
 
 EAPI=3
 
@@ -57,6 +57,7 @@ pkg_setup() {
 
 src_prepare() {
 	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-ffmpeg-1.patch"
 }
 
 src_install() {