summaryrefslogtreecommitdiff
path: root/audio/muse
diff options
context:
space:
mode:
authorasau <asau@pkgsrc.org>2014-04-23 20:14:03 +0000
committerasau <asau@pkgsrc.org>2014-04-23 20:14:03 +0000
commite1c921c363b708ad68be9e4b8c6a206bfde8c97d (patch)
tree0a5919267112e341fb7b5b110c49e79c6eabe0a7 /audio/muse
parent70a21e9faaf73afd115478fc9d20f835d470f5ff (diff)
downloadpkgsrc-e1c921c363b708ad68be9e4b8c6a206bfde8c97d.tar.gz
Fix build on FreeBSD 10.
Diffstat (limited to 'audio/muse')
-rw-r--r--audio/muse/distinfo6
-rw-r--r--audio/muse/patches/patch-aa4
-rw-r--r--audio/muse/patches/patch-ab14
3 files changed, 6 insertions, 18 deletions
diff --git a/audio/muse/distinfo b/audio/muse/distinfo
index 077931f7454..d6447d57d90 100644
--- a/audio/muse/distinfo
+++ b/audio/muse/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2012/01/11 19:59:35 hans Exp $
+$NetBSD: distinfo,v 1.13 2014/04/23 20:14:03 asau 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) = e283bc69d90c330ecc2b06ebed70b574ef0f31c5
+SHA1 (patch-aa) = 5bbea372750e4747cdc6ec40b531937ff0174ccb
+SHA1 (patch-ab) = 56a51f8cdb2c70cea7fad40a73c5720ad9aa8d7c
SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa
SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd
SHA1 (patch-ae) = 7b176763091b03671ec7455ecea11fb5d31536c6
diff --git a/audio/muse/patches/patch-aa b/audio/muse/patches/patch-aa
index 97d4e77f35d..8d083485d13 100644
--- a/audio/muse/patches/patch-aa
+++ b/audio/muse/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2009/03/11 14:42:35 hasso Exp $
+$NetBSD: patch-aa,v 1.3 2014/04/23 20:14:03 asau Exp $
--- src/shout/sock.h.orig 2004-04-30 01:49:50.000000000 +0200
+++ src/shout/sock.h 2004-04-30 01:50:10.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.2 2009/03/11 14:42:35 hasso Exp $
#endif
-#ifdef HAVE_SYS_UIO_H
-+#if defined(HAVE_SYS_UIO_H) || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(HAVE_SYS_UIO_H) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
#include <sys/uio.h>
#else
#ifndef _SYS_UIO_H
diff --git a/audio/muse/patches/patch-ab b/audio/muse/patches/patch-ab
index bcf2abfd361..4a4ae1b4d58 100644
--- a/audio/muse/patches/patch-ab
+++ b/audio/muse/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.3 2011/11/22 16:38:28 marino Exp $
+$NetBSD: patch-ab,v 1.4 2014/04/23 20:14:03 asau Exp $
--- src/jmixer.cpp.orig 2004-04-09 17:50:43.000000000 +0000
+++ src/jmixer.cpp
@@ -11,15 +11,3 @@ $NetBSD: patch-ab,v 1.3 2011/11/22 16:38:28 marino 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__)
-+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