Add FreeBSD and DragonFly casts for scandir. Fix lvalue casts to

unbreak GCC 3.4+.

4 files changed, 153 insertions, 12 deletions

diff --git a/audio/muse/distinfo b/audio/muse/distinfo
index e545b932cb1..fadeb1bf4e7 100644
--- a/audio/muse/distinfo
+++ b/audio/muse/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 20:39:49 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/12/11 23:44:40 joerg Exp $
 
 SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118
 RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d
 Size (MuSE-0.9.tar.gz) = 1363091 bytes
 SHA1 (patch-aa) = a30a5f2a76081b188c2859d5b77185a26e95fc7e
-SHA1 (patch-ab) = fb6c26cd57534ebd82db21508a9cd9e98e0f6bc7
-SHA1 (patch-ac) = 8054b95194c39b58710f688dafbd7747a750ea27
+SHA1 (patch-ab) = 26d87f65078e45aec187ed4436b5ffce289247b3
+SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa
 SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd
 SHA1 (patch-ae) = 1097b09eb842fe1d90ec28913ad511e515f55a8a
+SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc
diff --git a/audio/muse/patches/patch-ab b/audio/muse/patches/patch-ab
index 724090d28f1..9e7e15df92f 100644
--- a/audio/muse/patches/patch-ab
+++ b/audio/muse/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/05/02 22:59:16 xtraeme Exp $
+$NetBSD: patch-ab,v 1.2 2005/12/11 23:44:40 joerg Exp $
 
---- src/jmixer.cpp.orig	2004-05-03 00:53:39.000000000 +0200
-+++ src/jmixer.cpp	2004-05-03 00:53:50.000000000 +0200
-@@ -98,7 +98,7 @@
+--- src/jmixer.cpp.orig	2004-04-09 17:50:43.000000000 +0000
++++ src/jmixer.cpp
+@@ -98,7 +98,7 @@ Stream_mixer::Stream_mixer() {
      error("error initializing POSIX thread mutex");
    if(pthread_cond_init (&_cond, NULL) == -1)
      error("error initializing POSIX thread condtition"); 
@@ -11,3 +11,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/05/02 22:59:16 xtraeme Exp $
  }
  
  Stream_mixer::~Stream_mixer() {
+@@ -627,7 +627,11 @@ bool Stream_mixer::set_playmode(int ch, 
+ /* this is the function selecting files for the scandir
+    on freebsd systems you should change the following line to:
+    int selector(struct dirent *dir) {    */
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++int selector(struct dirent *dir) {
++#else
+ int selector(const struct dirent *dir) {
++#endif
+   if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
+ #ifdef HAVE_VORBIS
+       || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0
diff --git a/audio/muse/patches/patch-ac b/audio/muse/patches/patch-ac
index 7dfc5d09c49..a46422ceb63 100644
--- a/audio/muse/patches/patch-ac
+++ b/audio/muse/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2004/05/10 02:19:33 kristerw Exp $
+$NetBSD: patch-ac,v 1.3 2005/12/11 23:44:40 joerg Exp $
 
---- src/pipe.cpp.orig	Mon Dec  8 13:20:33 2003
-+++ src/pipe.cpp	Mon May 10 04:10:31 2004
-@@ -26,6 +26,7 @@
+--- src/pipe.cpp.orig	2003-12-08 12:20:33.000000000 +0000
++++ src/pipe.cpp
+@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.
  
  #include <iostream>
  #include <stdlib.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.2 2004/05/10 02:19:33 kristerw Exp $
  #include <audioproc.h>
  #include <pipe.h>
  #include <jutils.h>
-@@ -61,7 +62,7 @@
+@@ -61,7 +62,7 @@ Pipe::Pipe(int size) {
    end=start=buffer;
    blocking = true;
    _thread_init();
@@ -19,3 +19,118 @@ $NetBSD: patch-ac,v 1.2 2004/05/10 02:19:33 kristerw Exp $
  }
  
  Pipe::~Pipe() {
+@@ -118,9 +119,9 @@ int Pipe::read_float_intl(int samples, f
+     }
+     /* --- */
+ 
+-    (char*)start += currentBlockSize;
++    start = (char*)start + currentBlockSize;
+     len -= currentBlockSize;
+-    (char*)pp += currentBlockSize;
++    pp = (float *)((char*)pp + currentBlockSize);
+     length -= currentBlockSize;
+     if ((end!=buffer) && (start==bufferEnd))
+       start = buffer;
+@@ -146,8 +147,8 @@ int Pipe::read_float_intl(int samples, f
+     }
+     /* --- */
+     
+-    (char*)pp += len;
+-    (char*)start += len;
++    pp = (float *)((char*)pp + len);
++    start = (char*)start + len;
+     length -= len;
+     if ((end!=buffer) && (start==bufferEnd))
+       start = buffer;
+@@ -224,9 +225,9 @@ int Pipe::read_float_bidi(int samples, f
+     }
+     /* --- */
+ 
+-    (char*)start += currentBlockSize;
++    start = (char*)start + currentBlockSize;
+     len -= currentBlockSize;
+-    (char*)pp += currentBlockSize;
++    pp = (float **)((char*)pp + currentBlockSize);
+     length -= currentBlockSize;
+     if ((end!=buffer) && (start==bufferEnd))
+       start = buffer;
+@@ -253,8 +254,8 @@ int Pipe::read_float_bidi(int samples, f
+       }
+       /* --- */
+       
+-      (char*)pp += len;
+-      (char*)start += len;
++      pp = (float **)((char*)pp + len);
++      start = (char*)start + len;
+       length -= len;
+       if ((end!=buffer) && (start==bufferEnd))
+ 	start = buffer;
+@@ -309,9 +310,9 @@ int Pipe::mix16stereo(int samples, int32
+       pp[c] += (int32_t) ((IN_DATATYPE*)start)[c];
+     /* --- */
+ 
+-    (char*)start += currentBlockSize;
++    start = (char*)start + currentBlockSize;
+     len -= currentBlockSize;
+-    (char*)pp += currentBlockSize;
++    pp = (int32_t *)((char*)pp + currentBlockSize);
+     length -= currentBlockSize;
+     if ((end!=buffer) && (start==bufferEnd))
+       start = buffer;
+@@ -324,8 +325,8 @@ int Pipe::mix16stereo(int samples, int32
+ 	pp[c] += (int) ((IN_DATATYPE*)start)[c];
+       /* --- */
+ 
+-      (char*)pp += len;
+-      (char*)start += len;
++      pp = (int32_t *)((char*)pp + len);
++      start = (char*)start + len;
+       length -= len;
+       if ((end!=buffer) && (start==bufferEnd))
+ 	start = buffer;
+@@ -372,17 +373,17 @@ int Pipe::read(int length, void *data) {
+     /* fill */
+     memcpy(data, start, currentBlockSize);
+     
+-    (char*)start += currentBlockSize;
++    start = (char*)start + currentBlockSize;
+     len -= currentBlockSize;
+-    (char*)data += currentBlockSize;
++    data = (char*)data + currentBlockSize;
+     length -= currentBlockSize;
+     if ((end!=buffer) && (start==bufferEnd))
+       start = buffer;
+     
+     if (len) { /* short circuit */
+       memcpy(data, start, len);
+-      (char*)data += len;
+-      (char*)start += len;
++      data = (char*)data + len;
++      start = (char*)start + len;
+       length -= len;
+       if ((end!=buffer) && (start==bufferEnd))
+ 	start = buffer;
+@@ -418,19 +419,19 @@ int Pipe::write(int length, void *data) 
+     currentBlockSize=MIN(currentBlockSize, len);
+     ::memcpy(end, data, currentBlockSize);
+     
+-    (char*)end += currentBlockSize;
++    end = (char*)end + currentBlockSize;
+     
+     len -= currentBlockSize;
+     
+-    (char*)data += currentBlockSize;
++    data = (char*)data + currentBlockSize;
+     length -= currentBlockSize;
+     if ((start!=buffer) && (end==bufferEnd))
+       end = buffer;
+ 		
+     if (len) { // short circuit		
+       ::memcpy(end, data, len);
+-      (char*)data += len;
+-      (char*)end += len;
++      data = (char*)data + len;
++      end = (char*)end + len;
+       length -= len;
+       
+       if ((start!=buffer) && (end==bufferEnd))
diff --git a/audio/muse/patches/patch-af b/audio/muse/patches/patch-af
new file mode 100644
index 00000000000..d6efad56c2a
--- /dev/null
+++ b/audio/muse/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2005/12/11 23:44:40 joerg Exp $
+
+--- src/Makefile.in.orig	2005-12-11 23:32:28.000000000 +0000
++++ src/Makefile.in
+@@ -207,7 +207,7 @@ muse_DEPENDENCIES = @GUI_DEPS@ resample/
+ muse_LDADD = \
+ 	$(top_srcdir)/src/resample/libresample.a \
+ 	$(top_srcdir)/src/libmpeg/libmpeg.a \
+-	-lpthread \
++	${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} \
+ 	@LIBSHOUT_LIB@ \
+ 	@M_LIBS@ \
+ 	@LAME_LIBS@ \