Received: by mail.netbsd.org (Postfix, from userid 605) id 0CE7384D4C; Mon, 20 May 2019 12:42:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 86D4884D3B for ; Mon, 20 May 2019 12:42:41 +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 L4hpa-JY8j_s for ; Mon, 20 May 2019 12:42:41 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id F00AC84D36 for ; Mon, 20 May 2019 12:42:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EA0D8FBF5; Mon, 20 May 2019 12:42:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155835616042880" MIME-Version: 1.0 Date: Mon, 20 May 2019 12:42:40 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/emulators/retroarch To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20190520124240.EA0D8FBF5@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. --_----------=_155835616042880 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Mon May 20 12:42:40 UTC 2019 Modified Files: pkgsrc/emulators/retroarch: Makefile distinfo Added Files: pkgsrc/emulators/retroarch/patches: patch-libretro-common_features_features__cpu.c Log Message: retroarch: Use clock_gettime on BSD. Should unbreak architectures where there is no dirty __asm__ fallback. Possibly fixes something when the TSC is an unreliable time source. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/emulators/retroarch/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/emulators/retroarch/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/emulators/retroarch/patches/patch-libretro-common_features_features__cpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_155835616042880 Content-Disposition: inline Content-Length: 3018 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/retroarch/Makefile diff -u pkgsrc/emulators/retroarch/Makefile:1.24 pkgsrc/emulators/retroarch/Makefile:1.25 --- pkgsrc/emulators/retroarch/Makefile:1.24 Sun May 19 23:13:03 2019 +++ pkgsrc/emulators/retroarch/Makefile Mon May 20 12:42:40 2019 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2019/05/19 23:13:03 nia Exp $ +# $NetBSD: Makefile,v 1.25 2019/05/20 12:42:40 nia Exp $ PKGNAME= retroarch-${RETROARCH_VERSION} DISTNAME= RetroArch-${RETROARCH_VERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/RetroArch/releases/download/v${RETROARCH_VERSION}/} EXTRACT_SUFX= .tar.xz Index: pkgsrc/emulators/retroarch/distinfo diff -u pkgsrc/emulators/retroarch/distinfo:1.14 pkgsrc/emulators/retroarch/distinfo:1.15 --- pkgsrc/emulators/retroarch/distinfo:1.14 Sat May 18 14:58:53 2019 +++ pkgsrc/emulators/retroarch/distinfo Mon May 20 12:42:40 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2019/05/18 14:58:53 nia Exp $ +$NetBSD: distinfo,v 1.15 2019/05/20 12:42:40 nia Exp $ SHA1 (RetroArch-1.7.7.tar.xz) = 32288d3cc23319280c80968e9f0446e00f24db19 RMD160 (RetroArch-1.7.7.tar.xz) = e019c8a6486706e076878adc0510178e5c8d5d81 @@ -9,4 +9,5 @@ SHA1 (patch-audio_drivers_audioio.c) = 5 SHA1 (patch-configuration.c) = 58873db839f8f0ed2e011d4c4c75b00e6293c239 SHA1 (patch-frontend_drivers_platform__unix.c) = e81ba53af2bdd4cecc4007cc9556f06446bf3b3f SHA1 (patch-input_include_xfree86__keycodes.h) = cd3b59122e9075a96fccb01bce2110dfa9cc160e +SHA1 (patch-libretro-common_features_features__cpu.c) = da4a66b16ef7ca194443a65e4efb8887e6d9bc3e SHA1 (patch-qb_config.libs.sh) = 0ec6ab7d49cdcd59c5938276517df1ee0212868e Added files: Index: pkgsrc/emulators/retroarch/patches/patch-libretro-common_features_features__cpu.c diff -u /dev/null pkgsrc/emulators/retroarch/patches/patch-libretro-common_features_features__cpu.c:1.1 --- /dev/null Mon May 20 12:42:40 2019 +++ pkgsrc/emulators/retroarch/patches/patch-libretro-common_features_features__cpu.c Mon May 20 12:42:40 2019 @@ -0,0 +1,23 @@ +$NetBSD: patch-libretro-common_features_features__cpu.c,v 1.1 2019/05/20 12:42:40 nia Exp $ + +Use clock_gettime on BSD. + +--- libretro-common/features/features_cpu.c.orig 2019-05-08 06:06:23.000000000 +0000 ++++ libretro-common/features/features_cpu.c +@@ -26,6 +26,7 @@ + #if defined(_WIN32) + #include + #else ++#define _POSIX_C_SOURCE 200112 + #include + #endif + +@@ -167,7 +168,7 @@ retro_perf_tick_t cpu_features_get_perf_ + tv_sec = (long)((ularge.QuadPart - epoch) / 10000000L); + tv_usec = (long)(system_time.wMilliseconds * 1000); + time_ticks = (1000000 * tv_sec + tv_usec); +-#elif defined(__linux__) || defined(__QNX__) || defined(__MACH__) ++#elif defined(__linux__) || defined(BSD) || defined(__QNX__) || defined(__MACH__) + struct timespec tv = {0}; + if (ra_clock_gettime(CLOCK_MONOTONIC, &tv) == 0) + time_ticks = (retro_perf_tick_t)tv.tv_sec * 1000000000 + --_----------=_155835616042880--