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

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 94 insertions, 14 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/Manifest b/media-video/miro/Manifest
index 2777370b9ae8..4aaadca35e80 100644
--- a/media-video/miro/Manifest
+++ b/media-video/miro/Manifest
@@ -1,22 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX miro-5.0.4-ffmpeg-1.patch 2444 SHA256 343e522a8cea12bf422c015e7e12929b0db8a20077b1a9a464a787471737c4e0 SHA512 99f0d081bfb6c8376e2508c21b078e542526f15530abe87a022a17490c092ed6f2ad29f1c905f392f8616d6574ae90d0eebacc7e7cd8b74517c1112a2f12c64f WHIRLPOOL a743a5fece9338bed369c8d43f9dea12491630cc6feb37829b1e1c6ee35bf187dcb564642ae453ed3a5dad8b685e21da396b15ac704af7cf6b1e7677aeacaab5
 DIST miro-4.0.6.tar.gz 13078726 SHA256 f51261d4505f0e9b2e429476ccfc8ce787ade6bfddb13a3eb05dee74a111d7da
 DIST miro-5.0.1.tar.gz 12944573 SHA256 769907c7baed0fad293b634e191856dd0e0cfc09903137ecd4fbc470ac492a07
 DIST miro-5.0.4.tar.gz 12990017 SHA256 4841c70c59a16647a77ea6c05a6d4d450bcc7973b9d33236d7cff2dbacf1c33a SHA512 fd4c9d95c921361209491f725bd979512c41b8dbffca5c310991fb3c112c8e1d401fccfa3f7de9baba7e169fbe7061501c876b848f765765e0d853b7fb240312 WHIRLPOOL 4aa2f75a2702dbf71523ab5d14db63cb819a85c849dbaa2deea9ed675ff95d88dc79d0e47db223939dedf72f2bd4085521ce501f26711c7be98ca49e0626a4bd
 EBUILD miro-4.0.6.ebuild 2187 SHA256 d2177d7baea7a0109feb2f4607fa9aa12b3de78e6507bf75671ee82e826f32e7 SHA512 29db94b07e1ea555456c9cec1402e36af40652d3fa6e8521f2004a6f6bc06ebc181a650e33f86841b1afdc95cbf19e97611d57bcd6b17b1e3af86f25484bf01c WHIRLPOOL 6f8014bf241c6f93d5f8dabdb6312dfc89667c81e43e27af0aa2d5fa16adcfd5dff4ecb25907a9558c561fc0f45784170ca8aa93f623bb07f7f73614c99d935b
 EBUILD miro-5.0.1.ebuild 2359 SHA256 b4472370228604d2615e897c94fea5c5cefda28ffdbe91bc9f2a35f591800a3e SHA512 744a4d716994b1eed9bfd357c2020a60e94dc8f6d2b9cb7c803b74297e4ff264f9da2ada4dc39e49522a1ecb414ca6d4e3bf1743fd4087b4593199a49647b7ea WHIRLPOOL c6cd104b3d5c2d921cf67d04e85a1e841d4215dc2ca8b40f50b89fcd2d215be69b6c871a8781309c14b99a2c07a121b953e4dae910064741e38f23764f5d9c55
-EBUILD miro-5.0.4.ebuild 2359 SHA256 c0c568d800c20d5dedcdf8ceccd7e951a0d9001da8e280248a2ce81e0bbdd99e SHA512 bfb82575b940ffe90ae76392bfce58589012a659021ecffb6c8d7e31845fafabc1b8096a1017e53f60ea1998e04814ecfc6f0717d94fe1ab9b73bd0afb9ecbe2 WHIRLPOOL 953e9fbbbb91e6fe2c6ac0126f19bb529524a5c8ed4290d7155d71518e6df13654abe041bd447fb09b8d6a927e4715e858c56d4ff04c926a5e6a8f0133b151d8
-MISC ChangeLog 3827 SHA256 3c509819008a93bf17ce208befee9a528f9c41b307db2bbac38dfdc8b3495b2d SHA512 602e065d82a99634744df518d59e7daa390a88e3e7fd7375e62f41459ac66ba5e00f8918d088ff14112f2241a1f9fc7ab15d70e3f8fde919ae36fa96d5907217 WHIRLPOOL 52dae47fd8234c2871a679ba12d4df125d6664acf1ff9b426a8432c112af9cb44010262607e3ddc5fe99329e0d6babeae91863c933a10bfe2753f18b2c5dbf19
+EBUILD miro-5.0.4.ebuild 2403 SHA256 07aa0cbcdd86dc0b1d0dbca548bbbdc5abbe3de7c5e4ea3a4e52f381f7769283 SHA512 6dccf53e1febd3c9db1b5e7b9b5d27ce6c3215f85515f2096890c5d47d0f162459ba9e42d27179a77af542df5e4290ab1ceaf64dbdcb9333a6290506348a48b2 WHIRLPOOL 7aee74bac289fd5332a8f84baa5c0aa909eec4270d4752fba38f80b4507718a3f49eab35f581a3939654d583cb3295b79392d648138cb0ffc8864d42ad3866d7
+MISC ChangeLog 4014 SHA256 0f258730dbc3e30102cc1afc58facf727be8fc1fb0dc29cb11386b9d1bce32c9 SHA512 0ee8935d9b334b9096605780820bc83b6730997b971078b4a5c793142d6bb77611f0d47941cfeff008c9136e045a6b0bcc905b70bfc1db26aeaa1bdee449fe3a WHIRLPOOL 6a2a3bdbd57e9cefdce205fee0996de9cb9c5a634a4fb5cfb6ec8583473ad5d023e40b596d444a940731213c996867f45690437e6fbc1471d270ad163bd3e0a9
 MISC metadata.xml 232 SHA256 1af06ecaa0be1bce0a6a9e9fa8c2ce9ca625666f19c5f41d2b4d32d2d98d76b0 SHA512 cd73eeac8b789452dc814a0192436eb21524cc6b5b1d22c3f4ba151139e857401ac730d9053acc7ddea40e12585b022abb3ab32e320e71f00ef9981e7e153505 WHIRLPOOL e1583383dd1f47ee743ee924930fd443575383b893cc20df1491cb24def179ae64aaf0a64ffb0d43a909b5142ee20c1b2550238601a463ea603b994ab08d08e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJQ2y7OAAoJEPUd7O0j6ekA+2cIAKHUlXQqYCix6g/JZSZWCq4e
-uDIW+eUMbmntepvAN27E1nFHAgwnXGgsoqKktriEAgL08hNlTz2O89wG8EprMmrz
-hvoj42vlNTX4QqerhIH+/V2PPqgkVHctvlll8nICyOGDAktZdLI7lEMZZk6/7yyL
-jT8kLBEek0HEHnLXt8dxFkPkn6QrY4lFdfuBr84gl8t670FpqY1ARHhnamKXJ8rk
-ihtxbr2ZZLa1RFOJSIjEfJTJx/COyaUYX3qt62uLxb3aMS13Qd2nHY8pmGn9H2MU
-32XdtGOi71EZx27LDQxGqJuPPLSVgFDQp+evOiTR+4NyN/qigUyMsEWjLAq9opI=
-=re2e
+iEYEAREIAAYFAlED6pgACgkQvFcC4BYPU0qafQCeIlpo4Ag6vhLKnA8AYFn4nQMI
+fWAAoKTjWB3fymKZSF2g7UZ+ydVpyzRZ
+=GZjJ
 -----END PGP SIGNATURE-----
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() {