Added a patch to fix sigsegv when running thanks to Jon Dowdall <jon.dowdall@bigpond.com> fixes bug #92104. ~amd64 keyword re-added.

(Portage version: 2.1_pre3-r1)

5 files changed, 80 insertions, 17 deletions

diff --git a/media-plugins/xmms-xmmsmplayer/ChangeLog b/media-plugins/xmms-xmmsmplayer/ChangeLog
index ae173631549b..44605076d4a6 100644
--- a/media-plugins/xmms-xmmsmplayer/ChangeLog
+++ b/media-plugins/xmms-xmmsmplayer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-plugins/xmms-xmmsmplayer
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xmmsmplayer/ChangeLog,v 1.10 2005/09/03 23:13:45 flameeyes Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xmmsmplayer/ChangeLog,v 1.11 2006/01/12 01:27:12 metalgod Exp $
+
+*xmms-xmmsmplayer-0.5-r2 (12 Jan 2006)
+
+  12 Jan 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/xmms-xmmsmplayer-0.5-sigsegvfix.patch,
+  +xmms-xmmsmplayer-0.5-r2.ebuild:
+  Added a patch to fix sigsegv when running thanks to Jon Dowdall
+  <jon.dowdall@bigpond.com> fixes bug #92104. ~amd64 keyword re-added.
 
   03 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
   xmms-xmmsmplayer-0.5.ebuild, xmms-xmmsmplayer-0.5-r1.ebuild:
diff --git a/media-plugins/xmms-xmmsmplayer/Manifest b/media-plugins/xmms-xmmsmplayer/Manifest
index e6e17d80a23b..802387b49cb1 100644
--- a/media-plugins/xmms-xmmsmplayer/Manifest
+++ b/media-plugins/xmms-xmmsmplayer/Manifest
@@ -1,17 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 48f8c4d88f611c81f8638fbee9f5b2dd ChangeLog 1690
-MD5 53d848d791bab4a28da28266cf8c189d xmms-xmmsmplayer-0.5.ebuild 910
-MD5 784a27d1e1a1c9d81b28c14e95ec8359 xmms-xmmsmplayer-0.5-r1.ebuild 931
-MD5 223dfdc3e10800dbb22bad28c928b52a metadata.xml 177
-MD5 4e43eabdfe813855a2c9b5d4e182c65b files/exts-filter.patch 7597
-MD5 1b7ac53d1d91e6e03452da584d63d8c3 files/digest-xmms-xmmsmplayer-0.5-r1 67
 MD5 1b7ac53d1d91e6e03452da584d63d8c3 files/digest-xmms-xmmsmplayer-0.5 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDGi45j5H05b2HAEkRAhsSAJ0aYl7mWeEL0+xjqG1KpTJPZ3+xgwCeNJRg
-9Z4uF74OxiixkpH085vbrzQ=
-=rRRx
------END PGP SIGNATURE-----
+MD5 1b7ac53d1d91e6e03452da584d63d8c3 files/digest-xmms-xmmsmplayer-0.5-r1 67
+MD5 1b7ac53d1d91e6e03452da584d63d8c3 files/digest-xmms-xmmsmplayer-0.5-r2 67
+MD5 4e43eabdfe813855a2c9b5d4e182c65b files/exts-filter.patch 7597
+MD5 45a9a154b726f1f74deb37c8c36fbe4f files/xmms-xmmsmplayer-0.5-sigsegvfix.patch 589
+MD5 223dfdc3e10800dbb22bad28c928b52a metadata.xml 177
+MD5 784a27d1e1a1c9d81b28c14e95ec8359 xmms-xmmsmplayer-0.5-r1.ebuild 931
+MD5 3773fd1cb393bef77cb67cb21178e348 xmms-xmmsmplayer-0.5-r2.ebuild 973
+MD5 53d848d791bab4a28da28266cf8c189d xmms-xmmsmplayer-0.5.ebuild 910
diff --git a/media-plugins/xmms-xmmsmplayer/files/digest-xmms-xmmsmplayer-0.5-r2 b/media-plugins/xmms-xmmsmplayer/files/digest-xmms-xmmsmplayer-0.5-r2
new file mode 100644
index 000000000000..b7c25c4c4ed9
--- /dev/null
+++ b/media-plugins/xmms-xmmsmplayer/files/digest-xmms-xmmsmplayer-0.5-r2
@@ -0,0 +1 @@
+MD5 10adb012bd741af84b891958504866db xmmsmplayer-0.5.tar.gz 230696
diff --git a/media-plugins/xmms-xmmsmplayer/files/xmms-xmmsmplayer-0.5-sigsegvfix.patch b/media-plugins/xmms-xmmsmplayer/files/xmms-xmmsmplayer-0.5-sigsegvfix.patch
new file mode 100644
index 000000000000..d61d0585ee19
--- /dev/null
+++ b/media-plugins/xmms-xmmsmplayer/files/xmms-xmmsmplayer-0.5-sigsegvfix.patch
@@ -0,0 +1,21 @@
+--- xmmsmplayer-0.5/xmmsmplayer/xmmsmplayer.c.orig	2005-11-12 22:26:22.000000000 +1030
++++ xmmsmplayer-0.5/xmmsmplayer/xmmsmplayer.c	2005-11-12 22:46:24.000000000 +1030
+@@ -95,9 +95,16 @@ int mplayer_is_our_file(char *filename){
+ 	ext++;
+ 	
+ 	char *tok;
+-	char *exts = strdup(mplayer_current_cfg->exts);
++    char *exts;
++	
++	if (!mplayer_current_cfg->exts)
++	{
++		fprintf(stderr, "mplayer_current_cfg->exts == NULL!\n");
++		return FALSE;
++	}
++	
++	exts = strdup(mplayer_current_cfg->exts);
+ 	
+-	strcpy(exts, mplayer_current_cfg->exts);
+ 	tok = strtok(exts, " ");
+ 	
+ 	while (tok != NULL){
diff --git a/media-plugins/xmms-xmmsmplayer/xmms-xmmsmplayer-0.5-r2.ebuild b/media-plugins/xmms-xmmsmplayer/xmms-xmmsmplayer-0.5-r2.ebuild
new file mode 100644
index 000000000000..f94ab0aacb65
--- /dev/null
+++ b/media-plugins/xmms-xmmsmplayer/xmms-xmmsmplayer-0.5-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-xmmsmplayer/xmms-xmmsmplayer-0.5-r2.ebuild,v 1.1 2006/01/12 01:27:12 metalgod Exp $
+
+inherit eutils
+
+IUSE=""
+
+MY_PN="xmmsmplayer"
+MY_P="${MY_PN}-${PV}"
+
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Xmms-Mplayer is a input plugin for xmms that allows you to play all video files in xmms."
+HOMEPAGE="http://xmmsmplayer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmmsmplayer/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-sound/xmms
+	media-video/mplayer"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/exts-filter.patch
+	epatch ${FILESDIR}/${P}-sigsegvfix.patch
+}
+
+src_compile() {
+	econf --libdir=`xmms-config --input-plugin-dir`
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed"
+	dodoc AUTHORS README
+}