CVS commit: pkgsrc/devel/SDL2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun  9 19:36:52 UTC 2020

Modified Files:
        pkgsrc/devel/SDL2: Makefile options.mk

Log Message:
SDL2: don't assume ARM is rpi


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/devel/SDL2/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/SDL2/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.50 pkgsrc/devel/SDL2/Makefile:1.51
--- pkgsrc/devel/SDL2/Makefile:1.50     Thu Apr 16 04:12:39 2020
+++ pkgsrc/devel/SDL2/Makefile  Tue Jun  9 19:36:52 2020
@@ -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/
 

Index: pkgsrc/devel/SDL2/options.mk
diff -u pkgsrc/devel/SDL2/options.mk:1.17 pkgsrc/devel/SDL2/options.mk:1.18
--- pkgsrc/devel/SDL2/options.mk:1.17   Mon Mar 30 10:18:48 2020
+++ pkgsrc/devel/SDL2/options.mk        Tue Jun  9 19:36:52 2020
@@ -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)