From f2f8df34f23818ed811d3f038b2cf7e73a911b87 Mon Sep 17 00:00:00 2001
From: rh <rh>
Date: Sun, 27 Oct 2002 06:47:44 +0000
Subject: Test for pth, not __NetBSD__ to make this compile with native
 threads. Bump PKGREVISION.

---
 audio/xmms-crossfade/Makefile         |  4 ++--
 audio/xmms-crossfade/distinfo         |  6 +++---
 audio/xmms-crossfade/patches/patch-ac | 18 +++++++++---------
 audio/xmms-crossfade/patches/patch-ae |  8 ++++----
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 64892c991db..8c1257acf8a 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/10/17 00:02:00 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2002/10/27 06:47:44 rh Exp $
 #
 
 DISTNAME=		xmms-crossfade-0.2.9
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		audio
 MASTER_SITES=		http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/ \
 			ftp://ftp.falsehope.com/pub/xmms-crossfade/
diff --git a/audio/xmms-crossfade/distinfo b/audio/xmms-crossfade/distinfo
index f49945efd18..108264f5288 100644
--- a/audio/xmms-crossfade/distinfo
+++ b/audio/xmms-crossfade/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2002/10/17 00:02:00 jlam Exp $
+$NetBSD: distinfo,v 1.4 2002/10/27 06:47:44 rh Exp $
 
 SHA1 (xmms-crossfade-0.2.9.tar.gz) = afe3ec2a17d9dae54fffe318ef0a14470e045894
 Size (xmms-crossfade-0.2.9.tar.gz) = 200553 bytes
 SHA1 (patch-aa) = 1f710760444071888612a76d4ac698930b7ea999
 SHA1 (patch-ab) = ab26ceb14c568eb36728d0aa9498812a56b1e12b
-SHA1 (patch-ac) = 57e7452262c0522fd641ad27139398dfac3c046a
+SHA1 (patch-ac) = 94aa72566f6da4ff68e229b8e7e88627de709e4d
 SHA1 (patch-ad) = d2a1f96dc6544020d49b7e21b1860224a71fa1c6
-SHA1 (patch-ae) = fd3b3e9aae83884defbb449a2cae47a06aec4ee5
+SHA1 (patch-ae) = 885cc2fa18a9120a9af92f070aec6a76d3895014
 SHA1 (patch-af) = a79ca55bc695169f57c3b7bc569a1ca69e416895
diff --git a/audio/xmms-crossfade/patches/patch-ac b/audio/xmms-crossfade/patches/patch-ac
index 4e3523e2062..212646922a9 100644
--- a/audio/xmms-crossfade/patches/patch-ac
+++ b/audio/xmms-crossfade/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
+$NetBSD: patch-ac,v 1.2 2002/10/27 06:47:45 rh Exp $
 
---- oss.c.orig	Thu Apr 19 13:02:35 2001
+--- oss.c.orig	Tue May 15 07:35:52 2001
 +++ oss.c
-@@ -42,9 +43,10 @@
+@@ -42,9 +42,10 @@
  #  include <sys/soundcard.h>
  #elif defined(HAVE_MACHINE_SOUNDCARD_H)
  #  include <machine/soundcard.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
  /* output plugin callback prototypes */
  static void oss_get_volume      (int *l, int *r);
  static void oss_set_volume      (int l, int r);
-@@ -305,9 +307,9 @@
+@@ -305,9 +306,9 @@ oss_open_audio(AFormat fmt, int rate, in
    if(config->oss_use_alt_audio_device && (config->oss_alt_audio_device != NULL))
      device_name = g_strdup(config->oss_alt_audio_device);
    else if(config->oss_audio_device > 0)
@@ -26,13 +26,13 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
  
    /* HACK: Test if the device is not locked by another process. This is
     *       just a crude workaround to avoid complete lockup of XMMS. It is
-@@ -499,13 +507,26 @@
+@@ -499,13 +500,26 @@ buffer_thread_f(void *arg)
    while(dsp_fd != -1) {
      /* wait for device */
      if(dsp_select_works) {
 -      tv.tv_sec  = 0;
 +      pthread_mutex_unlock(&buffer_mutex);
-+#ifdef __NetBSD__
++#ifdef _PTH_PTHREAD_H_
 +     { int i;
 +
 +     for (i=0; i<16; i++) { 
@@ -46,10 +46,10 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
  
 -      pthread_mutex_unlock(&buffer_mutex);
        sel = select(dsp_fd+1, NULL, &set, NULL, &tv);
-+#ifdef __NetBSD__
-+      pthread_yield_np();
-+
++#ifdef _PTH_PTHREAD_H_
 +      if (sel) break;
++
++      sched_yield();
 +     }}
 +#endif
        pthread_mutex_lock(&buffer_mutex);
diff --git a/audio/xmms-crossfade/patches/patch-ae b/audio/xmms-crossfade/patches/patch-ae
index 1c5846eb97f..503c6435c0a 100644
--- a/audio/xmms-crossfade/patches/patch-ae
+++ b/audio/xmms-crossfade/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/05/23 20:17:22 rh Exp $
+$NetBSD: patch-ae,v 1.2 2002/10/27 06:47:45 rh Exp $
 
---- crossfade.c.orig	Fri Apr 20 01:29:25 2001
+--- crossfade.c.orig	Fri Jun  8 04:09:28 2001
 +++ crossfade.c
-@@ -1655,6 +1655,10 @@
+@@ -1671,6 +1671,10 @@ xfade_output_time()
  {
    gint time;
  
-+#ifdef __NetBSD__
++#ifdef _PTH_PTHREAD_H_
 +  pthread_yield_np();
 +#endif
 +
-- 
cgit v1.2.3