Sat Jul 1 11:01:44 2017 UTC ()
fix "request for member '__pos' in something not a structure or union" on SunOS


(wiedi)
diff -r1.7 -r1.8 pkgsrc/audio/sptk/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c
cvs diff -r1.7 -r1.8 pkgsrc/audio/sptk/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/sptk/distinfo 2016/07/10 12:06:21 1.7
+++ pkgsrc/audio/sptk/distinfo 2017/07/01 11:01:44 1.8
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: distinfo,v 1.7 2016/07/10 12:06:21 mef Exp $ 1$NetBSD: distinfo,v 1.8 2017/07/01 11:01:44 wiedi Exp $
2 2
3SHA1 (SPTK-3.9.tar.gz) = 76eb657d9b7b7005090ec2515d7c02da4fa69b74 3SHA1 (SPTK-3.9.tar.gz) = 76eb657d9b7b7005090ec2515d7c02da4fa69b74
4RMD160 (SPTK-3.9.tar.gz) = c19b651e653cf26b49e2220afd8cd435bd255089 4RMD160 (SPTK-3.9.tar.gz) = c19b651e653cf26b49e2220afd8cd435bd255089
5SHA512 (SPTK-3.9.tar.gz) = b4005c83723d07c873240f48ab66af476017211151ee69b1b4abc2478604bae1c7794906a95d9e6ff4d2c7e4fd6687cab95470abb5f2f15cb75ad57327cae86e 5SHA512 (SPTK-3.9.tar.gz) = b4005c83723d07c873240f48ab66af476017211151ee69b1b4abc2478604bae1c7794906a95d9e6ff4d2c7e4fd6687cab95470abb5f2f15cb75ad57327cae86e
6Size (SPTK-3.9.tar.gz) = 1077702 bytes 6Size (SPTK-3.9.tar.gz) = 1077702 bytes
7SHA1 (SPTKexamples-3.9.pdf) = 1a0588b36de6da08df45f35ccf950269899fb23e 7SHA1 (SPTKexamples-3.9.pdf) = 1a0588b36de6da08df45f35ccf950269899fb23e
8RMD160 (SPTKexamples-3.9.pdf) = cf5cfbc4908246a380080195fa15ec8baa2967ae 8RMD160 (SPTKexamples-3.9.pdf) = cf5cfbc4908246a380080195fa15ec8baa2967ae
9SHA512 (SPTKexamples-3.9.pdf) = 56d1e22d99567e46ff5fc050aebf72eb327aad6872635b1a627d69d89e008fd39e170f82bce7b4bb847bde8e7ab23e91afb84acb7046ef4dec1494e4f7d73e49 9SHA512 (SPTKexamples-3.9.pdf) = 56d1e22d99567e46ff5fc050aebf72eb327aad6872635b1a627d69d89e008fd39e170f82bce7b4bb847bde8e7ab23e91afb84acb7046ef4dec1494e4f7d73e49
10Size (SPTKexamples-3.9.pdf) = 2752695 bytes 10Size (SPTKexamples-3.9.pdf) = 2752695 bytes
11SHA1 (SPTKref-3.9.pdf) = 01c4d94bbf3b2b6ccad25b68dacf90cad7cc7adb 11SHA1 (SPTKref-3.9.pdf) = 01c4d94bbf3b2b6ccad25b68dacf90cad7cc7adb
12RMD160 (SPTKref-3.9.pdf) = 4f6650ea5e648ebc602e60b1c51b7e334344b17e 12RMD160 (SPTKref-3.9.pdf) = 4f6650ea5e648ebc602e60b1c51b7e334344b17e
13SHA512 (SPTKref-3.9.pdf) = d145adad6cfc78d8e04f546feb6eaf17e27f79a3f03e1af9ff86f213b675e4648d965670e1fa3f62d4101f9bacebf7a710947c70d7f302fe7c694c8f73e6d31c 13SHA512 (SPTKref-3.9.pdf) = d145adad6cfc78d8e04f546feb6eaf17e27f79a3f03e1af9ff86f213b675e4648d965670e1fa3f62d4101f9bacebf7a710947c70d7f302fe7c694c8f73e6d31c
14Size (SPTKref-3.9.pdf) = 1044287 bytes 14Size (SPTKref-3.9.pdf) = 1044287 bytes
15SHA1 (patch-bin_pitch_swipe_swipe.c) = af7013843ddf1a801be32d10c65f8ec525c481c2 15SHA1 (patch-bin_pitch_swipe_swipe.c) = af7013843ddf1a801be32d10c65f8ec525c481c2
16SHA1 (patch-bin_vc_hts__engine__API_HTS__misc.c) = cc4a4ab182e93323280d3b777e3eef4bc55050fa 16SHA1 (patch-bin_vc_hts__engine__API_HTS__misc.c) = 3001b2e7f61b6bef5ac19d721b5c8074286b6486
cvs diff -r1.1 -r1.2 pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c (expand / switch to unified diff)

--- pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c 2016/07/10 12:06:21 1.1
+++ pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c 2017/07/01 11:01:44 1.2
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1$NetBSD: patch-bin_vc_hts__engine__API_HTS__misc.c,v 1.1 2016/07/10 12:06:21 mef Exp $ 1$NetBSD: patch-bin_vc_hts__engine__API_HTS__misc.c,v 1.2 2017/07/01 11:01:44 wiedi Exp $
2 2
3hts_engine_API/HTS_misc.c: In function 'HTS_ftell': 3hts_engine_API/HTS_misc.c: In function 'HTS_ftell':
4hts_engine_API/HTS_misc.c:251:26: error: 'fpos_t' has no member named '__pos' 4hts_engine_API/HTS_misc.c:251:26: error: 'fpos_t' has no member named '__pos'
5 5
6--- bin/vc/hts_engine_API/HTS_misc.c~ 2015-12-25 15:10:53.000000000 +0900 6--- bin/vc/hts_engine_API/HTS_misc.c.orig 2015-12-25 06:10:53.000000000 +0000
7+++ bin/vc/hts_engine_API/HTS_misc.c 2016-07-10 21:01:30.000000000 +0900 7+++ bin/vc/hts_engine_API/HTS_misc.c
8@@ -245,10 +245,14 @@ size_t HTS_ftell(HTS_File * fp) 8@@ -245,11 +245,15 @@ size_t HTS_ftell(HTS_File * fp)
9 } else if (fp->type == HTS_FILE) { 9 } else if (fp->type == HTS_FILE) {
10 fpos_t pos; 10 fpos_t pos;
11 fgetpos((FILE *) fp->pointer, &pos); 11 fgetpos((FILE *) fp->pointer, &pos);
12-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) 12-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__)
13+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__)  13+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__ANDROID__) || defined(__sun)
14 return (size_t) pos; 14 return (size_t) pos;
15 #else 15 #else
16+# if defined(__NetBSD__) 16+# if defined(__NetBSD__)
17+ return (size_t) pos._pos; 17+ return (size_t) pos._pos;
18+# else 18+# else
19 return (size_t) pos.__pos; 19 return (size_t) pos.__pos;
 20-#endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */
20+# endif 21+# endif
21 #endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ */ 22+#endif /* _WIN32 || __CYGWIN__ || __APPLE__ || __ANDROID__ || __sun */
22 } else if (fp->type == HTS_DATA) { 23 } else if (fp->type == HTS_DATA) {
23 HTS_Data *d = (HTS_Data *) fp->pointer; 24 HTS_Data *d = (HTS_Data *) fp->pointer;
 25 return d->index;