Attachment #69091 for bug #101351

View | Details | Raw Unified | Return to bug 101351
Collapse All | Expand All




#

PORTNAME=	MuSE
PORTVERSION=	0.9.2
PORTREVISION=	0
CATEGORIES=	audio
MASTER_SITES=	ftp://ftp.dyne.org/muse/releases/ \
		http://www.ljudmila.org/~jaromil/muse/releases/

MAINTAINER=	ssedov@mbsd.msk.ru
COMMENT=	Multiple Streaming Engine

LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
		ogg.5:${PORTSDIR}/audio/libogg
		vorbis.3:${PORTSDIR}/audio/libvorbis

USE_GETOPT_LONG=yes
USE_GETTEXT=	yes
USE_GNOME=	gnometarget
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--disable-debug --disable-lubrify --disable-rpath

MAN1=		muse.1
PORTDOCS=	${DOCSFILES:S,doc/,,g}
PLIST_FILES=	bin/muse

CPPFLAGS=	-I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
		${PTHREAD_CFLAGS}
LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl

OPTIONS=	X11	"Build with X11 support" on \
		MP3	"Build with MP3 support" on \
		SNDFILE	"Build with sndfile support" on

.include <bsd.port.pre.mk>

.if defined(WITHOUT_X11)
PKGNAMESUFFIX=	-nox11
CONFIGURE_ARGS+=--without-x --with-rubik
.else
USE_GNOME+=	gtk20
.endif

.if !defined(WITHOUT_MP3) || exists(${LOCALBASE}/lib/libmp3lame.so.0)
LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
.endif

.if !defined(WITHOUT_SNDFILE) || exists(${LOCALBASE}/lib/libsndfile.so.1)
LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
.endif

.if !defined(NOPORTDOCS)
PORTDOCS=	*
.endif
PLIST_FILES=	bin/muse \
		share/locale/es/LC_MESSAGES/muse.mo \
		share/locale/it/LC_MESSAGES/muse.mo
MAN1=		muse.1

post-patch:
.if exists(/usr/include/sys/soundcard.h)
	${REINPLACE_CMD} -e "s,machine/soundcard.h,sys/soundcard.h,g" \
		${WRKSRC}/src/portaudio/pa_unix_oss.c
.endif

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)/var/tmp/muse/distinfo (-3 / +3 lines)
1	MD5 (MuSE-0.9.tar.gz) = 0c2075c9f62ba1d08459f669498b6bcf	1	MD5 (MuSE-0.9.2.tar.gz) = 7b3b01a35af79b8852ee6b0f033ff46c
2	SHA256 (MuSE-0.9.tar.gz) = 5bb1b12f9bc9d5b6b1671aab2fa00ff0eae06305f5014771b9c1caed9abcca85	2	SHA256 (MuSE-0.9.2.tar.gz) = 270f95b3a4f9d11bea04d5db4b3868aee1fa78177da0b5d9a74f26c4cfa5e197
3	SIZE (MuSE-0.9.tar.gz) = 1363091	3	SIZE (MuSE-0.9.2.tar.gz) = 1420411

Line 0 Link Here

(-)/var/tmp/muse/files/patch-Makefile.in (+11 lines)
	1	--- Makefile.in.orig Fri Aug 4 12:11:20 2006
	2	+++ Makefile.in Fri Aug 4 12:11:27 2006
	3	@@ -240,7 +240,7 @@
	4	target_vendor = @target_vendor@
	5	SUBDIRS = po intl src
	6	docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
	7	-docsdir = ${prefix}/doc/MuSE
	8	+docsdir = ${prefix}/share/doc/MuSE
	9	man_MANS = muse.1
	10	ACLOCAL_AMFLAGS = -I . -I m4
	11	EXTRA_DIST = autogen.sh config.rpath




--- configure.orig	Tue Dec 27 16:03:15 2005
+++ configure	Fri Aug  4 11:51:41 2006
@@ -1894,7 +1894,7 @@
 echo "$as_me:$LINENO: checking for which platform we are compiling" >&5
 echo $ECHO_N "checking for which platform we are compiling... $ECHO_C" >&6
 case $uname in
-     Linux)
+     Linux|FreeBSD)
      echo "$as_me:$LINENO: result: Linux" >&5
 echo "${ECHO_T}Linux" >&6
 
@@ -2613,16 +2613,12 @@
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g ${CFLAGS}"
   else
-    CFLAGS="-g"
+    CFLAGS="-g ${CFLAGS}"
   fi
 else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
+    CFLAGS="${CFLAGS}"
 fi
 echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
@@ -3738,7 +3734,7 @@
 #AM_DEFINE_UNQUOTED(HOST_CPU, "${host_cpu}")
 
 #CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe"
-CFLAGS="-pipe -D_REENTRANT"
+#CFLAGS="-pipe -D_REENTRANT"
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -14588,7 +14584,7 @@
 else
 
 lrint_save_CFLAGS=$CFLAGS
-CFLAGS="-O2 -lm"
+CFLAGS="${CFLAGS} -lm"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
@@ -14665,7 +14661,7 @@
 else
 
 lrintf_save_CFLAGS=$CFLAGS
-CFLAGS="-O2 -lm"
+CFLAGS="${CFLAGS} -lm"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
    else
      CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -march=${host_cpu} -ffast-math"
    fi
-else
-   CFLAGS="$CFLAGS -O2 -ffast-math"
 fi
 
 




--- src/Makefile.in.orig	Fri Aug  4 11:43:41 2006
+++ src/Makefile.in	Fri Aug  4 11:43:46 2006
@@ -268,7 +268,6 @@
 muse_LDADD = \
 	$(top_srcdir)/src/resample/libresample.a \
 	$(top_srcdir)/src/libmpeg/libmpeg.a \
 	$(top_srcdir)/src/shout/libshout.a \
 	$(top_srcdir)/src/portaudio/libportaudio.a \
-	-lpthread \
 	@LIBSHOUT_LIB@ \
 	@M_LIBS@ \
 	@LAME_LIBS@ \
 	@OGG_LIBS@ \




--- src/jmixer.cpp.orig	Fri Aug  4 11:44:33 2006
+++ src/jmixer.cpp	Fri Aug  4 11:46:02 2006
@@ -20,18 +20,18 @@
  */
 

-#include <errno.h>
+#include <cerrno>
 #include <fcntl.h>
 
-#include <string.h>
-#include <signal.h>
+#include <cstring>

 #include <sys/types.h>
 #include <sys/wait.h>
 #include <termios.h>
@@ -640,7 +640,7 @@
 /* this is the function selecting files for the scandir
    on freebsd systems you should change the following line to:
    int selector(struct dirent *dir) {    */
-int selector(const struct dirent *dir) {
-   on freebsd systems you should change the following line to:
-   int selector(struct dirent *dir) {    */
+#if defined(__FreeBSD__)
+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




--- src/pipe.cpp.orig	Sat Dec 24 18:19:31 2005
+++ src/pipe.cpp	Fri Aug  4 11:48:06 2006
@@ -25,9 +25,9 @@
 */
 
 #include <iostream>
-#include <stdlib.h>
+#include <cstdlib>
 #include <math.h>
-#include <errno.h>
+#include <cerrno>
 
 #include <audioproc.h>
 #include <pipe.h>
 #include <jutils.h>
@@ -118,9 +119,9 @@
     }
     /* --- */
 
-    (char*)start += currentBlockSize;
+    start = (char*)start + currentBlockSize;
     len -= currentBlockSize;
-    (char*)pp += currentBlockSize;
+    pp = (float*)pp + currentBlockSize;
     length -= currentBlockSize;
     if ((end!=buffer) && (start==bufferEnd))
       start = buffer;
@@ -146,8 +147,8 @@
     }
     /* --- */
     
-    (char*)pp += len;
-    (char*)start += len;
+    pp = (float*)pp + len;
+    start = (char*)start + len;
     length -= len;
     if ((end!=buffer) && (start==bufferEnd))
       start = buffer;
@@ -224,9 +225,9 @@
     }
     /* --- */
 
-    (char*)start += currentBlockSize;
+    start = (char*)start + currentBlockSize;
     len -= currentBlockSize;
-    (char*)pp += currentBlockSize;
+    pp = (float**)pp + currentBlockSize;
     length -= currentBlockSize;
     if ((end!=buffer) && (start==bufferEnd))
       start = buffer;
@@ -253,8 +254,8 @@
       }
       /* --- */
       
-      (char*)pp += len;
-      (char*)start += len;
+      pp = (float**)pp + len;
+      start = (char*)start + len;
       length -= len;
       if ((end!=buffer) && (start==bufferEnd))
 	start = buffer;
@@ -309,9 +310,9 @@
       pp[c] += (int32_t) ((IN_DATATYPE*)start)[c];
     /* --- */
 
-    (char*)start += currentBlockSize;
+    start = (char*)start + currentBlockSize;
     len -= currentBlockSize;
-    (char*)pp += currentBlockSize;
+    pp = (int32_t*)pp + currentBlockSize;
     length -= currentBlockSize;
     if ((end!=buffer) && (start==bufferEnd))
       start = buffer;
@@ -324,8 +325,8 @@
 	pp[c] += (int) ((IN_DATATYPE*)start)[c];
       /* --- */
 
-      (char*)pp += len;
-      (char*)start += len;
+      pp = (int32_t*)pp + len;
+      start = (char*)start + len;
       length -= len;
       if ((end!=buffer) && (start==bufferEnd))
 	start = buffer;
@@ -372,17 +373,17 @@
     /* 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 @@
     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))

Return to bug 101351

Lines 7-57 Link Here

(-)/var/tmp/muse/Makefile (-24 / +35 lines)
7	#	7	#
8		8
9	PORTNAME= MuSE	9	PORTNAME= MuSE
10	PORTVERSION= 0.9	10	PORTVERSION= 0.9.2
11	PORTREVISION= 3	11	PORTREVISION= 0
12	CATEGORIES= audio	12	CATEGORIES= audio
13	MASTER_SITES= ftp://ftp.dyne.org/muse/releases/ \	13	MASTER_SITES= ftp://ftp.dyne.org/muse/releases/ \
14	http://www.ljudmila.org/~jaromil/muse/releases/	14	http://www.ljudmila.org/~jaromil/muse/releases/
15		15
16	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ssedov@mbsd.msk.ru
17	COMMENT= Multiple Streaming Engine	17	COMMENT= Multiple Streaming Engine
18		18
19	LIB_DEPENDS= mp3lame.0:${PORTSDIR}/audio/lame \	19	LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis \
20	sndfile.1:${PORTSDIR}/audio/libsndfile \	20	ogg.5:${PORTSDIR}/audio/libogg
21	vorbis.3:${PORTSDIR}/audio/libvorbis
22		21
23	USE_GETOPT_LONG= yes	22	USE_GETOPT_LONG=yes
		23	USE_GETTEXT= yes
24	USE_GNOME= gnometarget	24	USE_GNOME= gnometarget
25	USE_GMAKE= yes	25	USE_GMAKE= yes
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"	27	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
28	CONFIGURE_ARGS= --disable-debug --disable-lubrify	28	CONFIGURE_ARGS= --disable-debug --disable-lubrify --disable-rpath
29
30	MAN1= muse.1
31	PORTDOCS= ${DOCSFILES:S,doc/,,g}
32	PLIST_FILES= bin/muse
33
34	CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \	29	CPPFLAGS= -I${LOCALBASE}/include -DHAVE_DECL_GETOPT -DHAVE_SYS_UIO_H \
35	${PTHREAD_CFLAGS}	30	${PTHREAD_CFLAGS}
36	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	31	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lintl
37		32
38	DOCFILES= AUTHORS ChangeLog KNOWN-BUGS NEWS README TODO doc/USAGE	33	OPTIONS= X11 "Build with X11 support" on \
		34	MP3 "Build with MP3 support" on \
		35	SNDFILE "Build with sndfile support" on
		36
		37	.include <bsd.port.pre.mk>
39		38
40	.if defined(WITHOUT_X11)	39	.if defined(WITHOUT_X11)
41	PKGNAMESUFFIX= -nox11	40	PKGNAMESUFFIX= -nox11
42	CONFIGURE_ARGS+= --without-x --with-rubik	41	CONFIGURE_ARGS+=--without-x --with-rubik
43	.else	42	.else
44	USE_GNOME+= gtk20	43	USE_GNOME+= gtk20
45	.endif	44	.endif
46		45
47	do-install:	46	.if !defined(WITHOUT_MP3) \|\| exists(${LOCALBASE}/lib/libmp3lame.so.0)
48	${INSTALL_PROGRAM} ${WRKSRC}/src/muse ${PREFIX}/bin	47	LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
49	${INSTALL_MAN} ${WRKSRC}/doc/muse.1 ${MANPREFIX}/man/man1	48	.endif
		49
		50	.if !defined(WITHOUT_SNDFILE) \|\| exists(${LOCALBASE}/lib/libsndfile.so.1)
		51	LIB_DEPENDS+= sndfile.1:${PORTSDIR}/audio/libsndfile
		52	.endif
		53
50	.if !defined(NOPORTDOCS)	54	.if !defined(NOPORTDOCS)
51	@${MKDIR} ${DOCSDIR}	55	PORTDOCS= *
52	.for file in ${DOCFILES}	56	.endif
53	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}	57	PLIST_FILES= bin/muse \
54	.endfor	58	share/locale/es/LC_MESSAGES/muse.mo \
		59	share/locale/it/LC_MESSAGES/muse.mo
		60	MAN1= muse.1
		61
		62	post-patch:
		63	.if exists(/usr/include/sys/soundcard.h)
		64	${REINPLACE_CMD} -e "s,machine/soundcard.h,sys/soundcard.h,g" \
		65	${WRKSRC}/src/portaudio/pa_unix_oss.c
55	.endif	66	.endif
56		67
57	.include <bsd.port.mk>	68	.include <bsd.port.post.mk>

Lines 1-38 Link Here

(-)/var/tmp/muse/files/patch-configure (-19 / +39 lines)
1	--- configure.orig Sun Apr 18 00:33:26 2004	1	--- configure.orig Tue Dec 27 16:03:15 2005
2	+++ configure Mon Apr 19 22:34:18 2004	2	+++ configure Fri Aug 4 11:51:41 2006
3	@@ -3427,7 +3427,7 @@	3	@@ -1894,7 +1894,7 @@
		4	echo "$as_me:$LINENO: checking for which platform we are compiling" >&5
		5	echo $ECHO_N "checking for which platform we are compiling... $ECHO_C" >&6
		6	case $uname in
		7	- Linux)
		8	+ Linux\|FreeBSD)
		9	echo "$as_me:$LINENO: result: Linux" >&5
		10	echo "${ECHO_T}Linux" >&6
		11
		12	@@ -2613,16 +2613,12 @@
		13	CFLAGS=$ac_save_CFLAGS
		14	elif test $ac_cv_prog_cc_g = yes; then
		15	if test "$GCC" = yes; then
		16	- CFLAGS="-g -O2"
		17	+ CFLAGS="-g ${CFLAGS}"
		18	else
		19	- CFLAGS="-g"
		20	+ CFLAGS="-g ${CFLAGS}"
		21	fi
		22	else
		23	- if test "$GCC" = yes; then
		24	- CFLAGS="-O2"
		25	- else
		26	- CFLAGS=
		27	- fi
		28	+ CFLAGS="${CFLAGS}"
		29	fi
		30	echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
		31	echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
		32	@@ -3738,7 +3734,7 @@
4	#AM_DEFINE_UNQUOTED(HOST_CPU, "${host_cpu}")	33	#AM_DEFINE_UNQUOTED(HOST_CPU, "${host_cpu}")
5		34
6	#CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe"	35	#CFLAGS="-O4 -D_REENTRANT -fomit-frame-pointer -march=${host_cpu} -ffast-math -malign-double -funroll-loops -pipe"
7	-CFLAGS="-pipe -D_REENTRANT"	36	-CFLAGS="-pipe -D_REENTRANT"
8	+CFLAGS="$CFLAGS -D_REENTRANT"	37	+#CFLAGS="-pipe -D_REENTRANT"
9		38
10	ac_ext=c	39	ac_ext=c
11	ac_cpp='$CPP $CPPFLAGS'	40	ac_cpp='$CPP $CPPFLAGS'
12	@@ -11182,7 +11182,7 @@	41	@@ -14588,7 +14584,7 @@
13	else	42	else
14		43
15	lrint_save_CFLAGS=$CFLAGS	44	lrint_save_CFLAGS=$CFLAGS
16	-CFLAGS="-O2 -lm"	45	-CFLAGS="-O2 -lm"
17	+CFLAGS="$CFLAGS -lm"	46	+CFLAGS="${CFLAGS} -lm"
18	cat >conftest.$ac_ext <<_ACEOF	47	cat >conftest.$ac_ext <<_ACEOF
19	#line $LINENO "configure"
20	/* confdefs.h. */	48	/* confdefs.h. */
21	@@ -11249,7 +11249,7 @@	49	_ACEOF
		50	@@ -14665,7 +14661,7 @@
22	else	51	else
23		52
24	lrintf_save_CFLAGS=$CFLAGS	53	lrintf_save_CFLAGS=$CFLAGS
25	-CFLAGS="-O2 -lm"	54	-CFLAGS="-O2 -lm"
26	+CFLAGS="$CFLAGS -lm"	55	+CFLAGS="${CFLAGS} -lm"
27	cat >conftest.$ac_ext <<_ACEOF	56	cat >conftest.$ac_ext <<_ACEOF
28	#line $LINENO "configure"
29	/* confdefs.h. */	57	/* confdefs.h. */
30	@@ -11836,8 +11836,6 @@	58	_ACEOF
31	else
32	CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -march=${host_cpu} -ffast-math"
33	fi
34	-else
35	- CFLAGS="$CFLAGS -O2 -ffast-math"
36	fi
37
38

Lines 1-10 Link Here

(-)/var/tmp/muse/files/patch-src::Makefile.in (-6 / +6 lines)
1	--- src/Makefile.in.orig Sun Apr 18 00:33:24 2004	1	--- src/Makefile.in.orig Fri Aug 4 11:43:41 2006
2	+++ src/Makefile.in Mon Apr 19 22:28:56 2004	2	+++ src/Makefile.in Fri Aug 4 11:43:46 2006
3	@@ -207,7 +207,6 @@	3	@@ -268,7 +268,6 @@
4	muse_LDADD = \
5	$(top_srcdir)/src/resample/libresample.a \
6	$(top_srcdir)/src/libmpeg/libmpeg.a \	4	$(top_srcdir)/src/libmpeg/libmpeg.a \
		5	$(top_srcdir)/src/shout/libshout.a \
		6	$(top_srcdir)/src/portaudio/libportaudio.a \
7	- -lpthread \	7	- -lpthread \
8	@LIBSHOUT_LIB@ \
9	@M_LIBS@ \	8	@M_LIBS@ \
10	@LAME_LIBS@ \	9	@LAME_LIBS@ \
		10	@OGG_LIBS@ \

Lines 1-5 Link Here

(-)/var/tmp/muse/files/patch-src::jmixer.cpp (-14 / +8 lines)
1	--- src/jmixer.cpp.orig Sat Apr 10 02:50:43 2004	1	--- src/jmixer.cpp.orig Fri Aug 4 11:44:33 2006
2	+++ src/jmixer.cpp Mon Apr 19 22:49:59 2004	2	+++ src/jmixer.cpp Fri Aug 4 11:46:02 2006
3	@@ -20,18 +20,18 @@	3	@@ -20,18 +20,18 @@
4	*/	4	*/
5		5
Lines 17-23 Link Here
17	-#include <errno.h>	17	-#include <errno.h>
18	+#include <cerrno>	18	+#include <cerrno>
19	#include <fcntl.h>	19	#include <fcntl.h>
20	#include <sys/soundcard.h>	20
21	-#include <string.h>	21	-#include <string.h>
22	-#include <signal.h>	22	-#include <signal.h>
23	+#include <cstring>	23	+#include <cstring>
Lines 25-42 Link Here
25	#include <sys/types.h>	25	#include <sys/types.h>
26	#include <sys/wait.h>	26	#include <sys/wait.h>
27	#include <termios.h>	27	#include <termios.h>
28	@@ -624,10 +624,11 @@	28	@@ -640,7 +640,7 @@
29	return true;	29	/* this is the function selecting files for the scandir
30	}	30	on freebsd systems you should change the following line to:
31		31	int selector(struct dirent dir) { /
32	-/* this is the function selecting files for the scandir	32	-int selector(const struct dirent *dir) {
33	- on freebsd systems you should change the following line to:
34	- int selector(struct dirent dir) { /
35	+#if defined(__FreeBSD__)
36	+int selector(struct dirent *dir) {	33	+int selector(struct dirent *dir) {
37	+#else
38	int selector(const struct dirent *dir) {
39	+#endif
40	if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0	34	if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
41	#ifdef HAVE_VORBIS	35	#ifdef HAVE_VORBIS
42	\|\| strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0	36	\|\| strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0

Lines 1-127 Link Here

(-)/var/tmp/muse/files/patch-src::pipe.cpp (-119 / +6 lines)
1	--- src/pipe.cpp.orig Mon Dec 8 17:20:33 2003	1	--- src/pipe.cpp.orig Sat Dec 24 18:19:31 2005
2	+++ src/pipe.cpp Fri Jun 3 16:58:02 2005	2	+++ src/pipe.cpp Fri Aug 4 11:48:06 2006
3	@@ -25,7 +25,8 @@	3	@@ -25,9 +25,9 @@
4	*/	4	*/
5		5
6	#include <iostream>	6	#include <iostream>
7	-#include <stdlib.h>	7	-#include <stdlib.h>
8	+#include <cstdlib>	8	+#include <cstdlib>
		9	#include <math.h>
		10	-#include <errno.h>
9	+#include <cerrno>	11	+#include <cerrno>
		12
10	#include <audioproc.h>	13	#include <audioproc.h>
11	#include <pipe.h>	14	#include <pipe.h>
12	#include <jutils.h>
13	@@ -118,9 +119,9 @@
14	}
15	/* --- */
16
17	- (char*)start += currentBlockSize;
18	+ start = (char*)start + currentBlockSize;
19	len -= currentBlockSize;
20	- (char*)pp += currentBlockSize;
21	+ pp = (float*)pp + currentBlockSize;
22	length -= currentBlockSize;
23	if ((end!=buffer) && (start==bufferEnd))
24	start = buffer;
25	@@ -146,8 +147,8 @@
26	}
27	/* --- */
28
29	- (char*)pp += len;
30	- (char*)start += len;
31	+ pp = (float*)pp + len;
32	+ start = (char*)start + len;
33	length -= len;
34	if ((end!=buffer) && (start==bufferEnd))
35	start = buffer;
36	@@ -224,9 +225,9 @@
37	}
38	/* --- */
39
40	- (char*)start += currentBlockSize;
41	+ start = (char*)start + currentBlockSize;
42	len -= currentBlockSize;
43	- (char*)pp += currentBlockSize;
44	+ pp = (float**)pp + currentBlockSize;
45	length -= currentBlockSize;
46	if ((end!=buffer) && (start==bufferEnd))
47	start = buffer;
48	@@ -253,8 +254,8 @@
49	}
50	/* --- */
51
52	- (char*)pp += len;
53	- (char*)start += len;
54	+ pp = (float**)pp + len;
55	+ start = (char*)start + len;
56	length -= len;
57	if ((end!=buffer) && (start==bufferEnd))
58	start = buffer;
59	@@ -309,9 +310,9 @@
60	pp[c] += (int32_t) ((IN_DATATYPE*)start)[c];
61	/* --- */
62
63	- (char*)start += currentBlockSize;
64	+ start = (char*)start + currentBlockSize;
65	len -= currentBlockSize;
66	- (char*)pp += currentBlockSize;
67	+ pp = (int32_t*)pp + currentBlockSize;
68	length -= currentBlockSize;
69	if ((end!=buffer) && (start==bufferEnd))
70	start = buffer;
71	@@ -324,8 +325,8 @@
72	pp[c] += (int) ((IN_DATATYPE*)start)[c];
73	/* --- */
74
75	- (char*)pp += len;
76	- (char*)start += len;
77	+ pp = (int32_t*)pp + len;
78	+ start = (char*)start + len;
79	length -= len;
80	if ((end!=buffer) && (start==bufferEnd))
81	start = buffer;
82	@@ -372,17 +373,17 @@
83	/* fill */
84	memcpy(data, start, currentBlockSize);
85
86	- (char*)start += currentBlockSize;
87	+ start = (char*)start + currentBlockSize;
88	len -= currentBlockSize;
89	- (char*)data += currentBlockSize;
90	+ data = (char*)data + currentBlockSize;
91	length -= currentBlockSize;
92	if ((end!=buffer) && (start==bufferEnd))
93	start = buffer;
94
95	if (len) { /* short circuit */
96	memcpy(data, start, len);
97	- (char*)data += len;
98	- (char*)start += len;
99	+ data = (char*)data + len;
100	+ start = (char*)start + len;
101	length -= len;
102	if ((end!=buffer) && (start==bufferEnd))
103	start = buffer;
104	@@ -418,19 +419,19 @@
105	currentBlockSize=MIN(currentBlockSize, len);
106	::memcpy(end, data, currentBlockSize);
107
108	- (char*)end += currentBlockSize;
109	+ end = (char*)end + currentBlockSize;
110
111	len -= currentBlockSize;
112
113	- (char*)data += currentBlockSize;
114	+ data = (char*)data + currentBlockSize;
115	length -= currentBlockSize;
116	if ((start!=buffer) && (end==bufferEnd))
117	end = buffer;
118
119	if (len) { // short circuit
120	::memcpy(end, data, len);
121	- (char*)data += len;
122	- (char*)end += len;
123	+ data = (char*)data + len;
124	+ end = (char*)end + len;
125	length -= len;
126
127	if ((start!=buffer) && (end==bufferEnd))