x11-wm/gamescope: back to system wlroots after 2af7805da5

This reverts commit fb9677dec3.

x11-wm/gamescope/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	gamescope
 DISTVERSION=	3.10.1
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -18,7 +19,7 @@ BUILD_DEPENDS=	glslangValidator:graphics/glslang \
 		evdev-proto>0:devel/evdev-proto \
 		vulkan-headers>0:graphics/vulkan-headers \
 		wayland-protocols>=1.17:graphics/wayland-protocols \
-		wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots
+		wlroots>=0.14.0.1<0.16.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 		libdrm.so:graphics/libdrm \
 		libvulkan.so:graphics/vulkan-loader \
@@ -35,6 +36,7 @@ GH_ACCOUNT=	Plagman
 GH_TUPLE=	nothings:stb:af1a5bc:stb/subprojects/stb
 GL_TUPLE=	https://gitlab.freedesktop.org:emersion:libliftoff:2e1dd93b60224e77f6a49ad8fb36d184e3a9a3bc:libliftoff/subprojects/libliftoff
 PLIST_FILES=	bin/${PORTNAME}
+MESON_ARGS=	--force-fallback-for=libliftoff # allow system wlroots
 
 OPTIONS_DEFINE=	PIPEWIRE
 OPTIONS_DEFAULT=PIPEWIRE
@@ -47,5 +49,4 @@ post-extract:
 # Merge patch_directory for subprojects without meson.build
 	@(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..)
 
-.include "${.CURDIR}/Makefile.wlroots"
 .include <bsd.port.mk>

x11-wm/gamescope/Makefile.wlroots

@@ -1,16 +0,0 @@
-# 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
-USES+=		gl
-USE_GL+=	gbm egl
-USE_XORG+=	pixman xcb
-GL_TUPLE+=	https://gitlab.freedesktop.org:wlroots:wlroots:3e801d68f2c6c64567b1f24c6d03893f32c81197:wlroots/subprojects/wlroots
-PLIST_FILES+=	"@comment libdata/pkgconfig/wlroots.pc"

x11-wm/gamescope/files/patch-private-wlroots

@@ -1,35 +0,0 @@
-wlroots 0.13.0 is out-of-date and has no other consumers. Keep it
-private to gamescope package for now.
-
---- subprojects/wlroots/include/meson.build.orig	2021-04-07 19:19:31 UTC
-+++ subprojects/wlroots/include/meson.build
-@@ -17,7 +17,9 @@ if not features.get('xdg-foreign')
- 	]
- endif
- 
-+if not meson.is_subproject()
- install_subdir('wlr',
- 	install_dir: get_option('includedir'),
- 	exclude_files: exclude_files,
- )
-+endif
---- subprojects/wlroots/include/wlr/meson.build.orig	2021-04-07 19:19:31 UTC
-+++ subprojects/wlroots/include/wlr/meson.build
-@@ -21,4 +21,6 @@ ver_h = configure_file(
- 	configuration: version_data,
- )
- 
-+if not meson.is_subproject()
- install_headers(conf_h, ver_h, subdir: 'wlr')
-+endif
---- subprojects/wlroots/meson.build.orig	2021-04-07 19:19:31 UTC
-+++ subprojects/wlroots/meson.build
-@@ -153,7 +153,7 @@ lib_wlr = library(
- 	soversion: soversion,
- 	dependencies: wlr_deps,
- 	include_directories: [wlr_inc, proto_inc],
--	install: true,
-+	install: not meson.is_subproject(),
- 	link_args: symbols_flag,
- 	link_depends: symbols_file,
- )

x11-wm/gamescope/files/patch-wlroots-0.15

@@ -0,0 +1,29 @@
+https://github.com/Plagman/gamescope/issues/316
+
+../src/wlserver.cpp:26:10: fatal error: 'wlr/backend/noop.h' file not found
+#include <wlr/backend/noop.h>
+         ^~~~~~~~~~~~~~~~~~~~
+
+--- src/wlserver.cpp.orig	2021-10-18 03:17:30 UTC
++++ src/wlserver.cpp
+@@ -23,7 +23,6 @@ extern "C" {
+ #include <wlr/backend/headless.h>
+ #include <wlr/backend/multi.h>
+ #include <wlr/backend/libinput.h>
+-#include <wlr/backend/noop.h>
+ #include <wlr/interfaces/wlr_input_device.h>
+ #include <wlr/interfaces/wlr_keyboard.h>
+ #include <wlr/render/wlr_renderer.h>
+@@ -642,10 +641,10 @@ bool wlserver_init( void ) {
+ 
+ 	wl_signal_add( &wlserver.wlr.multi_backend->events.new_input, &new_input_listener );
+ 
+-	wlserver.wlr.noop_backend = wlr_noop_backend_create( wlserver.display );
++	wlserver.wlr.noop_backend = wlr_headless_backend_create( wlserver.display );
+ 	wlr_multi_backend_add( wlserver.wlr.multi_backend, wlserver.wlr.noop_backend );
+ 
+-	wlserver.wlr.output = wlr_noop_add_output( wlserver.wlr.noop_backend );
++	wlserver.wlr.output = wlr_headless_add_output( wlserver.wlr.noop_backend, 800, 600 );
+ 
+ 	if ( bIsDRM == True )
+ 	{