diff options
| author | kamil <kamil@pkgsrc.org> | 2019-10-25 09:03:47 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2019-10-25 09:03:47 +0000 |
| commit | 9fc7d18d6f95def33c951554fe47fbe4bf73fa4d (patch) | |
| tree | 35262f0a7b415a456514a8335747d5fcc86624a1 /audio/flactag | |
| parent | 8686cb8b177261110b9c54fbe8fea38349290928 (diff) | |
| download | pkgsrc-9fc7d18d6f95def33c951554fe47fbe4bf73fa4d.tar.gz | |
flactag: Fix build on NetBSD 9.99.17
Adapt the local patch for the POSIX iconv(3) API change in new NetBSD.
Diffstat (limited to 'audio/flactag')
| -rw-r--r-- | audio/flactag/distinfo | 4 | ||||
| -rw-r--r-- | audio/flactag/patches/patch-aa | 22 |
2 files changed, 20 insertions, 6 deletions
diff --git a/audio/flactag/distinfo b/audio/flactag/distinfo index 68acdae4843..9f2568defbf 100644 --- a/audio/flactag/distinfo +++ b/audio/flactag/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2015/11/03 01:12:31 agc Exp $ +$NetBSD: distinfo,v 1.8 2019/10/25 09:03:47 kamil Exp $ SHA1 (flactag-2.0.4.tar.gz) = eb62b3b8657fe26c6f838b0098fd4f176ccb454d RMD160 (flactag-2.0.4.tar.gz) = 2eeece5d5da94a51e0e11fe425de3d0ec11b6639 @@ -8,4 +8,4 @@ SHA1 (patch-CommandLine.cc) = f677354989b98c26a613cfdf1f10ab8746ac6ec3 SHA1 (patch-ConfigFile.cc) = 73ead20be34420b903eaa5ad61b7ba60f0aa03fe SHA1 (patch-ErrorLog.cc) = d3557d5f19a571fbaeb9b6cfe574cf7b31afb1d1 SHA1 (patch-FileNameBuilder.cc) = 8daed0f95e479b22228bd4f62163f8f148107df8 -SHA1 (patch-aa) = af23402361767ad79a2b0af006e2a89a25318d41 +SHA1 (patch-aa) = c741bef95af53ab2047c3af186d1caa00b62caf8 diff --git a/audio/flactag/patches/patch-aa b/audio/flactag/patches/patch-aa index 09f7ad94d0d..73df20ed49f 100644 --- a/audio/flactag/patches/patch-aa +++ b/audio/flactag/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2012/11/06 18:38:34 drochner Exp $ +$NetBSD: patch-aa,v 1.5 2019/10/25 09:03:47 kamil Exp $ --- UTF8Tag.cc.orig 2012-06-19 12:40:34.000000000 +0000 +++ UTF8Tag.cc -@@ -34,6 +34,7 @@ +@@ -34,11 +34,21 @@ #include <string.h> #include <stdio.h> #include <stdlib.h> @@ -10,11 +10,25 @@ $NetBSD: patch-aa,v 1.4 2012/11/06 18:38:34 drochner Exp $ #include <iconv.h> -@@ -73,11 +74,15 @@ void CUTF8Tag::Convert() + #include <sstream> + ++#if defined(__NetBSD__) ++#include <sys/param.h> ++#if __NetBSD_Prereq__(9,99,17) ++#define NETBSD_POSIX_ICONV 1 ++#else ++#define NETBSD_POSIX_ICONV 0 ++#endif ++#endif ++ + #include "ErrorLog.h" + + CUTF8Tag::CUTF8Tag(const std::string& UTF8Value) +@@ -73,11 +83,15 @@ void CUTF8Tag::Convert() memset(Out,0,m_UTF8Value.length()*4); size_t OutLeft=m_UTF8Value.length()*4; -+#if defined(__DragonFly__) || (__linux__) ++#if defined(__DragonFly__) || (__linux__) || (defined(__NetBSD__) && NETBSD_POSIX_ICONV) char *InBuff=In; +#else + const char *InBuff=In; |