[pkgsrc/trunk]: pkgsrc/emulators/retroarch retroarch: Add some more workaroun...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/abf95de9166b
branches:  trunk
changeset: 334146:abf95de9166b
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun May 19 23:13:03 2019 +0000

description:
retroarch: Add some more workarounds for stuff being broken in NetBSD.

Bump PKGREVISION.

diffstat:

 emulators/retroarch/Makefile   |  8 +++++---
 emulators/retroarch/options.mk |  9 +++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diffs (56 lines):

diff -r 5c66360375a1 -r abf95de9166b emulators/retroarch/Makefile
--- a/emulators/retroarch/Makefile      Sun May 19 09:42:59 2019 +0000
+++ b/emulators/retroarch/Makefile      Sun May 19 23:13:03 2019 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2019/05/18 14:58:53 nia Exp $
+# $NetBSD: Makefile,v 1.24 2019/05/19 23:13:03 nia Exp $
 
 PKGNAME=       retroarch-${RETROARCH_VERSION}
 DISTNAME=      RetroArch-${RETROARCH_VERSION}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libretro/RetroArch/releases/download/v${RETROARCH_VERSION}/}
 EXTRACT_SUFX=  .tar.xz
@@ -43,12 +43,14 @@
 
 .include "../../mk/bsd.fast.prefs.mk"
 
+.if ${OPSYS} == "NetBSD"
 # On exit (load a game first):
 # assertion "pthread__tsd_destructors[key] != NULL" failed:
 # file "/usr/src/lib/libpthread/pthread_tsd.c", line 287, function "pthread_key_delete"
 # [1]   Abort trap (core dumped) retroarch
-.if ${OPSYS} == "NetBSD"
 CONFIGURE_ARGS+=       --disable-thread_storage
+# doesn't work yet
+CONFIGURE_ARGS+=       --disable-kms
 .endif
 
 .include "version.mk"
diff -r 5c66360375a1 -r abf95de9166b emulators/retroarch/options.mk
--- a/emulators/retroarch/options.mk    Sun May 19 09:42:59 2019 +0000
+++ b/emulators/retroarch/options.mk    Sun May 19 23:13:03 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2019/05/08 12:51:54 nia Exp $
+# $NetBSD: options.mk,v 1.11 2019/05/19 23:13:03 nia Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -12,10 +12,15 @@
 PKG_SUPPORTED_OPTIONS+=                udev
 .endif
 
-PKG_SUGGESTED_OPTIONS+=                sdl2 freetype x11
+PKG_SUGGESTED_OPTIONS+=                sdl2 freetype
 PKG_SUGGESTED_OPTIONS.Linux+=  alsa libdrm pulseaudio mbedtls udev
 PKG_SUGGESTED_OPTIONS.NetBSD+= mbedtls
 
+.if ${OPSYS} != "NetBSD" || ${X11_TYPE} == "modular"
+# XXX figure out why the builtin x server crashes on exit
+PKG_SUGGESTED_OPTIONS+=                x11
+.endif
+
 PKG_OPTIONS_OPTIONAL_GROUPS+=  gl
 PKG_OPTIONS_GROUP.gl+=         opengl