diff options
| author | marino <marino@pkgsrc.org> | 2011-11-22 16:38:28 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2011-11-22 16:38:28 +0000 |
| commit | 1539353ea7f744dc1bfd4d295c16501e1ad4c8c6 (patch) | |
| tree | 58b76cade2b703b3365b2837998ebc2a475a995a /audio/muse | |
| parent | 0802ca83d0a0804f6528842cbf0878d97810aac5 (diff) | |
| download | pkgsrc-1539353ea7f744dc1bfd4d295c16501e1ad4c8c6.tar.gz | |
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.
Diffstat (limited to 'audio/muse')
| -rw-r--r-- | audio/muse/Makefile | 11 | ||||
| -rw-r--r-- | audio/muse/distinfo | 4 | ||||
| -rw-r--r-- | audio/muse/patches/patch-ab | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/audio/muse/Makefile b/audio/muse/Makefile index a29bc7ff661..318eb44a766 100644 --- a/audio/muse/Makefile +++ b/audio/muse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2011/11/01 06:00:39 sbd Exp $ +# $NetBSD: Makefile,v 1.34 2011/11/22 16:38:28 marino Exp $ # DISTNAME= MuSE-0.9 @@ -32,6 +32,15 @@ SUBST_FILES.dsp= src/jmixer.cpp src/libmpeg/fileplayer.cc SUBST_SED.dsp= -e "s,/dev/dsp,${DEVOSSAUDIO},g" SUBST_MESSAGE.dsp= Fixing hardcoded audio device. +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "DragonFly" +SUBST_CLASSES+= iostream +SUBST_STAGE.iostream= post-patch +SUBST_FILES.iostream= src/libmpeg/fileplayer.cc src/libmpeg/mpegtoraw.cc +SUBST_SED.iostream= -e 's,<iostream.h>,<iostream>,' +SUBST_MESSAGE.iostream= Fixing old iostream headers includes +.endif + .include "../../audio/lame/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/libsndfile/buildlink3.mk" diff --git a/audio/muse/distinfo b/audio/muse/distinfo index 2edf6dcf4a2..bb171440cf7 100644 --- a/audio/muse/distinfo +++ b/audio/muse/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.9 2010/02/01 01:25:29 joerg Exp $ +$NetBSD: distinfo,v 1.10 2011/11/22 16:38:28 marino 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) = 5020bece9b44c5006efe0c90b23f3c54f9313b57 -SHA1 (patch-ab) = 26d87f65078e45aec187ed4436b5ffce289247b3 +SHA1 (patch-ab) = e283bc69d90c330ecc2b06ebed70b574ef0f31c5 SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd SHA1 (patch-ae) = 54d5cd059c72ecd2b60d1ac188540c29343322f7 diff --git a/audio/muse/patches/patch-ab b/audio/muse/patches/patch-ab index 9e7e15df92f..bcf2abfd361 100644 --- a/audio/muse/patches/patch-ab +++ b/audio/muse/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.2 2005/12/11 23:44:40 joerg Exp $ +$NetBSD: patch-ab,v 1.3 2011/11/22 16:38:28 marino Exp $ --- src/jmixer.cpp.orig 2004-04-09 17:50:43.000000000 +0000 +++ src/jmixer.cpp @@ -15,7 +15,7 @@ $NetBSD: patch-ab,v 1.2 2005/12/11 23:44:40 joerg Exp $ /* 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__) ++#if defined(__FreeBSD__) +int selector(struct dirent *dir) { +#else int selector(const struct dirent *dir) { |