CVS commit: pkgsrc/devel/SDL2

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jan  4 01:52:23 UTC 2020

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

Log Message:
SDL2: enable wayland where supported


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.13 -r1.14 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.40 pkgsrc/devel/SDL2/Makefile:1.41
--- pkgsrc/devel/SDL2/Makefile:1.40     Wed Sep 18 14:17:07 2019
+++ pkgsrc/devel/SDL2/Makefile  Sat Jan  4 01:52:23 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2019/09/18 14:17:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2020/01/04 01:52:23 nia Exp $
 
 DISTNAME=      SDL2-2.0.10
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  http://www.libsdl.org/release/
 
@@ -33,7 +33,6 @@ BUILDLINK_TRANSFORM+= rm:-ldl
 CFLAGS+=       -DPREFIX=\"${PREFIX}\"
 
 .include "options.mk"
-
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/libusb.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/devel/SDL2/options.mk
diff -u pkgsrc/devel/SDL2/options.mk:1.13 pkgsrc/devel/SDL2/options.mk:1.14
--- pkgsrc/devel/SDL2/options.mk:1.13   Sun Aug 18 16:16:24 2019
+++ pkgsrc/devel/SDL2/options.mk        Sat Jan  4 01:52:23 2020
@@ -1,16 +1,21 @@
-# $NetBSD: options.mk,v 1.13 2019/08/18 16:16:24 nia Exp $
+# $NetBSD: options.mk,v 1.14 2020/01/04 01:52:23 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.SDL2
 PKG_OPTIONS_REQUIRED_GROUPS=   gl
-PKG_SUPPORTED_OPTIONS=         alsa dbus esound nas oss jack pulseaudio wayland x11
+PKG_SUPPORTED_OPTIONS=         alsa dbus esound nas jack pulseaudio wayland x11
+PKG_SUGGESTED_OPTIONS.Linux=   alsa
 PKG_OPTIONS_GROUP.gl=          opengl
-PKG_SUGGESTED_OPTIONS+=                oss
-PKG_SUGGESTED_OPTIONS.Linux+=  alsa
 
 .if ${OPSYS} != "Darwin"
 PKG_SUGGESTED_OPTIONS+=        x11
 .endif
 
+.include "../../devel/wayland/platform.mk"
+
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+=        wayland
+.endif
+
 .include "../../mk/bsd.fast.prefs.mk"
 
 .if !empty(MACHINE_ARCH:M*arm*)
@@ -60,12 +65,6 @@ CONFIGURE_ARGS+=     --disable-nas
 CONFIGURE_ARGS+=       --disable-video-opengl
 .endif
 
-.if !empty(PKG_OPTIONS:Moss)
-.include "../../mk/oss.buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --disable-oss
-.endif
-
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
 .else