Tue Nov 22 16:38:28 2011 UTC ()
audio/muse: Fix DragonFly breakage

DragonFly's GCC44 won't handle iostream.h headers anymore, so these were
converted to the c++ version.  The scandir arguments for DragonFly were
wrong.  Either GCC44 is less tolerant than GCC41, or the prototype
changed since the last time this package built on DragonFly.

No PKGREVISION bump is required; this only affects DragonFly.


(marino)
diff -r1.33 -r1.34 pkgsrc/audio/muse/Makefile
diff -r1.9 -r1.10 pkgsrc/audio/muse/distinfo
diff -r1.2 -r1.3 pkgsrc/audio/muse/patches/patch-ab
cvs diff -r1.33 -r1.34 pkgsrc/audio/muse/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/muse/Makefile 2011/11/01 06:00:39 1.33
+++ pkgsrc/audio/muse/Makefile 2011/11/22 16:38:28 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2011/11/01 06:00:39 sbd Exp $ 1# $NetBSD: Makefile,v 1.34 2011/11/22 16:38:28 marino Exp $
2# 2#
3 3
4DISTNAME= MuSE-0.9 4DISTNAME= MuSE-0.9
5PKGNAME= ${DISTNAME:S/MuSE/muse/} 5PKGNAME= ${DISTNAME:S/MuSE/muse/}
6PKGREVISION= 15 6PKGREVISION= 15
7CATEGORIES= audio 7CATEGORIES= audio
8MASTER_SITES= ftp://ftp.dyne.org/muse/releases/ \ 8MASTER_SITES= ftp://ftp.dyne.org/muse/releases/ \
9 http://www.ljudmila.org/~jaromil/mirror/muse/releases/ 9 http://www.ljudmila.org/~jaromil/mirror/muse/releases/
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://muse.dyne.org/ 12HOMEPAGE= http://muse.dyne.org/
13COMMENT= Multiple Streaming Engine 13COMMENT= Multiple Streaming Engine
14 14
@@ -22,20 +22,29 @@ USE_PKGLOCALEDIR= yes @@ -22,20 +22,29 @@ USE_PKGLOCALEDIR= yes
22CONFIGURE_ARGS+= --disable-ncurses 22CONFIGURE_ARGS+= --disable-ncurses
23CONFIGURE_ARGS+= --disable-lubrify 23CONFIGURE_ARGS+= --disable-lubrify
24CONFIGURE_ARGS+= --enable-gtk2 24CONFIGURE_ARGS+= --enable-gtk2
25LIBS+= ${LIBOSSAUDIO} 25LIBS+= ${LIBOSSAUDIO}
26MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} 26MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
27MAKE_FLAGS+= docsdir=${PREFIX:Q}/share/doc/MuSE 27MAKE_FLAGS+= docsdir=${PREFIX:Q}/share/doc/MuSE
28 28
29SUBST_CLASSES+= dsp 29SUBST_CLASSES+= dsp
30SUBST_STAGE.dsp= post-patch 30SUBST_STAGE.dsp= post-patch
31SUBST_FILES.dsp= src/jmixer.cpp src/libmpeg/fileplayer.cc 31SUBST_FILES.dsp= src/jmixer.cpp src/libmpeg/fileplayer.cc
32SUBST_SED.dsp= -e "s,/dev/dsp,${DEVOSSAUDIO},g" 32SUBST_SED.dsp= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
33SUBST_MESSAGE.dsp= Fixing hardcoded audio device. 33SUBST_MESSAGE.dsp= Fixing hardcoded audio device.
34 34
 35.include "../../mk/bsd.prefs.mk"
 36.if ${OPSYS} == "DragonFly"
 37SUBST_CLASSES+= iostream
 38SUBST_STAGE.iostream= post-patch
 39SUBST_FILES.iostream= src/libmpeg/fileplayer.cc src/libmpeg/mpegtoraw.cc
 40SUBST_SED.iostream= -e 's,<iostream.h>,<iostream>,'
 41SUBST_MESSAGE.iostream= Fixing old iostream headers includes
 42.endif
 43
35.include "../../audio/lame/buildlink3.mk" 44.include "../../audio/lame/buildlink3.mk"
36.include "../../audio/libvorbis/buildlink3.mk" 45.include "../../audio/libvorbis/buildlink3.mk"
37.include "../../audio/libsndfile/buildlink3.mk" 46.include "../../audio/libsndfile/buildlink3.mk"
38.include "../../x11/gtk2/buildlink3.mk" 47.include "../../x11/gtk2/buildlink3.mk"
39.include "../../mk/pthread.buildlink3.mk" 48.include "../../mk/pthread.buildlink3.mk"
40.include "../../mk/oss.buildlink3.mk" 49.include "../../mk/oss.buildlink3.mk"
41.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"
cvs diff -r1.9 -r1.10 pkgsrc/audio/muse/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/muse/distinfo 2010/02/01 01:25:29 1.9
+++ pkgsrc/audio/muse/distinfo 2011/11/22 16:38:28 1.10
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.9 2010/02/01 01:25:29 joerg Exp $ 1$NetBSD: distinfo,v 1.10 2011/11/22 16:38:28 marino Exp $
2 2
3SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118 3SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118
4RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d 4RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d
5Size (MuSE-0.9.tar.gz) = 1363091 bytes 5Size (MuSE-0.9.tar.gz) = 1363091 bytes
6SHA1 (patch-aa) = 5020bece9b44c5006efe0c90b23f3c54f9313b57 6SHA1 (patch-aa) = 5020bece9b44c5006efe0c90b23f3c54f9313b57
7SHA1 (patch-ab) = 26d87f65078e45aec187ed4436b5ffce289247b3 7SHA1 (patch-ab) = e283bc69d90c330ecc2b06ebed70b574ef0f31c5
8SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa 8SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa
9SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd 9SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd
10SHA1 (patch-ae) = 54d5cd059c72ecd2b60d1ac188540c29343322f7 10SHA1 (patch-ae) = 54d5cd059c72ecd2b60d1ac188540c29343322f7
11SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc 11SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc
12SHA1 (patch-ag) = 65515e3a2e8947a1ac1b01e5585a1ca04513bd70 12SHA1 (patch-ag) = 65515e3a2e8947a1ac1b01e5585a1ca04513bd70
13SHA1 (patch-ah) = 458d747f30e7767f53bc5dd890da1dd9e94cabfa 13SHA1 (patch-ah) = 458d747f30e7767f53bc5dd890da1dd9e94cabfa
cvs diff -r1.2 -r1.3 pkgsrc/audio/muse/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/muse/patches/patch-ab 2005/12/11 23:44:40 1.2
+++ pkgsrc/audio/muse/patches/patch-ab 2011/11/22 16:38:28 1.3
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1$NetBSD: patch-ab,v 1.2 2005/12/11 23:44:40 joerg Exp $ 1$NetBSD: patch-ab,v 1.3 2011/11/22 16:38:28 marino Exp $
2 2
3--- src/jmixer.cpp.orig 2004-04-09 17:50:43.000000000 +0000 3--- src/jmixer.cpp.orig 2004-04-09 17:50:43.000000000 +0000
4+++ src/jmixer.cpp 4+++ src/jmixer.cpp
5@@ -98,7 +98,7 @@ Stream_mixer::Stream_mixer() { 5@@ -98,7 +98,7 @@ Stream_mixer::Stream_mixer() {
6 error("error initializing POSIX thread mutex"); 6 error("error initializing POSIX thread mutex");
7 if(pthread_cond_init (&_cond, NULL) == -1) 7 if(pthread_cond_init (&_cond, NULL) == -1)
8 error("error initializing POSIX thread condtition");  8 error("error initializing POSIX thread condtition");
9- unlock(); 9- unlock();
10+ //unlock(); 10+ //unlock();
11 } 11 }
12  12
13 Stream_mixer::~Stream_mixer() { 13 Stream_mixer::~Stream_mixer() {
14@@ -627,7 +627,11 @@ bool Stream_mixer::set_playmode(int ch,  14@@ -627,7 +627,11 @@ bool Stream_mixer::set_playmode(int ch,
15 /* this is the function selecting files for the scandir 15 /* this is the function selecting files for the scandir
16 on freebsd systems you should change the following line to: 16 on freebsd systems you should change the following line to:
17 int selector(struct dirent *dir) { */ 17 int selector(struct dirent *dir) { */
18+#if defined(__FreeBSD__) || defined(__DragonFly__) 18+#if defined(__FreeBSD__)
19+int selector(struct dirent *dir) { 19+int selector(struct dirent *dir) {
20+#else 20+#else
21 int selector(const struct dirent *dir) { 21 int selector(const struct dirent *dir) {
22+#endif 22+#endif
23 if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0 23 if( strncasecmp(dir->d_name+strlen(dir->d_name)-4,".mp3",4)==0
24 #ifdef HAVE_VORBIS 24 #ifdef HAVE_VORBIS
25 || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0 25 || strncasecmp(dir->d_name+strlen(dir->d_name)-4,".ogg",4)==0