From nobody Tue Nov 21 17:24:59 2023 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 4SZWTl2M5jz51ypC; Tue, 21 Nov 2023 17:24:59 +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 4SZWTl1wcdz4gXK; Tue, 21 Nov 2023 17:24:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700587499; 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=xhNujktLHqDENvVy8fAbUqklWPjaOho5rvsQdZavL18=; b=x5FLAaEwrPSi5dUquXjHv9bJch/7ZPP5RV/1HIYQOc8Ty0klSssklRGU6Pb+YvMDW4PQKT ATdtC6bQVkExo7mM7WmEksnjucQ8EmXyzjcCQ+BK8GVN+ejy0GszckySHJPVdj1wTwcvDd wHhE1j1J8ZtOioT3ZkeWDF+Gxys6l5AD676THwnd5ZrNiBQTOCg11jNVNSvHV8JS7AYmUg zk03w3PCF0q2XJhzNgBpwQ87HHw9Kq77DQxUkCU6jcccez5TGZsx/VycZ16dYKIEoQwVpt 9f98KNN5eHQYW10VIxllIllvkHszKMk7LA/+hXG+oMviyGeBaYUMkxohC6M6oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700587499; 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=xhNujktLHqDENvVy8fAbUqklWPjaOho5rvsQdZavL18=; b=mdCtyqoXyMILl0g3SxyKjcPVbRfD2dqATxI1sK3ZROBsyTZTla9A69KRvwPZ+QqAhIi8F1 Zq3ln4/dYubjRzTBZghSHA7PbJqeIHYvjEjT1f8y3f+SuOcDCrDa66nRs8Vtaz0sm2wqaK tZaavLisAeb3sXS9o+6s96PwDKWQs6l0D3VkUNVs5HSsTjY8KOe9LNYJ+ibns368cXq5Go /QrA8Rfg3mFC2eysOT6mGPlyAIC2o60du7oM1cn6EXQbnN+UJSjo8jnMLx4h4KCU44fsbJ KPaun0nmbUHSAaxy59pW1yepDBdtvpfKI2Uz2T1+5P3//hbmq7NbhjaY5b5llQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700587499; a=rsa-sha256; cv=none; b=D3S4FPBPuFxF2EZHDZv/GrOj9YNfNyOWQRytiS1I6XC5Fl+UTjJI/po0qAs8pwy4Mer9Gc 3NiofGqrX20snPBwK+Hix8PAuKcymNijEG7oxhzmwa+EeuUyMXkjl5U0NjAItqspwvPasR FZ06LnshU81ihd8GV8cvDk5nZILx/XbaFb0yJ9E0k+C0aH+8/RI0OCgjEMpJWFrB0G8Rd1 adssi5MTBl20VA/s4yWT+8bN8HiCqYM1wwqPp1YSUDYUhgRH3wrDf3/GQzKjIaOtS/90ed nTmYgEkdGI6sK46BUt4JTdaeEgeNgWwW4sf2iFRKxz4XZlQvTu3aRGah0pKpuQ== 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 4SZWTl12SdzkJq; Tue, 21 Nov 2023 17:24:59 +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 3ALHOxr2028139; Tue, 21 Nov 2023 17:24:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ALHOx6O028136; Tue, 21 Nov 2023 17:24:59 GMT (envelope-from git) Date: Tue, 21 Nov 2023 17:24:59 GMT Message-Id: <202311211724.3ALHOx6O028136@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: 1648060ce18e - main - x11-toolkits/wlroots: fork 0.16 into a pinned port 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 1648060ce18e8171e0261ae55dcadb4378e06dce Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1648060ce18e8171e0261ae55dcadb4378e06dce commit 1648060ce18e8171e0261ae55dcadb4378e06dce Author: Jan Beich AuthorDate: 2023-11-21 16:27:37 +0000 Commit: Jan Beich CommitDate: 2023-11-21 17:23:59 +0000 x11-toolkits/wlroots: fork 0.16 into a pinned port Some consumers are ready for 0.17 API but many are not. For smooth transition use non-default PREFIX, so both can be installed together. --- x11-toolkits/Makefile | 1 + x11-toolkits/wlroots016/Makefile | 75 ++++++++++++++++++++++++++ x11-toolkits/wlroots016/distinfo | 9 ++++ x11-toolkits/wlroots016/override.mk | 8 +++ x11-toolkits/wlroots016/pkg-descr | 28 ++++++++++ x11-toolkits/wlroots016/pkg-plist | 103 ++++++++++++++++++++++++++++++++++++ 6 files changed, 224 insertions(+) diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 0126de4b9cfc..52bf0bcd08cf 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -230,6 +230,7 @@ SUBDIR += wlroots SUBDIR += wlroots-devel SUBDIR += wlroots015 + SUBDIR += wlroots016 SUBDIR += wmapp SUBDIR += wxgtk30 SUBDIR += wxgtk32 diff --git a/x11-toolkits/wlroots016/Makefile b/x11-toolkits/wlroots016/Makefile new file mode 100644 index 000000000000..6fea3a011a08 --- /dev/null +++ b/x11-toolkits/wlroots016/Makefile @@ -0,0 +1,75 @@ +PORTNAME= wlroots +DISTVERSION= 0.16.2 +CATEGORIES= x11-toolkits +PKGNAMESUFFIX= 016 + +PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github +PATCHFILES+= fc0854d5f256.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCHFILES+= 29cb694655db.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ +PATCHFILES+= f3ba14e49133.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3850 + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Modular Wayland compositor library (deprecated 0.16.* series) +WWW= https://gitlab.freedesktop.org/wlroots/wlroots + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= wayland-protocols>=1.27:graphics/wayland-protocols +LIB_DEPENDS= libudev.so:devel/libudev-devd \ + libdrm.so:graphics/libdrm \ + libwayland-server.so:graphics/wayland \ + libseat.so:sysutils/seatd \ + 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,} + +.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 +OPTIONS_SUB= yes + +DRM_DESC= KMS console support +DRM_BUILD_DEPENDS= hwdata>0:misc/hwdata +DRM_LIB_DEPENDS= libinput.so:x11/libinput +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-devel>0:x11-servers/xwayland-devel +X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel +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 diff --git a/x11-toolkits/wlroots016/distinfo b/x11-toolkits/wlroots016/distinfo new file mode 100644 index 000000000000..5918d9a27d2e --- /dev/null +++ b/x11-toolkits/wlroots016/distinfo @@ -0,0 +1,9 @@ +TIMESTAMP = 1676068199 +SHA256 (wlroots-0.16.2.tar.bz2) = afea2cc740344c4e86749cf4908e07692e183cb14a3db854d24dec454c664b88 +SIZE (wlroots-0.16.2.tar.bz2) = 437628 +SHA256 (fc0854d5f256.patch) = ceaa947fd7f64b773c61d7a5a4bdcfe85a083a686d4356ff58d3666aa182e2a9 +SIZE (fc0854d5f256.patch) = 6013 +SHA256 (29cb694655db.patch) = ef36e6b7a0bea0b82469c395feac303f50bf940ae651d91370ef052f5d97938c +SIZE (29cb694655db.patch) = 4233 +SHA256 (f3ba14e49133.patch) = fb61329725f9482eae15100ae46c59159f39abc3324937e92fdf5065155944a9 +SIZE (f3ba14e49133.patch) = 1976 diff --git a/x11-toolkits/wlroots016/override.mk b/x11-toolkits/wlroots016/override.mk new file mode 100644 index 000000000000..443008a3c69d --- /dev/null +++ b/x11-toolkits/wlroots016/override.mk @@ -0,0 +1,8 @@ +WLR_SUFFIX= 016 + +BUILD_DEPENDS:= ${BUILD_DEPENDS:S/wlroots/&${WLR_SUFFIX}/g} +LIB_DEPENDS:= ${LIB_DEPENDS: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-descr b/x11-toolkits/wlroots016/pkg-descr new file mode 100644 index 000000000000..6daf6a788b68 --- /dev/null +++ b/x11-toolkits/wlroots016/pkg-descr @@ -0,0 +1,28 @@ +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/wlroots016/pkg-plist b/x11-toolkits/wlroots016/pkg-plist new file mode 100644 index 000000000000..0698d8a43fcb --- /dev/null +++ b/x11-toolkits/wlroots016/pkg-plist @@ -0,0 +1,103 @@ +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