Add new version. Fixes bug #342093. Also add patch to build with latest ffmpeg (patch not submitted upstream).

Package-Manager: portage-2.2.0_alpha35/cvs/Linux x86_64

5 files changed, 205 insertions, 4 deletions

diff --git a/media-video/miro/ChangeLog b/media-video/miro/ChangeLog
index 2f375bab723e..a4dfb7c876db 100644
--- a/media-video/miro/ChangeLog
+++ b/media-video/miro/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/miro
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.9 2011/03/11 20:47:12 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/ChangeLog,v 1.10 2011/05/25 14:23:34 scarabeus Exp $
+
+*miro-4.0.1 (25 May 2011)
+
+  25 May 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/4.0.1-ffmpeg.patch, +miro-4.0.1.ebuild, metadata.xml:
+  Add new version. Fixes bug #342093. Also add patch to build with latest
+  ffmpeg (patch not submitted upstream).
 
   11 Mar 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   miro-2.5.4.ebuild:
diff --git a/media-video/miro/Manifest b/media-video/miro/Manifest
index ba6c4c82ed3a..6eb0bf32480b 100644
--- a/media-video/miro/Manifest
+++ b/media-video/miro/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 4.0.1-ffmpeg.patch 3439 RMD160 17f980d6905ccd44fbf7edb188721b5c162fc14f SHA1 f0c851d51318c0e0be8b91463ef901625d2587a9 SHA256 5f7a3ff21aae7684cad9a3d2aa5e40205fe0a8496cf7e9ca1e40f1f7861f5b75
 AUX miro-2.5.3-disable-xine-hack.patch 746 RMD160 cfb7f550eb9b8b1c18f3ed412737d441bbc7714c SHA1 b9ae72c6bf8bce862c23f00049b33fbf9d29f06c SHA256 2910e23cdf024d4d3dd20b0e93300162d468f6a36062c8e1412ede14d0520c7f
 AUX miro-2.5.3-dont-install-test-files.patch 1422 RMD160 6686dae4476951fa3b48a7891577298a629e86a1 SHA1 f1b816ac394542671f782fa4e6caaa2588151e86 SHA256 ad42ba3024da26c0e16ee8e8747b0eb0fbda604e6eeb3be7274c2ac7ac9aee3b
 AUX miro-2.5.3-fix-debug.patch 472 RMD160 0cee057c074004a4c8662f19fba0d49247a5ba3c SHA1 f0587a930705a2edce7142d2c681c5beaaa5deec SHA256 27bafa26876df1aaef10688757c2eb4a2a3c8fff06665d376c026a316c68c103
 AUX miro-2.5.3-remove-pkg-config-list-all.patch 2880 RMD160 7aa0300eda840a9662df172c53397c19aab9967a SHA1 1298447816b3e06a4d5c309f66c2916eec1ae2c4 SHA256 ac28c97c1ca3051c3d0c2f7b17eca78a3e45e02c589cda813e98c166a3a21f55
 AUX miro-2.5.3-remove-unittest-option.patch 538 RMD160 f29c534b28ac453cb72d18cb3e0810f6744c38b6 SHA1 4f86a65c368ced0b7a37d091a3705cd2f80d2628 SHA256 889e8480faee3af86d9c2dbfa9375eeb102ca01df6c71b07fcb4b62b326cbe6a
 DIST miro-2.5.4.tar.gz 10032329 RMD160 38e5bf42db323b54803ce12ab1e8dec8192aac51 SHA1 4fd6cb48ed1fb3a9588c4af9f2da55f88654f194 SHA256 43f18abfc8cc7cdbb84fb5de2136397080e4c153881498b18970c81a671b0f67
+DIST miro-4.0.1.tar.gz 12806477 RMD160 ec96cd33472668dd21f326404ecd07a6126de34b SHA1 c79577a68ac1dac55ccd80138a8040dc4df00c72 SHA256 bac2d579350517590a2f38d3be40da25bca3b331969b03046c1ba545984a6881
 EBUILD miro-2.5.4.ebuild 3526 RMD160 2abb4a0d381f3dd88a71485beec9c8e32abf562b SHA1 46b7bb0ea1f8ddda64515daed388827a15598eb3 SHA256 3d32842e342a3d8735f203cd62076757b8cfbbf147d929c4f7832b2411a06b5a
-MISC ChangeLog 1810 RMD160 a3f626a56c9b55312d0b555c54c302076b9792ba SHA1 d431722c74755e16c0e94a77c23bf46cfbcc72ba SHA256 0dac83e270a0602b3a29ae1c6660308e7fc797e385e0c1a238968bf000f5441e
-MISC metadata.xml 257 RMD160 224ee82bfe66c5da4a2dc1dd697b1782e7f03cb9 SHA1 6b583c76750b206bd133403d1a4685a14f8e6b95 SHA256 45f231de4d8bc5ed6309ba83d2eb9a06b8e13f828d7b74e909a144439356cd62
+EBUILD miro-4.0.1.ebuild 2168 RMD160 81ae2cf6a1ef0f4a2640bdd3a4cfc98ec2753959 SHA1 2be9da5a34804e4055540e1555e7b4bd7bba87a6 SHA256 309db7a6c4caeb2e453affa080c528046af7ed1b17737c98e9eaae243c691460
+MISC ChangeLog 2073 RMD160 49a1949199527864cb7025b653a56be032d38369 SHA1 3eced1ed0e8655662b007bd40996e01519e89572 SHA256 aeda3e3912dff0f33e7772c4bf9cbe28b0b82599974dd22beda4ec4198837b0d
+MISC metadata.xml 256 RMD160 71e04b2482b39edb0905f8cefd1f52cf0cf2e3bc SHA1 25368a4e88d36d69c9807e6654cfb52b9cbc73d8 SHA256 cdd04d57ccb5de7e93e8d717774d4ef9e2402ed86520f257523a948ca9cfb5ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk3dEM0ACgkQHB6c3gNBRYfSUACfS71Nfa2+KN9L6k/SOR/cMbc2
+r3UAnRQ4eRyUEOS87IDoJ+Amy+XufyMz
+=QYwo
+-----END PGP SIGNATURE-----
diff --git a/media-video/miro/files/4.0.1-ffmpeg.patch b/media-video/miro/files/4.0.1-ffmpeg.patch
new file mode 100644
index 000000000000..edf3784591ec
--- /dev/null
+++ b/media-video/miro/files/4.0.1-ffmpeg.patch
@@ -0,0 +1,95 @@
+diff -urN miro-4.0.old/linux/miro-segmenter.c miro-4.0/linux/miro-segmenter.c
+--- miro-4.0.old/linux/miro-segmenter.c	2011-05-25 15:58:21.000000000 +0200
++++ miro-4.0/linux/miro-segmenter.c	2011-05-25 16:09:41.000000000 +0200
+@@ -60,7 +60,7 @@
+     }
+ 
+     switch (input_codec_context->codec_type) {
+-        case CODEC_TYPE_AUDIO:
++        case AVMEDIA_TYPE_AUDIO:
+             output_codec_context->channel_layout = input_codec_context->channel_layout;
+             output_codec_context->sample_rate = input_codec_context->sample_rate;
+             output_codec_context->channels = input_codec_context->channels;
+@@ -72,7 +72,7 @@
+                 output_codec_context->block_align = input_codec_context->block_align;
+             }
+             break;
+-        case CODEC_TYPE_VIDEO:
++        case AVMEDIA_TYPE_VIDEO:
+             output_codec_context->pix_fmt = input_codec_context->pix_fmt;
+             output_codec_context->width = input_codec_context->width;
+             output_codec_context->height = input_codec_context->height;
+@@ -154,7 +154,7 @@
+         exit(1);
+     }
+ 
+-    ofmt = guess_format("mpegts", NULL, NULL);
++    ofmt = av_guess_format("mpegts", NULL, NULL);
+     if (!ofmt) {
+         fprintf(stderr, "Could not find MPEG-TS muxer\n");
+         exit(1);
+@@ -174,12 +174,12 @@
+ 
+     for (i = 0; i < ic->nb_streams && (video_index < 0 || audio_index < 0); i++) {
+         switch (ic->streams[i]->codec->codec_type) {
+-            case CODEC_TYPE_VIDEO:
++            case AVMEDIA_TYPE_VIDEO:
+                 video_index = i;
+                 ic->streams[i]->discard = AVDISCARD_NONE;
+                 video_st = add_output_stream(oc, ic->streams[i]);
+                 break;
+-            case CODEC_TYPE_AUDIO:
++            case AVMEDIA_TYPE_AUDIO:
+                 audio_index = i;
+                 ic->streams[i]->discard = AVDISCARD_NONE;
+                 audio_st = add_output_stream(oc, ic->streams[i]);
+@@ -195,7 +195,7 @@
+         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);
+@@ -208,7 +208,7 @@
+         }
+     }
+ 
+-    if (url_fopen(&oc->pb, output_filename, URL_WRONLY) < 0) {
++    if (avio_open(&oc->pb, output_filename, URL_WRONLY) < 0) {
+         fprintf(stderr, "Could not open '%s'\n", output_filename);
+         exit(1);
+     }
+@@ -234,7 +234,7 @@
+             break;
+         }
+ 
+-        if (packet.stream_index == video_index && (packet.flags & PKT_FLAG_KEY)) {
++        if (packet.stream_index == video_index && (packet.flags & AV_PKT_FLAG_KEY)) {
+             segment_time = (double)video_st->pts.val * video_st->time_base.num / video_st->time_base.den;
+         }
+         else if (video_index < 0) {
+@@ -245,10 +245,10 @@
+         }
+ 
+         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, URL_WRONLY) < 0) {
+                 fprintf(stderr, "Could not open '%s'\n", output_filename);
+                 break;
+             }
+@@ -278,7 +278,7 @@
+         av_freep(&oc->streams[i]);
+     }
+ 
+-    url_fclose(oc->pb);
++    avio_close(oc->pb);
+     av_free(oc);
+ 
+     return 0;
diff --git a/media-video/miro/metadata.xml b/media-video/miro/metadata.xml
index d44dc8ef07cc..3832d59c73f2 100644
--- a/media-video/miro/metadata.xml
+++ b/media-video/miro/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Mounir Lamouri</name>
 	</maintainer>
 </pkgmetadata>
-
diff --git a/media-video/miro/miro-4.0.1.ebuild b/media-video/miro/miro-4.0.1.ebuild
new file mode 100644
index 000000000000..e4c2e5ce46bb
--- /dev/null
+++ b/media-video/miro/miro-4.0.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/miro/miro-4.0.1.ebuild,v 1.1 2011/05/25 14:23:34 scarabeus Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2:2.7"
+PYTHON_USE_WITH="sqlite"
+inherit eutils fdo-mime gnome2-utils distutils
+
+DESCRIPTION="Open source video player and podcast client"
+HOMEPAGE="http://www.getmiro.com/"
+SRC_URI="http://ftp.osuosl.org/pub/pculture.org/${PN}/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify aac musepack xvid"
+
+CDEPEND="
+	dev-libs/glib:2
+	dev-libs/boost[python]
+	>=dev-python/pyrex-0.9.6.4
+	dev-python/pygtk:2
+	dev-python/pygobject:2
+	>=virtual/ffmpeg-0.6.90"
+
+RDEPEND="${CDEPEND}
+	dev-python/dbus-python
+	dev-python/pycairo
+	dev-python/gconf-python
+	dev-python/gst-python:0.10
+	>=dev-python/pywebkitgtk-1.1.5
+	dev-python/pycurl
+	>=net-libs/rb_libtorrent-0.14.1[python]
+	media-libs/mutagen
+	media-plugins/gst-plugins-meta:0.10
+	media-plugins/gst-plugins-pango:0.10
+	aac? ( media-plugins/gst-plugins-faad:0.10 )
+	libnotify? ( dev-python/notify-python )
+	musepack? ( media-plugins/gst-plugins-musepack:0.10 )
+	xvid? ( media-plugins/gst-plugins-xvid:0.10 )"
+
+DEPEND="${CDEPEND}"
+
+S="${WORKDIR}/${P}/linux"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-ffmpeg.patch"
+	distutils_src_prepare
+}
+
+src_install() {
+	# doing the mv now otherwise, distutils_src_install will install it
+	mv README README.gtk || die "mv failed"
+
+	distutils_src_install
+
+	# installing docs
+	dodoc README.gtk ../{CREDITS,README} || die "dodoc failed"
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+
+	ewarn
+	ewarn "If miro doesn't play some video or audio format, please"
+	ewarn "check your USE flags on media-plugins/gst-plugins-meta"
+	ewarn
+	elog "Miro for Linux doesn't support Adobe Flash, therefore you"
+	elog "you will not see any embedded video player on MiroGuide."
+	elog
+}
+
+pkg_postrm() {
+	distutils_pkg_postrm
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}