Fix segfault on amd64 by adding a patch from AJ Frantz <ajfrantz@umich.edu>. ~amd64...

Package-Manager: portage-2.0.53_rc7

diff --git a/media-plugins/xmms-blursk/ChangeLog b/media-plugins/xmms-blursk/ChangeLog
index c3ff0a2d24bdd742ecf7c58ec6c7a16a3a6fc08f..7bdf1a165d337d4c4fc61320109186dc7aee6238 100644 (file)
--- a/media-plugins/xmms-blursk/ChangeLog
+++ b/media-plugins/xmms-blursk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/xmms-blursk
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-blursk/ChangeLog,v 1.13 2005/09/04 10:02:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-blursk/ChangeLog,v 1.14 2005/11/12 17:45:58 metalgod Exp $
+
+*xmms-blursk-1.3-r1 (12 Nov 2005)
+
+  12 Nov 2005; Luis Medinas <metalgod@gentoo.org>
+  +files/xmms-blursk-1.3-segfault.patch, +xmms-blursk-1.3-r1.ebuild:
+  Fix segfault on amd64 by adding a patch from AJ Frantz <ajfrantz@umich.edu>.
+  ~amd64 keyword added. Closes bug #55397.
 
   04 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> xmms-blursk-1.2.ebuild,
   xmms-blursk-1.3.ebuild:

diff --git a/media-plugins/xmms-blursk/Manifest b/media-plugins/xmms-blursk/Manifest
index ee807e19a8d7e5b86dab20584fcb4182aa84ec1e..92aaeb4a1c3fda41effe3bb1e1d8c3aa30f5568f 100644 (file)
--- a/media-plugins/xmms-blursk/Manifest
+++ b/media-plugins/xmms-blursk/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1a58942be83306c6fa0aab6cfd50db93 xmms-blursk-1.2.ebuild 683
-MD5 7257aa457f406bce8a210fb47bebafec ChangeLog 1635
-MD5 24dbba75a03ce90f450864d9ed916d20 xmms-blursk-1.3.ebuild 730
-MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 a836984d7f63b1a63cc38190f9b5f671 ChangeLog 1911
 MD5 faeb365039a4aa0bec6eff790a151ef0 files/digest-xmms-blursk-1.2 62
 MD5 f3980d654014eb4bde2b8a5a79c25871 files/digest-xmms-blursk-1.3 62
+MD5 f3980d654014eb4bde2b8a5a79c25871 files/digest-xmms-blursk-1.3-r1 62
+MD5 144eb518c5db40dff6a702fd978c4465 files/xmms-blursk-1.3-segfault.patch 1134
+MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
+MD5 1a58942be83306c6fa0aab6cfd50db93 xmms-blursk-1.2.ebuild 683
+MD5 b2269f55799236ddcca959987cdb95ba xmms-blursk-1.3-r1.ebuild 781
+MD5 24dbba75a03ce90f450864d9ed916d20 xmms-blursk-1.3.ebuild 730
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDGsZZj5H05b2HAEkRAlO1AJ4u4+CBg2/ZqkAAEcU5wwi7D50SZQCgkPAv
-Gc05JbOhyNv7cnKe/DtLfT4=
-=VKuS
+iD8DBQFDdipkwUpWvClEHQoRAkDoAJ4nYDp1UpOszIg9SrLS9MYa9dTxgACbB7KS
+IfB7Akj4U7AbFpf89hpaMQo=
+=/Q2E
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/xmms-blursk/files/digest-xmms-blursk-1.3-r1 b/media-plugins/xmms-blursk/files/digest-xmms-blursk-1.3-r1
new file mode 100644 (file)
index 0000000..f179726
--- /dev/null
+++ b/media-plugins/xmms-blursk/files/digest-xmms-blursk-1.3-r1
@@ -0,0 +1 @@
+MD5 d5f3b2785ba5148b23ffe335f4560b7e Blursk-1.3.tar.gz 345631

diff --git a/media-plugins/xmms-blursk/files/xmms-blursk-1.3-segfault.patch b/media-plugins/xmms-blursk/files/xmms-blursk-1.3-segfault.patch
new file mode 100644 (file)
index 0000000..393f7e6
--- /dev/null
+++ b/media-plugins/xmms-blursk/files/xmms-blursk-1.3-segfault.patch
@@ -0,0 +1,26 @@
+diff -urN Blursk-1.3.orig/blursk.h Blursk-1.3/blursk.h
+--- Blursk-1.3.orig/blursk.h   2005-11-09 16:33:15.000000000 -0500
++++ Blursk-1.3/blursk.h        2005-11-09 16:33:42.000000000 -0500
+@@ -132,8 +132,8 @@
+ extern guchar **img_source;
+ extern guint img_height, img_physheight;
+ extern guint img_width, img_physwidth;
+-extern guint img_bpl, img_physbpl;
+-extern guint img_chunks;
++extern gint img_bpl;
++extern guint img_chunks, img_physbpl;
+ extern guchar img_rippleshift;
+ extern void img_resize(int, int);
+ extern void img_copyback(void);
+diff -urN Blursk-1.3.orig/img.c Blursk-1.3/img.c
+--- Blursk-1.3.orig/img.c      2005-11-09 16:33:15.000000000 -0500
++++ Blursk-1.3/img.c   2005-11-09 16:33:49.000000000 -0500
+@@ -30,7 +30,7 @@
+ guchar        **img_source;   /* an array of pixel pointers, for blur motion */
+ guint img_height;     /* height of the current image */
+ guint img_width;      /* width of the current image */
+-guint img_bpl;        /* bytes per line of the current image */
++gint  img_bpl;        /* bytes per line of the current image */
+ guint img_chunks;     /* number of 8-pixel chunks in the image */
+ 
+ guint img_physheight; /* height of the current window */

diff --git a/media-plugins/xmms-blursk/xmms-blursk-1.3-r1.ebuild b/media-plugins/xmms-blursk/xmms-blursk-1.3-r1.ebuild
new file mode 100644 (file)
index 0000000..76ae65a
--- /dev/null
+++ b/media-plugins/xmms-blursk/xmms-blursk-1.3-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/xmms-blursk/xmms-blursk-1.3-r1.ebuild,v 1.1 2005/11/12 17:45:58 metalgod Exp $
+
+IUSE=""
+
+inherit eutils gnuconfig
+
+MY_P=Blursk-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Yet another psychedelic visualization plug-in for XMMS"
+HOMEPAGE="http://www.cs.pdx.edu/~kirkenda/blursk/"
+SRC_URI="http://www.cs.pdx.edu/~kirkenda/blursk/${MY_P}.tar.gz"
+
+DEPEND="media-sound/xmms"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+src_unpack() {
+       unpack ${A}
+       epatch ${FILESDIR}/${P}-segfault.patch
+       gnuconfig_update
+}
+
+src_install () {
+       make DESTDIR=${D} install || die "install failed"
+
+       dodoc AUTHORS ChangeLog README NEWS
+}