Added a patch to fix segfault upon exit thanks to Thomas Cort <tcort@cs.ubishops.ca>. Fixes bug #74831.

(Portage version: 2.1_pre3-r1)

5 files changed, 128 insertions, 2 deletions

diff --git a/media-plugins/eq-xmms/ChangeLog b/media-plugins/eq-xmms/ChangeLog
index c8e79488c228..eaebe641bfe5 100644
--- a/media-plugins/eq-xmms/ChangeLog
+++ b/media-plugins/eq-xmms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/eq-xmms
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/ChangeLog,v 1.15 2006/01/16 17:42:39 voxus Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/ChangeLog,v 1.16 2006/01/16 18:55:16 metalgod Exp $
+
+*eq-xmms-0.6-r5 (16 Jan 2006)
+
+  16 Jan 2006; Luis Medinas <metalgod@gentoo.org>
+  +files/eq-xmms-0.6-exit_fix.patch, +eq-xmms-0.6-r5.ebuild:
+  Added a patch to fix segfault upon exit thanks to Thomas Cort
+  <tcort@cs.ubishops.ca>. Fixes bug #74831.
 
 *eq-xmms-0.7 (16 Jan 2006)
 
diff --git a/media-plugins/eq-xmms/Manifest b/media-plugins/eq-xmms/Manifest
index 6e7b4d7d117f..a6e624615db7 100644
--- a/media-plugins/eq-xmms/Manifest
+++ b/media-plugins/eq-xmms/Manifest
@@ -3,12 +3,15 @@ MD5 b690422be68807e2ef346762c1578aa7 eq-xmms-0.6-r1.ebuild 1054
 MD5 7d3e79e717f7ef2ae544e7c12713cb4f eq-xmms-0.6-r2.ebuild 1097
 MD5 69cf504d357ca0d7090d474f2947b1a6 eq-xmms-0.6-r3.ebuild 1348
 MD5 64a8fce7201e0629af99bf28ef1ea7f0 eq-xmms-0.6-r4.ebuild 1453
+MD5 b53f05aac16e934fded6be112fdb7e35 eq-xmms-0.6-r5.ebuild 1493
 MD5 db5859d8d2612551a48a6363903b97ec eq-xmms-0.7.ebuild 1164
 MD5 2cf1a0e042cf2afb1366cd05f91bedce files/digest-eq-xmms-0.6-r1 63
 MD5 2cf1a0e042cf2afb1366cd05f91bedce files/digest-eq-xmms-0.6-r2 63
 MD5 2cf1a0e042cf2afb1366cd05f91bedce files/digest-eq-xmms-0.6-r3 63
 MD5 473111a92d380f6be88fc3af3719d677 files/digest-eq-xmms-0.6-r4 141
+MD5 473111a92d380f6be88fc3af3719d677 files/digest-eq-xmms-0.6-r5 141
 MD5 c110ae19ac06195520c881daa09c6941 files/digest-eq-xmms-0.7 63
+MD5 dfe9301cb1a915654e54d2a6adb61f62 files/eq-xmms-0.6-exit_fix.patch 2051
 MD5 774f966c8056c9448a2cdd295cf76302 files/eq-xmms-0.6-mono_fix.patch 418
 MD5 e2cda8be9765888166aa11cb345e6a41 files/eq-xmms-0.6-nonx86.patch 410
 MD5 db956a0ebfff40720bb6487f96564a00 files/eq-xmms-0.6-shade_fix.patch 1116
diff --git a/media-plugins/eq-xmms/eq-xmms-0.6-r5.ebuild b/media-plugins/eq-xmms/eq-xmms-0.6-r5.ebuild
new file mode 100644
index 000000000000..dbe0353b1e27
--- /dev/null
+++ b/media-plugins/eq-xmms/eq-xmms-0.6-r5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/eq-xmms/eq-xmms-0.6-r5.ebuild,v 1.1 2006/01/16 18:55:16 metalgod Exp $
+
+IUSE="sse-filters"
+
+inherit eutils autotools
+
+DESCRIPTION="EQU is a realtime graphical equalizer effect plugin that will equalize almost everything that you play through XMMS, not just the MP3s"
+HOMEPAGE="http://equ.sourceforge.net/"
+SRC_URI="mirror://sourceforge/equ/${P}.tar.gz
+http://dev.gentoo.org/~voxus/equ/eq-xmms-0.6-cvs-20051113.patch.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+
+RDEPEND="media-sound/xmms"
+DEPEND="${RDEPEND}
+	!x86? ( >=sys-devel/automake-1.7 )"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-shade_fix.patch
+	epatch ${FILESDIR}/${P}-mono_fix.patch
+	epatch ${FILESDIR}/${P}-exit_fix.patch
+
+	if ! use x86 || use sse-filters; then
+		cd ${S}
+
+		if use sse-filters; then
+			epatch ${FILESDIR}/${P}-sse_filters.patch.bz2
+			epatch ${FILESDIR}/${P}-sse_round_trickfilters.patch
+			epatch ${DISTDIR}/${P}-cvs-20051113.patch.bz2
+		fi
+
+		use x86 || epatch ${FILESDIR}/${P}-nonx86.patch
+
+		export WANT_AUTOMAKE="1.7"
+		export WANT_AUTOCONF="2.5"
+		eautoreconf
+
+		use sse-filters && \
+			sed -e "s:@CFLAGS@:@CFLAGS@ -DSSE_FILTERS:" -i ${S}/src/Makefile.in
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" libdir=`xmms-config --effect-plugin-dir` install || die
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README README.BSD SKINS TODO
+}
diff --git a/media-plugins/eq-xmms/files/digest-eq-xmms-0.6-r5 b/media-plugins/eq-xmms/files/digest-eq-xmms-0.6-r5
new file mode 100644
index 000000000000..5a61149d9189
--- /dev/null
+++ b/media-plugins/eq-xmms/files/digest-eq-xmms-0.6-r5
@@ -0,0 +1,2 @@
+MD5 d8ec07230c2d9dfae63c8ad63295c29c eq-xmms-0.6-cvs-20051113.patch.bz2 10540
+MD5 911bcc81619d27dc466f20e17bb80d16 eq-xmms-0.6.tar.gz 529447
diff --git a/media-plugins/eq-xmms/files/eq-xmms-0.6-exit_fix.patch b/media-plugins/eq-xmms/files/eq-xmms-0.6-exit_fix.patch
new file mode 100644
index 000000000000..063d4393ea9e
--- /dev/null
+++ b/media-plugins/eq-xmms/files/eq-xmms-0.6-exit_fix.patch
@@ -0,0 +1,61 @@
+diff -urN eq-xmms-0.6.orig/src/configuration.c eq-xmms-0.6/src/configuration.c
+--- eq-xmms-0.6.orig/src/configuration.c	2004-05-16 00:11:31.000000000 +0000
++++ eq-xmms-0.6/src/configuration.c	2006-01-14 06:56:29.000000000 +0000
+@@ -640,6 +640,13 @@
+     gint i,chn;
+     cfgfile = xmms_cfg_open_default_file();
+ 
++    if (!eqcfg.skin)
++        eqcfg.skin = "default";
++    if (!eqcfg.eqpreset_default_file)
++        eqcfg.eqpreset_default_file = g_strdup("eq_dir_default.preset");
++    if (!eqcfg.eqpreset_extension)
++        eqcfg.eqpreset_extension = g_strdup("eq_preset");
++
+     xmms_cfg_write_int(cfgfile, "eq_plugin", "x", eqcfg.x);
+     xmms_cfg_write_int(cfgfile, "eq_plugin", "y", eqcfg.y);
+     xmms_cfg_write_int(cfgfile, "eq_plugin", "band_num", eqcfg.band_num);
+diff -urN eq-xmms-0.6.orig/src/eq.c eq-xmms-0.6/src/eq.c
+--- eq-xmms-0.6.orig/src/eq.c	2004-05-16 02:24:31.000000000 +0000
++++ eq-xmms-0.6/src/eq.c	2006-01-14 07:07:21.000000000 +0000
+@@ -31,7 +31,7 @@
+ static gint raisevol(gpointer data);
+ static gint monitor_song_change(gpointer data);
+ static int volume_diff;
+-static guint monitor_id;
++static guint monitor_id = 0;
+ static gint previous_pos;
+ static gchar *previous_filename;
+ 
+@@ -75,7 +75,8 @@
+ static void cleanup(void)
+ {
+     clean_gui();
+-    gtk_timeout_remove(monitor_id);
++    if (monitor_id)
++        gtk_timeout_remove(monitor_id);
+     g_free(previous_filename);
+ }
+ 
+diff -urN eq-xmms-0.6.orig/src/gui.c eq-xmms-0.6/src/gui.c
+--- eq-xmms-0.6.orig/src/gui.c	2004-04-03 11:55:58.000000000 +0000
++++ eq-xmms-0.6/src/gui.c	2006-01-14 06:56:29.000000000 +0000
+@@ -194,8 +194,16 @@
+ void clean_gui(void)
+ {
+     eq_write_config();
+-    gtk_widget_destroy(GTK_WIDGET(eqskinwin));
+-    gtk_widget_destroy(GTK_WIDGET(EQequalizerwin));
++
++    if (eqskinwin) {
++        gtk_widget_destroy(GTK_WIDGET(eqskinwin));
++        eqskinwin = NULL;
++    }
++
++    if (EQequalizerwin) {
++        gtk_widget_destroy(GTK_WIDGET(EQequalizerwin));
++        EQequalizerwin = NULL;
++    }
+     
+     eq_has_been_initialized = FALSE;
+ }