diff options
| author | marino <marino@pkgsrc.org> | 2011-11-20 17:46:34 +0000 |
|---|---|---|
| committer | marino <marino@pkgsrc.org> | 2011-11-20 17:46:34 +0000 |
| commit | 2c96cf3732cb0aa3f8aa8976b6d7b9afb389122b (patch) | |
| tree | d34583ca083015a970bcf5f41145fa36ec645bd2 /audio | |
| parent | 51a37cca54d31f20b76af5a7cc86e71f25888332 (diff) | |
| download | pkgsrc-2c96cf3732cb0aa3f8aa8976b6d7b9afb389122b.tar.gz | |
audio/daapd: Fix DragonFly breakage
To allow this package to build on DragonFly:
1) Fix bad #elif
2) Add <string.h> for DragonFly
This shouldn't affect the binary package for other platforms, and it's
never built on DragonFly, so no PKGREVISION bump required.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/daapd/distinfo | 5 | ||||
| -rw-r--r-- | audio/daapd/patches/patch-ad | 20 | ||||
| -rw-r--r-- | audio/daapd/patches/patch-ag | 13 |
3 files changed, 31 insertions, 7 deletions
diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo index 4049c14b36d..6a7f0d5eb70 100644 --- a/audio/daapd/distinfo +++ b/audio/daapd/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.19 2011/09/12 05:01:15 dholland Exp $ +$NetBSD: distinfo,v 1.20 2011/11/20 17:46:34 marino Exp $ SHA1 (daapd-0.2.4b.tgz) = 0903303f155c19ae12cdc78be05799508156a16b RMD160 (daapd-0.2.4b.tgz) = 899b37b3872623ef918f7faa4eb8bad2dfc5b369 Size (daapd-0.2.4b.tgz) = 205476 bytes SHA1 (patch-aa) = c10564ede45fa92b18926da68a7a9a2d9547627d SHA1 (patch-ac) = 0a4e3dfb010bbf2cc01843987c970548cb4c646f -SHA1 (patch-ad) = 05a61ced18d5b0827ade7e6b3341430ff9b9e89d +SHA1 (patch-ad) = ef5f85246af973406e071ff9d3164f01958cff6a SHA1 (patch-ae) = 3433d7e944999e10690ccdda1d49d3c711671446 SHA1 (patch-af) = 1a453dde4dd7d33061a500729b9ef5d89e850133 +SHA1 (patch-ag) = cf0dc389fb2a031883f52c348d8303dd36b33818 SHA1 (patch-libhttpd_configure) = 91a7a942a078bda76582cbdf0cc1d3ae8b7029cb diff --git a/audio/daapd/patches/patch-ad b/audio/daapd/patches/patch-ad index 7810ff74532..32db0c9e7c3 100644 --- a/audio/daapd/patches/patch-ad +++ b/audio/daapd/patches/patch-ad @@ -1,8 +1,18 @@ -$NetBSD: patch-ad,v 1.1 2006/07/03 13:58:31 tron Exp $ +$NetBSD: patch-ad,v 1.2 2011/11/20 17:46:34 marino Exp $ ---- daaplib/include/daap/tagoutput.h.orig 2006-07-03 10:56:28.000000000 +0100 -+++ daaplib/include/daap/tagoutput.h 2006-07-03 10:39:27.000000000 +0100 -@@ -98,9 +98,7 @@ +--- daaplib/include/daap/tagoutput.h.orig 2011-11-20 17:12:14.246503000 +0000 ++++ daaplib/include/daap/tagoutput.h +@@ -25,6 +25,9 @@ + + #include <daap/basic.h> + #include <string> ++ #if defined(__DragonFly__) ++ #include <string.h> ++ #endif + #include <vector> + #include <assert.h> + +@@ -98,9 +101,7 @@ return( func( *this )); } @@ -13,7 +23,7 @@ $NetBSD: patch-ad,v 1.1 2006/07/03 13:58:31 tron Exp $ protected: typedef std::vector<u8> DataInt8; -@@ -125,4 +123,8 @@ +@@ -125,4 +126,8 @@ TagOutput( const TagOutput& ); TagOutput& operator = ( const TagOutput& ); }; diff --git a/audio/daapd/patches/patch-ag b/audio/daapd/patches/patch-ag new file mode 100644 index 00000000000..39e03734963 --- /dev/null +++ b/audio/daapd/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2011/11/20 17:46:34 marino Exp $ + +--- daaplib/include/daap/basic.h.orig 2011-11-20 17:12:14.236503000 +0000 ++++ daaplib/include/daap/basic.h +@@ -53,7 +53,7 @@ + typedef int32_t s32; + typedef int16_t s16; + typedef int8_t s8; +- #elif ++ #else + #error "uh - no idea what the int types could be!" + #endif + |