git: 6a652e5d2639 - main - x11-wm/{gamescope, phoc}: split bundled wlroots changes

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6a652e5d2639d0567d783474cbc726de015e43bb

commit 6a652e5d2639d0567d783474cbc726de015e43bb
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-09-06 03:22:09 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-09-06 03:31:08 +0000

    x11-wm/{gamescope,phoc}: split bundled wlroots changes
    
    Move wlroots-specific changes into a separate Makefile to prevent
    confusion which dependencies are safe to modify.
---
 x11-wm/gamescope/Makefile         | 17 +----------------
 x11-wm/gamescope/Makefile.wlroots | 15 +++++++++++++++
 x11-wm/phoc/Makefile              | 15 +--------------
 x11-wm/phoc/Makefile.wlroots      | 13 +++++++++++++
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile
index a191056fbc41..7acb4bf79a9e 100644
--- a/x11-wm/gamescope/Makefile
+++ b/x11-wm/gamescope/Makefile
@@ -43,20 +43,5 @@ PIPEWIRE_DESC=		Screen capture via PipeWire
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_MESON_ENABLED=	pipewire
 
-# https://github.com/Plagman/gamescope/pull/202
-BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*} \
-		xwayland-devel>0:x11-servers/xwayland-devel
-LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
-		libudev.so:devel/libudev-devd \
-		libseat.so:sysutils/seatd \
-		libinput.so:x11/libinput \
-		libxcb-errors.so:x11/xcb-util-errors \
-		libxcb-render-util.so:x11/xcb-util-renderutil \
-		libxcb-icccm.so:x11/xcb-util-wm
-RUN_DEPENDS+=	xwayland-devel>0:x11-servers/xwayland-devel
-USE_XORG+=	pixman xcb
-USE_GL+=	gbm egl
-GH_TUPLE+=	swaywm:wlroots:0.13.0:wlroots/subprojects/wlroots
-PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"
-
+.include "${.CURDIR}/Makefile.wlroots"
 .include <bsd.port.mk>
diff --git a/x11-wm/gamescope/Makefile.wlroots b/x11-wm/gamescope/Makefile.wlroots
new file mode 100644
index 000000000000..e7292ab2271e
--- /dev/null
+++ b/x11-wm/gamescope/Makefile.wlroots
@@ -0,0 +1,15 @@
+# https://github.com/Plagman/gamescope/pull/202
+BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*} \
+		xwayland-devel>0:x11-servers/xwayland-devel
+LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
+		libudev.so:devel/libudev-devd \
+		libseat.so:sysutils/seatd \
+		libinput.so:x11/libinput \
+		libxcb-errors.so:x11/xcb-util-errors \
+		libxcb-render-util.so:x11/xcb-util-renderutil \
+		libxcb-icccm.so:x11/xcb-util-wm
+RUN_DEPENDS+=	xwayland-devel>0:x11-servers/xwayland-devel
+USE_XORG+=	pixman xcb
+USE_GL+=	gbm egl
+GH_TUPLE+=	swaywm:wlroots:0.13.0:wlroots/subprojects/wlroots
+PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"
diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile
index 431a952276d7..6410d99810d0 100644
--- a/x11-wm/phoc/Makefile
+++ b/x11-wm/phoc/Makefile
@@ -31,18 +31,5 @@ CFLAGS+=	-Wno-error=format-nonliteral # clang
 PLIST_FILES=	bin/${PORTNAME}
 GLIB_SCHEMAS=	sm.puri.phoc.gschema.xml
 
-# https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
-BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*}
-LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
-		libudev.so:devel/libudev-devd \
-		libdrm.so:graphics/libdrm \
-		libseat.so:sysutils/seatd \
-		libxcb-errors.so:x11/xcb-util-errors \
-		libxcb-icccm.so:x11/xcb-util-wm
-RUN_DEPENDS+=	xwayland-devel>0:x11-servers/xwayland-devel
-USE_XORG+=	x11
-USE_GL+=	gbm egl
-GL_TUPLE+=	https://source.puri.sm:Librem5:wlroots:b2fd6d8dd88d67ee48be67f5be4ee614a5826b13:wlroots/subprojects/wlroots
-PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"
-
+.include "${.CURDIR}/Makefile.wlroots"
 .include <bsd.port.mk>
diff --git a/x11-wm/phoc/Makefile.wlroots b/x11-wm/phoc/Makefile.wlroots
new file mode 100644
index 000000000000..d5a00a9f86cd
--- /dev/null
+++ b/x11-wm/phoc/Makefile.wlroots
@@ -0,0 +1,13 @@
+# https://gitlab.gnome.org/World/Phosh/phoc/-/merge_requests/241
+BUILD_DEPENDS:=	${BUILD_DEPENDS:N*wlroots*}
+LIB_DEPENDS:=	${LIB_DEPENDS:N*wlroots*} \
+		libudev.so:devel/libudev-devd \
+		libdrm.so:graphics/libdrm \
+		libseat.so:sysutils/seatd \
+		libxcb-errors.so:x11/xcb-util-errors \
+		libxcb-icccm.so:x11/xcb-util-wm
+RUN_DEPENDS+=	xwayland-devel>0:x11-servers/xwayland-devel
+USE_XORG+=	x11
+USE_GL+=	gbm egl
+GL_TUPLE+=	https://source.puri.sm:Librem5:wlroots:b2fd6d8dd88d67ee48be67f5be4ee614a5826b13:wlroots/subprojects/wlroots
+PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"