git: 94e72d3fea12 - main - x11-toolkits/wlroots-hyprland: remove after 8a07c7eca273

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Mon, 12 Aug 2024 00:56:45 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=94e72d3fea1231ca2f9f4a270475648612e19f00

commit 94e72d3fea1231ca2f9f4a270475648612e19f00
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-08-12 00:54:38 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-08-12 00:54:38 +0000

    x11-toolkits/wlroots-hyprland: remove after 8a07c7eca273
---
 MOVED                                            |   1 +
 x11-toolkits/Makefile                            |   1 -
 x11-toolkits/wlroots-hyprland/Makefile           |  83 -----------------
 x11-toolkits/wlroots-hyprland/distinfo           |  13 ---
 x11-toolkits/wlroots-hyprland/files/patch-suffix |  20 ----
 x11-toolkits/wlroots-hyprland/pkg-descr          |  28 ------
 x11-toolkits/wlroots-hyprland/pkg-plist          | 112 -----------------------
 7 files changed, 1 insertion(+), 257 deletions(-)

diff --git a/MOVED b/MOVED
index a11513dd72bf..1f29bb221434 100644
--- a/MOVED
+++ b/MOVED
@@ -3429,3 +3429,4 @@ net/ns3||2024-08-07|Has expired: Outdated and unmaintained for years
 games/manaplus||2024-08-07|Has expired: Fails to build with libxml2 2.13.2 (PR 279705)
 dns/knot3-lib|dns/knot3|2024-08-09|Superseded by knot3 which provides the libraries
 devel/py-ollama|misc/py-ollama|2024-08-10|Deduplicate
+x11-toolkits/wlroots-hyprland||2024-08-11|Discontinued: use x11-toolkits/aquamarine instead
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index d19ca278a99f..c0e23bd3e892 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -247,7 +247,6 @@
     SUBDIR += vte
     SUBDIR += vte3
     SUBDIR += wlroots
-    SUBDIR += wlroots-hyprland
     SUBDIR += wlroots015
     SUBDIR += wlroots016
     SUBDIR += wlroots017
diff --git a/x11-toolkits/wlroots-hyprland/Makefile b/x11-toolkits/wlroots-hyprland/Makefile
deleted file mode 100644
index 4b413fbe911d..000000000000
--- a/x11-toolkits/wlroots-hyprland/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-PORTNAME=	wlroots
-DISTVERSION=	0.17.0-312
-DISTVERSIONSUFFIX=	-gb1b34cd665
-PORTREVISION=	2
-CATEGORIES=	x11-toolkits
-PKGNAMESUFFIX=	-hyprland
-
-PATCH_SITES+=	https://github.com/hyprwm/wlroots-hyprland/raw/422207db/patches/:hyprland
-PATCHFILES+=	surface-nondivisible-by-scale.patch:-p1:hyprland
-PATCHFILES+=	nvidia-hardware-cursors.patch:-p1:hyprland
-PATCHFILES+=	displaylink.patch:-p1:hyprland
-PATCH_SITES+=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
-PATCHFILES+=	6e6c4408d36d.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4697
-PATCHFILES+=	4b4f76cc1357.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4614
-
-MAINTAINER=	jbeich@FreeBSD.org
-COMMENT=	Modular Wayland compositor library (Hyprland fork)
-WWW=		https://github.com/hyprwm/wlroots-hyprland
-
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	Project discontinued, use x11-toolkits/aquamarine instead
-
-BUILD_DEPENDS=	wayland-protocols>=1.33:graphics/wayland-protocols
-LIB_DEPENDS=	libdrm.so:graphics/libdrm \
-		libwayland-server.so:graphics/wayland \
-		libxkbcommon.so:x11/libxkbcommon
-
-USES=		compiler:c11 gl meson pkgconfig xorg
-USE_GITLAB=	yes
-USE_GL=		gbm
-USE_XORG=	pixman
-USE_LDCONFIG=	yes
-GL_SITE=	https://gitlab.freedesktop.org
-MESON_ARGS=	-Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,}
-PLIST_SUB=	SUFFIX=${PKGNAMESUFFIX}
-
-PORTSCOUT=	ignore:1
-
-OPTIONS_DEFINE=	DRM OPENGL VULKAN X11
-OPTIONS_DEFAULT=DRM OPENGL VULKAN X11
-OPTIONS_EXCLUDE=VULKAN # not supported by Hyprland due to custom renderer
-OPTIONS_SUB=	yes
-
-DRM_DESC=		KMS console support
-DRM_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
-			hwdata>0:misc/hwdata
-DRM_LIB_DEPENDS=	libudev.so:devel/libudev-devd \
-			libliftoff.so:graphics/libliftoff \
-			libdisplay-info.so:sysutils/libdisplay-info \
-			libseat.so:sysutils/seatd \
-			libinput.so:x11/libinput
-DRM_MESON_ENABLED=	session
-DRM_VARS=		BACKENDS+="drm libinput"
-
-OPENGL_RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri
-OPENGL_USE=		GL=egl,glesv2
-OPENGL_VARS=		RENDERERS+=gles2
-
-VULKAN_DESC=		Vulkan renderer
-VULKAN_BUILD_DEPENDS=	glslangValidator:graphics/glslang \
-			vulkan-headers>0:graphics/vulkan-headers
-VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
-VULKAN_RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri
-VULKAN_VARS=		RENDERERS+=vulkan
-
-X11_LIB_DEPENDS=	libxcb-errors.so:x11/xcb-util-errors \
-			libxcb-render-util.so:x11/xcb-util-renderutil \
-			libxcb-icccm.so:x11/xcb-util-wm
-X11_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
-			Xwayland:x11-servers/xwayland
-X11_RUN_DEPENDS=	Xwayland:x11-servers/xwayland
-X11_USE=		XORG=xcb
-X11_MESON_ENABLED=	xwayland
-X11_VARS=		BACKENDS+=x11
-
-post-patch:
-# Extract (snapshot) version from the port instead of meson.build
-	@${REINPLACE_CMD} "/STR/s/meson.project_version()/'${DISTVERSIONFULL}'/" \
-		${WRKSRC}/include/wlr/meson.build
-
-.include <bsd.port.mk>
diff --git a/x11-toolkits/wlroots-hyprland/distinfo b/x11-toolkits/wlroots-hyprland/distinfo
deleted file mode 100644
index aa3a9583cf6e..000000000000
--- a/x11-toolkits/wlroots-hyprland/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-TIMESTAMP = 1712827443
-SHA256 (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = e9eb70ecddce0030b26b595d368cee15559febe1b8121de6bc6d5ec8bf95ccef
-SIZE (wlroots-0.17.0-312-gb1b34cd665.tar.bz2) = 458003
-SHA256 (surface-nondivisible-by-scale.patch) = e9b9f9a537090627ea4fac0b5a101d8ffedf2b399465889b225c694645b4c173
-SIZE (surface-nondivisible-by-scale.patch) = 1778
-SHA256 (nvidia-hardware-cursors.patch) = ed4720310d61068b24ebd4a30767556cb7590acfd5c66c95d7408a0c95539dbc
-SIZE (nvidia-hardware-cursors.patch) = 12545
-SHA256 (displaylink.patch) = 09962127457096da327efafb80cd06f49cab56afffa5bc4743306be1f7e7c12e
-SIZE (displaylink.patch) = 1080
-SHA256 (6e6c4408d36d.patch) = 0614c9800e12135cdb5c3187c792ead73b0d6a1ab24263aedac6f0faf4a52384
-SIZE (6e6c4408d36d.patch) = 1675
-SHA256 (4b4f76cc1357.patch) = 163500bf90d39365a6ce8a9d24d48b2e65135d2f548c9532d933ed19b1097d53
-SIZE (4b4f76cc1357.patch) = 2512
diff --git a/x11-toolkits/wlroots-hyprland/files/patch-suffix b/x11-toolkits/wlroots-hyprland/files/patch-suffix
deleted file mode 100644
index 0c97d0509768..000000000000
--- a/x11-toolkits/wlroots-hyprland/files/patch-suffix
+++ /dev/null
@@ -1,20 +0,0 @@
-Rename to avoid conflict with regular wlroots package
-
---- meson.build.orig	2024-04-11 09:24:03 UTC
-+++ meson.build
-@@ -1,5 +1,5 @@ project(
- project(
--	'wlroots',
-+	'wlroots-hyprland',
- 	'c',
- 	version: '0.18.0-dev',
- 	license: 'MIT',
-@@ -14,7 +14,7 @@ version_minor = version.split('.')[1]
- version = meson.project_version().split('-')[0]
- version_major = version.split('.')[0]
- version_minor = version.split('.')[1]
--versioned_name = '@0@-@1@.@2@'.format(meson.project_name(), version_major, version_minor)
-+versioned_name = '@0@'.format(meson.project_name())
- 
- little_endian = target_machine.endian() == 'little'
- big_endian = target_machine.endian() == 'big'
diff --git a/x11-toolkits/wlroots-hyprland/pkg-descr b/x11-toolkits/wlroots-hyprland/pkg-descr
deleted file mode 100644
index 6daf6a788b68..000000000000
--- a/x11-toolkits/wlroots-hyprland/pkg-descr
+++ /dev/null
@@ -1,28 +0,0 @@
-Pluggable, composable, unopinionated modules for building a Wayland
-compositor; or about 60,000 lines of code you were going to write anyway.
-
-- wlroots provides backends that abstract the underlying display and input
-  hardware, including KMS/DRM, libinput, Wayland, X11, and headless backends,
-  plus any custom backends you choose to write, which can all be created or
-  destroyed at runtime and used in concert with each other.
-- wlroots provides unopinionated, mostly standalone implementations of many
-  Wayland interfaces, both from wayland.xml and various protocol extensions.
-  We also promote the standardization of portable extensions across
-  many compositors.
-- wlroots provides several powerful, standalone, and optional tools that
-  implement components common to many compositors, such as the arrangement of
-  outputs in physical space.
-- wlroots provides an Xwayland abstraction that allows you to have excellent
-  Xwayland support without worrying about writing your own X11 window manager
-  on top of writing your compositor.
-- wlroots provides a renderer abstraction that simple compositors can use to
-  avoid writing GL code directly, but which steps out of the way when your
-  needs demand custom rendering code.
-
-wlroots implements a huge variety of Wayland compositor features and implements
-them *right*, so you can focus on the features that make your compositor
-unique. By using wlroots, you get high performance, excellent hardware
-compatibility, broad support for many wayland interfaces, and comfortable
-development tools - or any subset of these features you like, because all of
-them work independently of one another and freely compose with anything you want
-to implement yourself.
diff --git a/x11-toolkits/wlroots-hyprland/pkg-plist b/x11-toolkits/wlroots-hyprland/pkg-plist
deleted file mode 100644
index 9ce4c4bbb657..000000000000
--- a/x11-toolkits/wlroots-hyprland/pkg-plist
+++ /dev/null
@@ -1,112 +0,0 @@
-include/wlroots%%SUFFIX%%/wlr/backend.h
-%%DRM%%include/wlroots%%SUFFIX%%/wlr/backend/drm.h
-include/wlroots%%SUFFIX%%/wlr/backend/headless.h
-include/wlroots%%SUFFIX%%/wlr/backend/interface.h
-%%DRM%%include/wlroots%%SUFFIX%%/wlr/backend/libinput.h
-include/wlroots%%SUFFIX%%/wlr/backend/multi.h
-%%DRM%%include/wlroots%%SUFFIX%%/wlr/backend/session.h
-include/wlroots%%SUFFIX%%/wlr/backend/wayland.h
-%%X11%%include/wlroots%%SUFFIX%%/wlr/backend/x11.h
-include/wlroots%%SUFFIX%%/wlr/config.h
-include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_buffer.h
-include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_keyboard.h
-include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_output.h
-include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_pointer.h
-include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_switch.h
-include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_tablet_pad.h
-include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_tablet_tool.h
-include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_touch.h
-include/wlroots%%SUFFIX%%/wlr/render/allocator.h
-include/wlroots%%SUFFIX%%/wlr/render/dmabuf.h
-include/wlroots%%SUFFIX%%/wlr/render/drm_format_set.h
-%%OPENGL%%include/wlroots%%SUFFIX%%/wlr/render/egl.h
-%%OPENGL%%include/wlroots%%SUFFIX%%/wlr/render/gles2.h
-include/wlroots%%SUFFIX%%/wlr/render/interface.h
-include/wlroots%%SUFFIX%%/wlr/render/pass.h
-include/wlroots%%SUFFIX%%/wlr/render/pixman.h
-include/wlroots%%SUFFIX%%/wlr/render/swapchain.h
-%%VULKAN%%include/wlroots%%SUFFIX%%/wlr/render/vulkan.h
-include/wlroots%%SUFFIX%%/wlr/render/wlr_renderer.h
-include/wlroots%%SUFFIX%%/wlr/render/wlr_texture.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_buffer.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_compositor.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_content_type_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_cursor.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_cursor_shape_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_damage_ring.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_data_control_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_data_device.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_drm.h
-%%DRM%%include/wlroots%%SUFFIX%%/wlr/types/wlr_drm_lease_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_export_dmabuf_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_ext_foreign_toplevel_list_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_foreign_toplevel_management_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_fractional_scale_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_fullscreen_shell_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_gamma_control_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_idle_inhibit_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_idle_notify_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_input_device.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_input_method_v2.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_keyboard.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_keyboard_group.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_layer_shell_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_linux_dmabuf_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_matrix.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_output.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_output_layer.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_output_layout.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_output_management_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_output_power_management_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_output_swapchain_manager.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_pointer.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_pointer_constraints_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_pointer_gestures_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_presentation_time.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_primary_selection.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_primary_selection_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_region.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_relative_pointer_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_scene.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_screencopy_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_seat.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_security_context_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_server_decoration.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_session_lock_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_shm.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_single_pixel_buffer_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_subcompositor.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_switch.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_tablet_pad.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_tablet_tool.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_tablet_v2.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_tearing_control_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_text_input_v3.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_touch.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_transient_seat_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_viewporter.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_virtual_keyboard_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_virtual_pointer_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_xcursor_manager.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_activation_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_decoration_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_foreign_registry.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_foreign_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_foreign_v2.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_output_v1.h
-include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_shell.h
-include/wlroots%%SUFFIX%%/wlr/util/addon.h
-include/wlroots%%SUFFIX%%/wlr/util/box.h
-include/wlroots%%SUFFIX%%/wlr/util/edges.h
-include/wlroots%%SUFFIX%%/wlr/util/log.h
-include/wlroots%%SUFFIX%%/wlr/util/region.h
-include/wlroots%%SUFFIX%%/wlr/util/transform.h
-include/wlroots%%SUFFIX%%/wlr/version.h
-include/wlroots%%SUFFIX%%/wlr/xcursor.h
-%%X11%%include/wlroots%%SUFFIX%%/wlr/xwayland.h
-%%X11%%include/wlroots%%SUFFIX%%/wlr/xwayland/server.h
-%%X11%%include/wlroots%%SUFFIX%%/wlr/xwayland/shell.h
-%%X11%%include/wlroots%%SUFFIX%%/wlr/xwayland/xwayland.h
-lib/libwlroots%%SUFFIX%%.so
-libdata/pkgconfig/wlroots%%SUFFIX%%.pc