diff options
| author | nia <nia@pkgsrc.org> | 2020-06-09 19:36:52 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-06-09 19:36:52 +0000 |
| commit | f6c5faba0f95ff43f22df48598f9ce1aa9fb3a9e (patch) | |
| tree | 54b9f243e00fda8ee2fa5900f0f0639df09e6789 | |
| parent | 8c88d6ebf939c9fe42c423c49afac95a65e56c69 (diff) | |
| download | pkgsrc-f6c5faba0f95ff43f22df48598f9ce1aa9fb3a9e.tar.gz | |
SDL2: don't assume ARM is rpi
| -rw-r--r-- | devel/SDL2/Makefile | 4 | ||||
| -rw-r--r-- | devel/SDL2/options.mk | 16 |
2 files changed, 8 insertions, 12 deletions
diff --git a/devel/SDL2/Makefile b/devel/SDL2/Makefile index 9c7ed541730..e8af3a66f7a 100644 --- a/devel/SDL2/Makefile +++ b/devel/SDL2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.50 2020/04/16 04:12:39 nia Exp $ +# $NetBSD: Makefile,v 1.51 2020/06/09 19:36:52 nia Exp $ DISTNAME= SDL2-2.0.12 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= devel MASTER_SITES= https://www.libsdl.org/release/ diff --git a/devel/SDL2/options.mk b/devel/SDL2/options.mk index 56917d305fe..80caa49409f 100644 --- a/devel/SDL2/options.mk +++ b/devel/SDL2/options.mk @@ -1,13 +1,18 @@ -# $NetBSD: options.mk,v 1.17 2020/03/30 10:18:48 nia Exp $ +# $NetBSD: options.mk,v 1.18 2020/06/09 19:36:52 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.SDL2 PKG_OPTIONS_REQUIRED_GROUPS= gl PKG_SUPPORTED_OPTIONS= alsa dbus nas jack pulseaudio wayland x11 PKG_SUGGESTED_OPTIONS.Linux= alsa PKG_OPTIONS_GROUP.gl= opengl +PKG_SUGGESTED_OPTIONS+= opengl .include "../../mk/bsd.fast.prefs.mk" +.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:Mearm*) +PKG_OPTIONS_GROUP.gl+= rpi +.endif + .if ${OPSYS} != "Darwin" PKG_SUGGESTED_OPTIONS+= x11 .endif @@ -18,15 +23,6 @@ PKG_SUGGESTED_OPTIONS+= x11 PKG_SUGGESTED_OPTIONS+= wayland .endif -.include "../../mk/bsd.fast.prefs.mk" - -.if !empty(MACHINE_ARCH:M*arm*) -PKG_OPTIONS_GROUP.gl+= rpi -PKG_SUGGESTED_OPTIONS+= rpi -.else -PKG_SUGGESTED_OPTIONS+= opengl -.endif - .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Malsa) |