Received: by mail.netbsd.org (Postfix, from userid 605) id 9F6AC84DA2; Sat, 1 Jul 2017 11:01:45 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3051584D8D for ; Sat, 1 Jul 2017 11:01:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wyCi206EbUhh for ; Sat, 1 Jul 2017 11:01:44 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A770A84D8A for ; Sat, 1 Jul 2017 11:01:44 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A1F6FFAE8; Sat, 1 Jul 2017 11:01:44 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1498906904104310" MIME-Version: 1.0 Date: Sat, 1 Jul 2017 11:01:44 +0000 From: "Sebastian Wiedenroth" Subject: CVS commit: pkgsrc/audio/sptk To: pkgsrc-changes@NetBSD.org Reply-To: wiedi@netbsd.org X-Mailer: log_accum Message-Id: <20170701110144.A1F6FFAE8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1498906904104310 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiedi Date: Sat Jul 1 11:01:44 UTC 2017 Modified Files: pkgsrc/audio/sptk: distinfo pkgsrc/audio/sptk/patches: patch-bin_vc_hts__engine__API_HTS__misc.c Log Message: fix "request for member '__pos' in something not a structure or union" on SunOS To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/sptk/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1498906904104310 Content-Disposition: inline Content-Length: 3102 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/sptk/distinfo diff -u pkgsrc/audio/sptk/distinfo:1.7 pkgsrc/audio/sptk/distinfo:1.8 --- pkgsrc/audio/sptk/distinfo:1.7 Sun Jul 10 12:06:21 2016 +++ pkgsrc/audio/sptk/distinfo Sat Jul 1 11:01:44 2017 @@ -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) = 4f6650ea5e648 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 Index: pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c diff -u pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c:1.1 pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c:1.2 --- pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c:1.1 Sun Jul 10 12:06:21 2016 +++ pkgsrc/audio/sptk/patches/patch-bin_vc_hts__engine__API_HTS__misc.c Sat Jul 1 11:01:44 2017 @@ -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; --_----------=_1498906904104310--