pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

wlroots: Add support for x11, xwayland options; cosmetic fixes



Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Thu Jun 4 16:59:35 2020 +0200
Changeset:	0a61b28e08ce3cdb3616e0b9918f4813e19a35fd

Modified Files:
	wlroots/Makefile
	wlroots/PLIST
	wlroots/distinfo
Added Files:
	wlroots/options.mk

Log Message:
wlroots: Add support for x11, xwayland options; cosmetic fixes

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0a61b28e08ce3cdb3616e0b9918f4813e19a35fd

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

diffstat:
 wlroots/Makefile   |  9 +++------
 wlroots/PLIST      |  2 ++
 wlroots/distinfo   |  8 ++++----
 wlroots/options.mk | 21 +++++++++++++++++++++
 4 files changed, 30 insertions(+), 10 deletions(-)

diffs:
diff --git a/wlroots/Makefile b/wlroots/Makefile
index be1087453d..ab0d88ce7f 100644
--- a/wlroots/Makefile
+++ b/wlroots/Makefile
@@ -1,20 +1,17 @@
 # $NetBSD$
 
-GITHUB_PROJECT=	wlroots
-GITHUB_TAG=	0.10.1
-DISTNAME=	0.10.1
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
+DISTNAME=	wlroots-0.10.1
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=swaywm/}
 EXTRACT_SUFX=	.zip
-DIST_SUBDIR=	${GITHUB_PROJECT}
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/swaywm/wlroots/
 COMMENT=	Wayland compositor library
 LICENSE=	mit
 
-WRKSRC=	${WRKDIR}/wlroots-0.10.1
+.include "options.mk"
 
 .include "../../x11/pixman/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"
diff --git a/wlroots/PLIST b/wlroots/PLIST
index 35af6a4db7..81797aa252 100644
--- a/wlroots/PLIST
+++ b/wlroots/PLIST
@@ -85,3 +85,5 @@ lib/libwlroots.so
 lib/libwlroots.so.5
 lib/libwlroots.so.5.9.1
 lib/pkgconfig/wlroots.pc
+${PLIST.x11}include/wlr/backend/x11.h
+${PLIST.xwayland}include/wlr/xwayland.h
diff --git a/wlroots/distinfo b/wlroots/distinfo
index b187fcf3aa..0f1992da43 100644
--- a/wlroots/distinfo
+++ b/wlroots/distinfo
@@ -1,6 +1,6 @@
 $NetBSD$
 
-SHA1 (wlroots/0.10.1.zip) = 8620779843461a123baf9a59d10bbabb9a67234e
-RMD160 (wlroots/0.10.1.zip) = e8068067fcfda47d641390c24606f3a83d25680b
-SHA512 (wlroots/0.10.1.zip) = 7e6c4ada2cf90ca4f1712488bc575656ac57c7efe6c34d0618312d6eca5d913b4c78f64a4b6e7f0bab7a91399bf73d9dcb34934f05c40457a68689d9fefceec7
-Size (wlroots/0.10.1.zip) = 629644 bytes
+SHA1 (wlroots-0.10.1.zip) = 8620779843461a123baf9a59d10bbabb9a67234e
+RMD160 (wlroots-0.10.1.zip) = e8068067fcfda47d641390c24606f3a83d25680b
+SHA512 (wlroots-0.10.1.zip) = 7e6c4ada2cf90ca4f1712488bc575656ac57c7efe6c34d0618312d6eca5d913b4c78f64a4b6e7f0bab7a91399bf73d9dcb34934f05c40457a68689d9fefceec7
+Size (wlroots-0.10.1.zip) = 629644 bytes
diff --git a/wlroots/options.mk b/wlroots/options.mk
new file mode 100644
index 0000000000..4d9dde8997
--- /dev/null
+++ b/wlroots/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD$
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.wlroots
+
+PKG_SUPPORTED_OPTIONS=	x11 xwayland
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=		x11 xwayland
+
+.if empty(PKG_OPTIONS:Mx11)
+MESON_ARGS+=		-Dx11-backend=disabled
+.else
+PLIST.x11=		yes
+.endif
+
+.if empty(PKG_OPTIONS:Mxwayland)
+MESON_ARGS+=		-Dxwayland=disabled
+.else
+PLIST.xwayland=		yes
+.endif


Home | Main Index | Thread Index | Old Index