diff options
| author | wiz <wiz> | 2011-11-30 11:59:39 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-11-30 11:59:39 +0000 |
| commit | 9ea686eb298d631b7cca4f387cce83201045eb1d (patch) | |
| tree | 92f49ba3bdaf74e4725410f94c130720484565af /audio/libaudiofile | |
| parent | 5374a6009edabeb9ce199ab6fd64672eec11a1c6 (diff) | |
| download | pkgsrc-9ea686eb298d631b7cca4f387cce83201045eb1d.tar.gz | |
Remove:
typedef struct _AFvirtualfile AFvirtualfile;
from af_vfs.h, the same line is in audiofile.h (which it includes),
and this breaks the build of musicpd.
Bump PGKREVISION.
Diffstat (limited to 'audio/libaudiofile')
| -rw-r--r-- | audio/libaudiofile/Makefile | 3 | ||||
| -rw-r--r-- | audio/libaudiofile/distinfo | 3 | ||||
| -rw-r--r-- | audio/libaudiofile/patches/patch-libaudiofile_af__vfs.h | 15 |
3 files changed, 19 insertions, 2 deletions
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile index b5af58eab40..3581936f56a 100644 --- a/audio/libaudiofile/Makefile +++ b/audio/libaudiofile/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.48 2011/11/30 08:52:02 tron Exp $ +# $NetBSD: Makefile,v 1.49 2011/11/30 11:59:39 wiz Exp $ DISTNAME= audiofile-0.3.1 PKGNAME= lib${DISTNAME} +PKGREVISION= 1 CATEGORIES= audio MASTER_SITES= http://www.68k.org/~michael/audiofile/ diff --git a/audio/libaudiofile/distinfo b/audio/libaudiofile/distinfo index 7d7a8947d7e..08546d32d3b 100644 --- a/audio/libaudiofile/distinfo +++ b/audio/libaudiofile/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.15 2011/11/29 19:39:30 wiz Exp $ +$NetBSD: distinfo,v 1.16 2011/11/30 11:59:39 wiz Exp $ SHA1 (audiofile-0.3.1.tar.gz) = 39de137a691a7c12ea5dc468566eb7a146880ac3 RMD160 (audiofile-0.3.1.tar.gz) = 26126ae4e095bc9d37b5184853fa545283684d03 Size (audiofile-0.3.1.tar.gz) = 722557 bytes SHA1 (patch-af) = 095d0bf52b7545718d8058f6474b6d9c05b6ceab SHA1 (patch-configure) = 0bae38fd7634bca62d31173ccf04d2ae3ba140db +SHA1 (patch-libaudiofile_af__vfs.h) = 45cd5becf0e6f6f844bd8b50e189e45b6f682c9d SHA1 (patch-libaudiofile_util.cpp) = be175d47b708fc8262926d014dca4f4ff50093e1 diff --git a/audio/libaudiofile/patches/patch-libaudiofile_af__vfs.h b/audio/libaudiofile/patches/patch-libaudiofile_af__vfs.h new file mode 100644 index 00000000000..8ee5d235009 --- /dev/null +++ b/audio/libaudiofile/patches/patch-libaudiofile_af__vfs.h @@ -0,0 +1,15 @@ +$NetBSD: patch-libaudiofile_af__vfs.h,v 1.1 2011/11/30 11:59:39 wiz Exp $ + +Conflicts with same definition in audiofile.h. + +--- libaudiofile/af_vfs.h.orig 2011-09-13 03:59:06.000000000 +0000 ++++ libaudiofile/af_vfs.h +@@ -34,8 +34,6 @@ + extern "C" { + #endif + +-typedef struct _AFvirtualfile AFvirtualfile; +- + struct _AFvirtualfile + { + ssize_t (*read) (AFvirtualfile *vfile, void *data, size_t nbytes); |