Received: by mail.netbsd.org (Postfix, from userid 605) id 998D284D46; Wed, 2 Jan 2019 11:25:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2370384D44 for ; Wed, 2 Jan 2019 11:25:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id andRKhs0S5XG for ; Wed, 2 Jan 2019 11:25:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9B95F84CCF for ; Wed, 2 Jan 2019 11:25:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 96298FB16; Wed, 2 Jan 2019 11:25:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154642833250970" MIME-Version: 1.0 Date: Wed, 2 Jan 2019 11:25:32 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/emulators/snes9x To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190102112532.96298FB16@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. --_----------=_154642833250970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Wed Jan 2 11:25:32 UTC 2019 Modified Files: pkgsrc/emulators/snes9x: distinfo Added Files: pkgsrc/emulators/snes9x/patches: patch-unix_unix.cpp Log Message: emulators/snes9x: Rename a function from log2 to log2l to avoid problems with libc collisions on certain platforms. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 pkgsrc/emulators/snes9x/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154642833250970 Content-Disposition: inline Content-Length: 2131 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/snes9x/distinfo diff -u pkgsrc/emulators/snes9x/distinfo:1.20 pkgsrc/emulators/snes9x/distinfo:1.21 --- pkgsrc/emulators/snes9x/distinfo:1.20 Tue Jan 1 22:16:14 2019 +++ pkgsrc/emulators/snes9x/distinfo Wed Jan 2 11:25:32 2019 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.20 2019/01/01 22:16:14 nia Exp $ +$NetBSD: distinfo,v 1.21 2019/01/02 11:25:32 nia Exp $ SHA1 (snes9x-1.58.tar.gz) = c94ceb8d7b322b4bfa030b1327d815b697e4176a RMD160 (snes9x-1.58.tar.gz) = 51f7fe17f003998b35204046ca7d193d37980da1 SHA512 (snes9x-1.58.tar.gz) = 51f8e92258db58e55f7b0b6c4537a916358891bb5ee35bd984d1970d2fedbdb2f8b3a4f560e0302d3011e521a1072c8a0d69723e8b151f61d33802c02f392d7d Size (snes9x-1.58.tar.gz) = 2830667 bytes SHA1 (patch-unix_configure) = 9df9a805141396583bceb35bea1bda157ed3ed6b +SHA1 (patch-unix_unix.cpp) = 96089e2cc990a1b6bb83b94c3509957f91fd046a Added files: Index: pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp diff -u /dev/null pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp:1.1 --- /dev/null Wed Jan 2 11:25:32 2019 +++ pkgsrc/emulators/snes9x/patches/patch-unix_unix.cpp Wed Jan 2 11:25:32 2019 @@ -0,0 +1,33 @@ +$NetBSD: patch-unix_unix.cpp,v 1.1 2019/01/02 11:25:32 nia Exp $ + +Avoid colliding with libc functions. + +--- unix/unix.cpp.orig 2018-12-16 17:04:59.000000000 +0000 ++++ unix/unix.cpp +@@ -156,7 +156,7 @@ bool S9xDisplayPollButton (uint32, bool + bool S9xDisplayPollAxis (uint32, int16 *); + bool S9xDisplayPollPointer (uint32, int16 *, int16 *); + +-static long log2 (long); ++static long log2l (long); + static void SoundTrigger (void); + static void InitTimer (void); + static void NSRTControllerSetup (void); +@@ -230,7 +230,7 @@ void _makepath (char *path, const char * + } + } + +-static long log2 (long num) ++static long log2l (long num) + { + long n = 0; + +@@ -1324,7 +1324,7 @@ bool8 S9xOpenSoundDevice (void) + return (FALSE); + } + +- J = log2(unixSettings.SoundFragmentSize) | (3 << 16); ++ J = log2l(unixSettings.SoundFragmentSize) | (3 << 16); + if (ioctl(so.sound_fd, SNDCTL_DSP_SETFRAGMENT, &J) == -1) + return (FALSE); + --_----------=_154642833250970--