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

(Portage version: 2.2.0_alpha35/cvs/Linux x86_64)

4 files changed, 190 insertions, 2 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/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
+}