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

Bump PKGREVISION.
NetBSD · May 19, 2019 · 9dbef72 · 9dbef72
1 parent bede391
commit 9dbef72
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/emulators/retroarch/Makefile b/emulators/retroarch/Makefile
@@ -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 @@ LDFLAGS.SunOS+=	-lsocket -lnsl
 
 .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 --git a/emulators/retroarch/options.mk b/emulators/retroarch/options.mk
@@ -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+=		alsa jack openal pulseaudio
 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