summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authornathanw <nathanw@pkgsrc.org>2003-04-17 23:14:12 +0000
committernathanw <nathanw@pkgsrc.org>2003-04-17 23:14:12 +0000
commitc421a8a356b5132fb763e78cc0b1c019e3a27d62 (patch)
tree2307cef9f3231e6fe3d7ae4f563f4e94afdec78b /audio
parent15ef0e67c076aadc387cda927618b5c60bbf1eea (diff)
downloadpkgsrc-c421a8a356b5132fb763e78cc0b1c019e3a27d62.tar.gz
Pull in a couple of lock fixes from xmms CVS to avoid mutex
locking botches. Also, disable the SEGV handler, as it makes bug-hunting of people's random crashes much harder.
Diffstat (limited to 'audio')
-rw-r--r--audio/xmms/distinfo5
-rw-r--r--audio/xmms/patches/patch-ai30
-rw-r--r--audio/xmms/patches/patch-av12
3 files changed, 40 insertions, 7 deletions
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index 85501b78713..b08548ada61 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2003/04/15 05:48:19 grant Exp $
+$NetBSD: distinfo,v 1.13 2003/04/17 23:14:12 nathanw Exp $
SHA1 (xmms-1.2.7.tar.gz) = 2f910d88af9bb5e8d54e796653beef969b555c68
Size (xmms-1.2.7.tar.gz) = 2860908 bytes
@@ -9,7 +9,7 @@ SHA1 (patch-ad) = 7645b1a2bbb338c9bea8b2015d5763486f77d16a
SHA1 (patch-af) = 472e2504fae530b34785e18d38d6f45891494a6d
SHA1 (patch-ag) = 24a56ba54752994806518872d03709559f5ac620
SHA1 (patch-ah) = 3d03813b29a1d0fe734c209e707264551ecd7138
-SHA1 (patch-ai) = 26f4c8b4addbd58b585ba3f1c9885228805bdfe3
+SHA1 (patch-ai) = 534fe71062cb38d35089b94af7a186255864e82f
SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031
SHA1 (patch-ak) = 83f26d8d0a80def2ee28aa09f3261ff97d019dbf
SHA1 (patch-al) = 9e7cbc0543ea8157a1b4402a372ce3e4d05c00dc
@@ -22,3 +22,4 @@ SHA1 (patch-ar) = ef35ce733dceac323119b5bbb3065164fac87c74
SHA1 (patch-as) = 1f62167c7901e8d2211f39a25e6f902935a413b1
SHA1 (patch-at) = e95b1cc83944a388d74d6968852fa6e3e6f9d5a4
SHA1 (patch-au) = 7e68b5de230003d40399c7a2aa2b2264e033803f
+SHA1 (patch-av) = 773baf830f687510854190b901b9752fb927f1b5
diff --git a/audio/xmms/patches/patch-ai b/audio/xmms/patches/patch-ai
index 80c904eb001..1061e9c7e0d 100644
--- a/audio/xmms/patches/patch-ai
+++ b/audio/xmms/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.6 2002/10/25 08:59:05 skrll Exp $
+$NetBSD: patch-ai,v 1.7 2003/04/17 23:14:13 nathanw Exp $
---- xmms/main.c.orig Wed Feb 27 15:30:28 2002
-+++ xmms/main.c Thu Mar 21 12:58:10 2002
-@@ -3377,7 +3394,7 @@
+--- xmms/main.c.orig 2002-02-27 09:30:28.000000000 -0500
++++ xmms/main.c 2003-04-16 15:41:12.000000000 -0400
+@@ -3377,7 +3377,7 @@
{
gchar *filename;
struct cmdlineopt options;
@@ -11,7 +11,17 @@ $NetBSD: patch-ai,v 1.6 2002/10/25 08:59:05 skrll Exp $
struct sched_param sparam;
#endif
-@@ -3408,7 +3425,7 @@
+@@ -3387,7 +3387,9 @@
+ #endif
+
+ signal(SIGPIPE, SIG_IGN); /* for controlsocket.c */
++#if 0 /* XXXNJW This makes debugging nearly impossible. */
+ signal(SIGSEGV, segfault_handler);
++#endif
+ g_thread_init(NULL);
+ if (!g_thread_supported())
+ {
+@@ -3408,7 +3410,7 @@
if (geteuid() == 0)
{
@@ -20,3 +30,13 @@ $NetBSD: patch-ai,v 1.6 2002/10/25 08:59:05 skrll Exp $
if (cfg.use_realtime)
{
sparam.sched_priority = sched_get_priority_max(SCHED_RR);
+@@ -3500,8 +3502,8 @@
+
+ /* enable_x11r5_session_management(argc, argv); */
+ sm_init(argc, argv);
+- GDK_THREADS_LEAVE();
+ gtk_main();
++ GDK_THREADS_LEAVE();
+
+ return 0;
+ }
diff --git a/audio/xmms/patches/patch-av b/audio/xmms/patches/patch-av
new file mode 100644
index 00000000000..477da3d5ce2
--- /dev/null
+++ b/audio/xmms/patches/patch-av
@@ -0,0 +1,12 @@
+$NetBSD: patch-av,v 1.1 2003/04/17 23:14:13 nathanw Exp $
+
+--- xmms/playlistwin.c.orig 2003-04-16 16:30:29.000000000 -0400
++++ xmms/playlistwin.c 2003-04-16 16:32:20.000000000 -0400
+@@ -188,7 +188,6 @@
+
+ if (!title)
+ {
+- PL_UNLOCK();
+ textbox_set_text(playlistwin_sinfo, "");
+ return;
+ }