summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiedi <wiedi>2017-07-01 11:01:44 +0000
committerwiedi <wiedi>2017-07-01 11:01:44 +0000
commit4cdc26b6e28fcf1947f1d9ac67b41ab2f095f72c (patch)
tree079fa27f22548feb35930d54551b6c7e164976d0
parent65a4486adb289bf088d1b93d75622891ccf10a55 (diff)
downloadpkgsrc-4cdc26b6e28fcf1947f1d9ac67b41ab2f095f72c.tar.gz
fix "request for member '__pos' in something not a structure or union" on SunOS
-rw-r--r--audio/sptk/distinfo4
-rw-r--r--audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c14
2 files changed, 10 insertions, 8 deletions
diff --git a/audio/sptk/distinfo b/audio/sptk/distinfo
index 9209a7b7d5c..ff3580e4b00 100644
--- a/audio/sptk/distinfo
+++ b/audio/sptk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2016/07/10 12:06:21 mef Exp $
+$NetBSD: distinfo,v 1.8 2017/07/01 11:01:44 wiedi Exp $
SHA1 (SPTK-3.9.tar.gz) = 76eb657d9b7b7005090ec2515d7c02da4fa69b74
RMD160 (SPTK-3.9.tar.gz) = c19b651e653cf26b49e2220afd8cd435bd255089
@@ -13,4 +13,4 @@ RMD160 (SPTKref-3.9.pdf) = 4f6650ea5e648ebc602e60b1c51b7e334344b17e
SHA512 (SPTKref-3.9.pdf) = d145adad6cfc78d8e04f546feb6eaf17e27f79a3f03e1af9ff86f213b675e4648d965670e1fa3f62d4101f9bacebf7a710947c70d7f302fe7c694c8f73e6d31c
Size (SPTKref-3.9.pdf) = 1044287 bytes
SHA1 (patch-bin_pitch_swipe_swipe.c) = af7013843ddf1a801be32d10c65f8ec525c481c2
-SHA1 (patch-bin_vc_hts__engine__API_HTS__misc.c) = cc4a4ab182e93323280d3b777e3eef4bc55050fa
+SHA1 (patch-bin_vc_hts__engine__API_HTS__misc.c) = 3001b2e7f61b6bef5ac19d721b5c8074286b6486
diff --git a/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c b/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c
index 7f4036a2ae1..f5a870cd952 100644
--- a/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c
+++ b/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c
@@ -1,23 +1,25 @@
-$NetBSD: patch-bin_vc_hts__engine__API_HTS__misc.c,v 1.1 2016/07/10 12:06:21 mef Exp $
+$NetBSD: patch-bin_vc_hts__engine__API_HTS__misc.c,v 1.2 2017/07/01 11:01:44 wiedi Exp $
hts_engine_API/HTS_misc.c: In function 'HTS_ftell':
hts_engine_API/HTS_misc.c:251:26: error: 'fpos_t' has no member named '__pos'
---- bin/vc/hts_engine_API/HTS_misc.c~ 2015-12-25 15:10:53.000000000 +0900
-+++ bin/vc/hts_engine_API/HTS_misc.c 2016-07-10 21:01:30.000000000 +0900
-@@ -245,10 +245,14 @@ size_t HTS_ftell(HTS_File * fp)
+--- bin/vc/hts_engine_API/HTS_misc.c.orig 2015-12-25 06:10:53.000000000 +0000
++++ bin/vc/hts_engine_API/HTS_misc.c
+@@ -245,11 +245,15 @@ size_t HTS_ftell(HTS_File * fp)
} else if (fp->type == HTS_FILE) {
fpos_t pos;
fgetpos((FILE *) fp->pointer, &pos);
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__)
-+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__)
++#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__sun)
return (size_t) pos;
#else
+# if defined(__NetBSD__)
+ return (size_t) pos._pos;
+# else
return (size_t) pos.__pos;
+-#endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
+# endif
- #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
++#endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ || __sun */
} else if (fp->type == HTS_DATA) {
HTS_Data *d = (HTS_Data *) fp->pointer;
+ return d->index;