pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/SDL2 SDL2: enable wayland where supported
details: https://anonhg.NetBSD.org/pkgsrc/rev/e8e385a6a5ea
branches: trunk
changeset: 346843:e8e385a6a5ea
user: nia <nia%pkgsrc.org@localhost>
date: Sat Jan 04 01:52:23 2020 +0000
description:
SDL2: enable wayland where supported
diffstat:
devel/SDL2/Makefile | 5 ++---
devel/SDL2/options.mk | 19 +++++++++----------
2 files changed, 11 insertions(+), 13 deletions(-)
diffs (63 lines):
diff -r 83ac84d411a9 -r e8e385a6a5ea devel/SDL2/Makefile
--- a/devel/SDL2/Makefile Sat Jan 04 01:50:32 2020 +0000
+++ b/devel/SDL2/Makefile Sat Jan 04 01:52:23 2020 +0000
@@ -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 @@
CFLAGS+= -DPREFIX=\"${PREFIX}\"
.include "options.mk"
-
.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/libusb.buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
diff -r 83ac84d411a9 -r e8e385a6a5ea devel/SDL2/options.mk
--- a/devel/SDL2/options.mk Sat Jan 04 01:50:32 2020 +0000
+++ b/devel/SDL2/options.mk Sat Jan 04 01:52:23 2020 +0000
@@ -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-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
Home |
Main Index |
Thread Index |
Old Index