Wed Nov 27 14:44:05 2019 UTC ()
festival: handle fpos_t on sunos


(nia)
diff -r1.30 -r1.31 pkgsrc/audio/festival/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/festival/patches/patch-festival_src_modules_hts__engine_HTS__misc.c
cvs diff -r1.30 -r1.31 pkgsrc/audio/festival/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/festival/distinfo 2019/11/23 11:56:55 1.30
+++ pkgsrc/audio/festival/distinfo 2019/11/27 14:44:05 1.31
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: distinfo,v 1.30 2019/11/23 11:56:55 nia Exp $ 1$NetBSD: distinfo,v 1.31 2019/11/27 14:44:05 nia Exp $
2 2
3SHA1 (festival-2.5.0-release.tar.gz) = a433de2d1c344a1af63579e757551432abe583ca 3SHA1 (festival-2.5.0-release.tar.gz) = a433de2d1c344a1af63579e757551432abe583ca
4RMD160 (festival-2.5.0-release.tar.gz) = 68f71e389f38c78863b15da319f16d21dcf27818 4RMD160 (festival-2.5.0-release.tar.gz) = 68f71e389f38c78863b15da319f16d21dcf27818
5SHA512 (festival-2.5.0-release.tar.gz) = 529ec3a1780a861074b6070567f3e11cfcc839081f61e078978a491f11eb424bc4d6adf599f073d5571e20f66871b7045df9f9b175a1083d10e8bb02342639b1 5SHA512 (festival-2.5.0-release.tar.gz) = 529ec3a1780a861074b6070567f3e11cfcc839081f61e078978a491f11eb424bc4d6adf599f073d5571e20f66871b7045df9f9b175a1083d10e8bb02342639b1
6Size (festival-2.5.0-release.tar.gz) = 789013 bytes 6Size (festival-2.5.0-release.tar.gz) = 789013 bytes
7SHA1 (speech_tools-2.5.0-release.tar.gz) = 8154c956465b2407c4de1700c7ecd0b04b4694ca 7SHA1 (speech_tools-2.5.0-release.tar.gz) = 8154c956465b2407c4de1700c7ecd0b04b4694ca
8RMD160 (speech_tools-2.5.0-release.tar.gz) = a13c480ed7d5cd13a090d47a04bca011f07ee183 8RMD160 (speech_tools-2.5.0-release.tar.gz) = a13c480ed7d5cd13a090d47a04bca011f07ee183
9SHA512 (speech_tools-2.5.0-release.tar.gz) = 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7 9SHA512 (speech_tools-2.5.0-release.tar.gz) = 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7
10Size (speech_tools-2.5.0-release.tar.gz) = 1328624 bytes 10Size (speech_tools-2.5.0-release.tar.gz) = 1328624 bytes
11SHA1 (patch-aa) = 053713a156c277fd47ff4e687b3623bf0061dd89 11SHA1 (patch-aa) = 053713a156c277fd47ff4e687b3623bf0061dd89
12SHA1 (patch-ab) = 7f22ea2a89caf72dcb18818eb98bdb54911d5e7c 12SHA1 (patch-ab) = 7f22ea2a89caf72dcb18818eb98bdb54911d5e7c
13SHA1 (patch-ac) = 9ffe5f44dc50d9ab5161b9ca107956e799fff463 13SHA1 (patch-ac) = 9ffe5f44dc50d9ab5161b9ca107956e799fff463
14SHA1 (patch-ae) = 9d630d198f829979508b90416ddb0f56d721b422 14SHA1 (patch-ae) = 9d630d198f829979508b90416ddb0f56d721b422
15SHA1 (patch-aq) = 81109b22e5db0f733fa2a3d8e7cdef1cdcbe0185 15SHA1 (patch-aq) = 81109b22e5db0f733fa2a3d8e7cdef1cdcbe0185
16SHA1 (patch-festival_src_modules_hts__engine_HTS__misc.c) = d40659b50cee96030464a549625418895c79313f 16SHA1 (patch-festival_src_modules_hts__engine_HTS__misc.c) = bef058a916f57125bb3c6d29c4aade3984b1aef3
17SHA1 (patch-speech__tools_config_compilers_gcc__defaults.mak) = 0498a265d7f77b39503d5442cca0754ad72531a8 17SHA1 (patch-speech__tools_config_compilers_gcc__defaults.mak) = 0498a265d7f77b39503d5442cca0754ad72531a8
18SHA1 (patch-speech__tools_config_rules_compile__options.mak) = d3aa93029edba84f8130f1bc33c8d74219bafd9a 18SHA1 (patch-speech__tools_config_rules_compile__options.mak) = d3aa93029edba84f8130f1bc33c8d74219bafd9a
19SHA1 (patch-speech__tools_config_rules_defaults.mak) = 65f45aca3eb44ab5ff598265a716e5882c399a5c 19SHA1 (patch-speech__tools_config_rules_defaults.mak) = 65f45aca3eb44ab5ff598265a716e5882c399a5c
20SHA1 (patch-speech__tools_config_rules_test__make__rules.mak) = 2141aeb522b2be06b7098327cb860cd55b5c7be4 20SHA1 (patch-speech__tools_config_rules_test__make__rules.mak) = 2141aeb522b2be06b7098327cb860cd55b5c7be4
21SHA1 (patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = ec5eb54fba5a50b43d1a0c9f0a5ae36407f55bff 21SHA1 (patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = ec5eb54fba5a50b43d1a0c9f0a5ae36407f55bff
22SHA1 (patch-speech__tools_include_unix_EST__socket__unix.h) = f81c0cda0858d121e2d24182f39c7ab8fc673174 22SHA1 (patch-speech__tools_include_unix_EST__socket__unix.h) = f81c0cda0858d121e2d24182f39c7ab8fc673174
cvs diff -r1.1 -r1.2 pkgsrc/audio/festival/patches/patch-festival_src_modules_hts__engine_HTS__misc.c (expand / switch to unified diff)

--- pkgsrc/audio/festival/patches/patch-festival_src_modules_hts__engine_HTS__misc.c 2019/09/11 10:03:17 1.1
+++ pkgsrc/audio/festival/patches/patch-festival_src_modules_hts__engine_HTS__misc.c 2019/11/27 14:44:05 1.2
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-festival_src_modules_hts__engine_HTS__misc.c,v 1.1 2019/09/11 10:03:17 nia Exp $ 1$NetBSD: patch-festival_src_modules_hts__engine_HTS__misc.c,v 1.2 2019/11/27 14:44:05 nia Exp $
2 2
3Support NetBSD and FreeBSD. 3Support NetBSD and FreeBSD.
4 4
5--- festival/src/modules/hts_engine/HTS_misc.c.orig 2017-09-04 15:54:08.000000000 +0000 5--- festival/src/modules/hts_engine/HTS_misc.c.orig 2017-09-04 15:54:08.000000000 +0000
6+++ festival/src/modules/hts_engine/HTS_misc.c 6+++ festival/src/modules/hts_engine/HTS_misc.c
7@@ -245,8 +245,10 @@ size_t HTS_ftell(HTS_File * fp) 7@@ -245,8 +245,10 @@ size_t HTS_ftell(HTS_File * fp)
8 } else if (fp->type == HTS_FILE) { 8 } else if (fp->type == HTS_FILE) {
9 fpos_t pos; 9 fpos_t pos;
10 fgetpos((FILE *) fp->pointer, &pos); 10 fgetpos((FILE *) fp->pointer, &pos);
11-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) 11-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__)
12+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__FreeBSD__) 12+#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
13 return (size_t) pos; 13 return (size_t) pos;
14+#elif defined(__NetBSD__) 14+#elif defined(__NetBSD__)
15+ return (size_t) pos._pos; 15+ return (size_t) pos._pos;
16 #else 16 #else
17 return (size_t) pos.__pos; 17 return (size_t) pos.__pos;
18 #endif /* _WIN32 || __APPLE__ */ 18 #endif /* _WIN32 || __APPLE__ */