From nobody Tue Jun 4 07:19:24 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VthmY1sv1z5Mh4d; Tue, 04 Jun 2024 07:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VthmX6qkfz4sLS; Tue, 4 Jun 2024 07:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717485564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U/wTRd7GI016rggtnbezgCJ2Wn2cnDILMyJqCtcrhKw=; b=wemNNLFXHqpfKkUq1ZwypLr3EGwFMqlTcOXQlYbU4SCB49AfbNNFmpx2y/kJjBjbKcJi4S SxxgOfRFQHTVx1LnCDOGrT3s5wC9dGnZHWNuFOzcN2jBoN50o2KLmc04x+2PJwkMa9LpOC VIsfXF+HageMgOToB/zhlPjn8rRyigXwSKX2FXMSmUf5rmIvd0Qt5Xye8XdHsf/qjJljfb gX6+T5Jjt6zw2mbfd0GZqEk7bt5KrIB9kyV6/uo2/m4T8GILzp78b2+lCVhgVyMQHixP63 YVhLkmNnoN8x5ybBIQCRWQM5Z7AzHO7BaTBZaMWkb4HWVcq7Saewy8BLvvamkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717485564; a=rsa-sha256; cv=none; b=tKtuG5oW6efGbbjefJVORK10qqFdz79xpA+wwmAwZM6y8M6sp6K8wA6ndE5/ELzS/wilBA FVTdPiraORF8vMoYUTOOEC6sxm+daX3BWL5rz4N+TgRYTPokX72dScFYDnzpeXdxu3l9pY F/rPLYvTH27oV/vpkzgj+FHsHgGb89o2xt8VmjW3uCoMrXUST0suQupLb0K4P4tvYrpY2c MnTuHcKxct7qkCZ/DCo/+0GlLeX4MOjOW+Dl9NcqgLrTdnFaX0p6ftMJMjufhP0leSIjgh q+O67iGhuukvnpCBvOgEv91+gLI4w+B1OZFePhwkoU3B1KThOebZtfC8lm81UA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717485564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U/wTRd7GI016rggtnbezgCJ2Wn2cnDILMyJqCtcrhKw=; b=u3ylXHHHWYlEbJ6r76dT0djflBDPh0n6z8aibFmoDb/+ScmxfyiV/1BpfbCPB6uhwMGEWd cvMXdj461wdK8Ie417BrMUTVTPstDXrrF456HiH93Pt4xac+GmRKqcCT3L9n1OEcVdw/Nl Ei0u1TJhVBKnEwIitqj3t/wgc4Bq7A7S8Kfs6D62th5ia29jXkJGWTfevAU0t94pggiUJ+ ZjK30Eea2JQQZIvrSfwqCqzTUbnDpyi2oXFYW5+86QHXM4l/gu/qIvm8tDLEAUMLq/SNLe D0ufoa3V6Rha/kdEbqPTK4f5cpMgrvbJZlxbyGl8Us3EZrgIu9oiyBXL2JxktQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VthmX6Kflz18JQ; Tue, 4 Jun 2024 07:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4547JO55073773; Tue, 4 Jun 2024 07:19:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4547JOVY073770; Tue, 4 Jun 2024 07:19:24 GMT (envelope-from git) Date: Tue, 4 Jun 2024 07:19:24 GMT Message-Id: <202406040719.4547JOVY073770@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 2d64423989c1 - main - x11-toolkits/wlroots016: replace override.mk with upstream fix List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d64423989c17abf95659ea89701aecb56241d33 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d64423989c17abf95659ea89701aecb56241d33 commit 2d64423989c17abf95659ea89701aecb56241d33 Author: Jan Beich AuthorDate: 2024-06-03 13:48:48 +0000 Commit: Jan Beich CommitDate: 2024-06-04 07:18:32 +0000 x11-toolkits/wlroots016: replace override.mk with upstream fix --- x11-toolkits/wlroots016/Makefile | 12 ++- x11-toolkits/wlroots016/distinfo | 8 ++ x11-toolkits/wlroots016/override.mk | 8 -- x11-toolkits/wlroots016/pkg-plist | 205 ++++++++++++++++++------------------ x11-wm/cage/Makefile | 5 +- x11-wm/cage/files/patch-meson.build | 13 +++ 6 files changed, 132 insertions(+), 119 deletions(-) diff --git a/x11-toolkits/wlroots016/Makefile b/x11-toolkits/wlroots016/Makefile index adf428e8d1ac..f5dce3891419 100644 --- a/x11-toolkits/wlroots016/Makefile +++ b/x11-toolkits/wlroots016/Makefile @@ -1,11 +1,16 @@ PORTNAME= wlroots DISTVERSION= 0.16.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits PKGNAMESUFFIX= 016 +PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github +PATCHFILES+= 107f8d4cca76.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4488 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ PATCHFILES+= f3ba14e49133.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3850 +PATCHFILES+= faa631c348d9.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4005 +PATCHFILES+= 822eb07eaca3.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4005 +PATCHFILES+= 4b4f76cc1357.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4614 MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library (deprecated 0.16.* series) @@ -28,12 +33,9 @@ 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=-${DISTVERSION:R} -.ifdef PKGNAMESUFFIX PORTSCOUT= limit:^0\.16\. -PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default -MESON_ARGS+= -Ddatadir="${LOCALBASE}/share" -.endif OPTIONS_DEFINE= DRM OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 diff --git a/x11-toolkits/wlroots016/distinfo b/x11-toolkits/wlroots016/distinfo index 61b20dbbad20..529c4d57f76a 100644 --- a/x11-toolkits/wlroots016/distinfo +++ b/x11-toolkits/wlroots016/distinfo @@ -1,5 +1,13 @@ TIMESTAMP = 1676068199 SHA256 (wlroots-0.16.2.tar.bz2) = afea2cc740344c4e86749cf4908e07692e183cb14a3db854d24dec454c664b88 SIZE (wlroots-0.16.2.tar.bz2) = 437628 +SHA256 (107f8d4cca76.patch) = cf5e96c4677ff544e7ae138a0b57e7d749fd4dc9260f00ed42ba3f23190f5d49 +SIZE (107f8d4cca76.patch) = 1369 SHA256 (f3ba14e49133.patch) = fb61329725f9482eae15100ae46c59159f39abc3324937e92fdf5065155944a9 SIZE (f3ba14e49133.patch) = 1976 +SHA256 (faa631c348d9.patch) = b0a73d15b38655e4af464be3a9ca684f8d72ed724624c1f3f9bdbee894bc2335 +SIZE (faa631c348d9.patch) = 802 +SHA256 (822eb07eaca3.patch) = 2cdf10f6d66bfe1d2f50ebd05cb1fd1157b58859ff059c953cfcef899f01f634 +SIZE (822eb07eaca3.patch) = 609 +SHA256 (4b4f76cc1357.patch) = 163500bf90d39365a6ce8a9d24d48b2e65135d2f548c9532d933ed19b1097d53 +SIZE (4b4f76cc1357.patch) = 2512 diff --git a/x11-toolkits/wlroots016/override.mk b/x11-toolkits/wlroots016/override.mk deleted file mode 100644 index d193e843fa21..000000000000 --- a/x11-toolkits/wlroots016/override.mk +++ /dev/null @@ -1,8 +0,0 @@ -WLR_SUFFIX= 016 -WLR_SOVERSION= 11 - -LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots.so/&.${WLR_SOVERSION}/:S/wlroots$/&${WLR_SUFFIX}/} - -USES+= localbase # -isystem -CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/wlroots${WLR_SUFFIX}/libdata/pkgconfig" -MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/wlroots${WLR_SUFFIX}/libdata/pkgconfig" diff --git a/x11-toolkits/wlroots016/pkg-plist b/x11-toolkits/wlroots016/pkg-plist index 0698d8a43fcb..bda1b70cd74a 100644 --- a/x11-toolkits/wlroots016/pkg-plist +++ b/x11-toolkits/wlroots016/pkg-plist @@ -1,103 +1,102 @@ -include/wlr/backend.h -%%DRM%%include/wlr/backend/drm.h -include/wlr/backend/headless.h -include/wlr/backend/interface.h -%%DRM%%include/wlr/backend/libinput.h -include/wlr/backend/multi.h -include/wlr/backend/session.h -include/wlr/backend/wayland.h -%%X11%%include/wlr/backend/x11.h -include/wlr/config.h -include/wlr/interfaces/wlr_buffer.h -include/wlr/interfaces/wlr_keyboard.h -include/wlr/interfaces/wlr_output.h -include/wlr/interfaces/wlr_pointer.h -include/wlr/interfaces/wlr_switch.h -include/wlr/interfaces/wlr_tablet_pad.h -include/wlr/interfaces/wlr_tablet_tool.h -include/wlr/interfaces/wlr_touch.h -include/wlr/render/allocator.h -include/wlr/render/dmabuf.h -include/wlr/render/drm_format_set.h -%%OPENGL%%include/wlr/render/egl.h -%%OPENGL%%include/wlr/render/gles2.h -include/wlr/render/interface.h -include/wlr/render/pixman.h -%%VULKAN%%include/wlr/render/vulkan.h -include/wlr/render/wlr_renderer.h -include/wlr/render/wlr_texture.h -include/wlr/types/wlr_buffer.h -include/wlr/types/wlr_compositor.h -include/wlr/types/wlr_cursor.h -include/wlr/types/wlr_damage_ring.h -include/wlr/types/wlr_data_control_v1.h -include/wlr/types/wlr_data_device.h -include/wlr/types/wlr_drm.h -%%DRM%%include/wlr/types/wlr_drm_lease_v1.h -include/wlr/types/wlr_export_dmabuf_v1.h -include/wlr/types/wlr_foreign_toplevel_management_v1.h -include/wlr/types/wlr_fullscreen_shell_v1.h -include/wlr/types/wlr_gamma_control_v1.h -include/wlr/types/wlr_idle.h -include/wlr/types/wlr_idle_inhibit_v1.h -include/wlr/types/wlr_idle_notify_v1.h -include/wlr/types/wlr_input_device.h -include/wlr/types/wlr_input_inhibitor.h -include/wlr/types/wlr_input_method_v2.h -include/wlr/types/wlr_keyboard.h -include/wlr/types/wlr_keyboard_group.h -include/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h -include/wlr/types/wlr_layer_shell_v1.h -include/wlr/types/wlr_linux_dmabuf_v1.h -include/wlr/types/wlr_matrix.h -include/wlr/types/wlr_output.h -include/wlr/types/wlr_output_damage.h -include/wlr/types/wlr_output_layout.h -include/wlr/types/wlr_output_management_v1.h -include/wlr/types/wlr_output_power_management_v1.h -include/wlr/types/wlr_pointer.h -include/wlr/types/wlr_pointer_constraints_v1.h -include/wlr/types/wlr_pointer_gestures_v1.h -include/wlr/types/wlr_presentation_time.h -include/wlr/types/wlr_primary_selection.h -include/wlr/types/wlr_primary_selection_v1.h -include/wlr/types/wlr_region.h -include/wlr/types/wlr_relative_pointer_v1.h -include/wlr/types/wlr_scene.h -include/wlr/types/wlr_screencopy_v1.h -include/wlr/types/wlr_seat.h -include/wlr/types/wlr_server_decoration.h -include/wlr/types/wlr_session_lock_v1.h -include/wlr/types/wlr_single_pixel_buffer_v1.h -include/wlr/types/wlr_subcompositor.h -include/wlr/types/wlr_surface.h -include/wlr/types/wlr_switch.h -include/wlr/types/wlr_tablet_pad.h -include/wlr/types/wlr_tablet_tool.h -include/wlr/types/wlr_tablet_v2.h -include/wlr/types/wlr_text_input_v3.h -include/wlr/types/wlr_touch.h -include/wlr/types/wlr_viewporter.h -include/wlr/types/wlr_virtual_keyboard_v1.h -include/wlr/types/wlr_virtual_pointer_v1.h -include/wlr/types/wlr_xcursor_manager.h -include/wlr/types/wlr_xdg_activation_v1.h -include/wlr/types/wlr_xdg_decoration_v1.h -include/wlr/types/wlr_xdg_foreign_registry.h -include/wlr/types/wlr_xdg_foreign_v1.h -include/wlr/types/wlr_xdg_foreign_v2.h -include/wlr/types/wlr_xdg_output_v1.h -include/wlr/types/wlr_xdg_shell.h -include/wlr/util/addon.h -include/wlr/util/box.h -include/wlr/util/edges.h -include/wlr/util/log.h -include/wlr/util/region.h -include/wlr/version.h -include/wlr/xcursor.h -%%X11%%include/wlr/xwayland.h -%%X11%%include/wlr/xwayland/server.h -%%X11%%include/wlr/xwayland/xwayland.h -lib/libwlroots.so -lib/libwlroots.so.11 -libdata/pkgconfig/wlroots.pc +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 +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/pixman.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_cursor.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_foreign_toplevel_management_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.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_inhibitor.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_damage.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_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_server_decoration.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_session_lock_v1.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_surface.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_text_input_v3.h +include/wlroots%%SUFFIX%%/wlr/types/wlr_touch.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/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/xwayland.h +lib/libwlroots%%SUFFIX%%.so +libdata/pkgconfig/wlroots%%SUFFIX%%.pc diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile index 37e4de888633..f0ac5341e4e8 100644 --- a/x11-wm/cage/Makefile +++ b/x11-wm/cage/Makefile @@ -1,7 +1,7 @@ PORTNAME= cage DISTVERSIONPREFIX= v DISTVERSION= 0.1.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.14:graphics/wayland-protocols LIB_DEPENDS= libwayland-server.so:graphics/wayland \ - libwlroots.so:x11-toolkits/wlroots \ + libwlroots-0.16.so:x11-toolkits/wlroots016 \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 meson pkgconfig @@ -42,5 +42,4 @@ post-patch: -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ ${WRKSRC}/meson.build -.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" .include diff --git a/x11-wm/cage/files/patch-meson.build b/x11-wm/cage/files/patch-meson.build new file mode 100644 index 000000000000..59589b895267 --- /dev/null +++ b/x11-wm/cage/files/patch-meson.build @@ -0,0 +1,13 @@ +Run-time dependency wlroots found: NO (tried pkgconfig and cmake) + +--- meson.build.nogit 2023-07-28 14:46:37 UTC ++++ meson.build +@@ -35,7 +35,7 @@ endif + ) + endif + +-wlroots = dependency('wlroots', version: '>= 0.16.0', fallback: ['wlroots', 'wlroots']) ++wlroots = dependency('wlroots-0.16', fallback: ['wlroots', 'wlroots']) + wayland_protos = dependency('wayland-protocols', version: '>=1.14') + wayland_server = dependency('wayland-server') + xkbcommon = dependency('xkbcommon')