Skip to content

Commit 9dbef72

Browse files
committed
retroarch: Add some more workarounds for stuff being broken in NetBSD.
Bump PKGREVISION.
1 parent bede391 commit 9dbef72

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

emulators/retroarch/Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# $NetBSD: Makefile,v 1.23 2019/05/18 14:58:53 nia Exp $
1+
# $NetBSD: Makefile,v 1.24 2019/05/19 23:13:03 nia Exp $
22

33
PKGNAME= retroarch-${RETROARCH_VERSION}
44
DISTNAME= RetroArch-${RETROARCH_VERSION}
5-
PKGREVISION= 3
5+
PKGREVISION= 4
66
CATEGORIES= emulators
77
MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/RetroArch/releases/download/v${RETROARCH_VERSION}/}
88
EXTRACT_SUFX= .tar.xz
@@ -43,12 +43,14 @@ LDFLAGS.SunOS+= -lsocket -lnsl
4343

4444
.include "../../mk/bsd.fast.prefs.mk"
4545

46+
.if ${OPSYS} == "NetBSD"
4647
# On exit (load a game first):
4748
# assertion "pthread__tsd_destructors[key] != NULL" failed:
4849
# file "/usr/src/lib/libpthread/pthread_tsd.c", line 287, function "pthread_key_delete"
4950
# [1] Abort trap (core dumped) retroarch
50-
.if ${OPSYS} == "NetBSD"
5151
CONFIGURE_ARGS+= --disable-thread_storage
52+
# doesn't work yet
53+
CONFIGURE_ARGS+= --disable-kms
5254
.endif
5355

5456
.include "version.mk"

emulators/retroarch/options.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: options.mk,v 1.10 2019/05/08 12:51:54 nia Exp $
1+
# $NetBSD: options.mk,v 1.11 2019/05/19 23:13:03 nia Exp $
22

33
.include "../../mk/bsd.fast.prefs.mk"
44

@@ -12,10 +12,15 @@ PKG_SUPPORTED_OPTIONS+= alsa jack openal pulseaudio
1212
PKG_SUPPORTED_OPTIONS+= udev
1313
.endif
1414

15-
PKG_SUGGESTED_OPTIONS+= sdl2 freetype x11
15+
PKG_SUGGESTED_OPTIONS+= sdl2 freetype
1616
PKG_SUGGESTED_OPTIONS.Linux+= alsa libdrm pulseaudio mbedtls udev
1717
PKG_SUGGESTED_OPTIONS.NetBSD+= mbedtls
1818

19+
.if ${OPSYS} != "NetBSD" || ${X11_TYPE} == "modular"
20+
# XXX figure out why the builtin x server crashes on exit
21+
PKG_SUGGESTED_OPTIONS+= x11
22+
.endif
23+
1924
PKG_OPTIONS_OPTIONAL_GROUPS+= gl
2025
PKG_OPTIONS_GROUP.gl+= opengl
2126

0 commit comments

Comments
 (0)