From nobody Fri Nov 11 22:41:37 2022 X-Original-To: dev-commits-ports-main@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 4N8DGB1pJNz4YSsr; Fri, 11 Nov 2022 22:41:38 +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 4N8DGB0SZGz3KXH; Fri, 11 Nov 2022 22:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206498; 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=0ta9LWr+IqvjdtytSdmLUiRWmRIbZDnbp9KrWTv9EII=; b=KTyhIxY2Lu+bMTx2pR14wWe5IIb9scoPDJw5U6QIgaZ2KYytMRsYfewBv6F7nmnZ18y1q0 kgJlmS3MzPrjTgSI3PvedAXvjlX0P/MtfhNBueM+SuaxL8g2xl7KZdnlrDvV19ynAC0WJG Sib0/hDs0XCkh0MQo2oSCJ6gobskyuX7kb812BzS/X5NT2aot35s7mgMtTzxgsotBJBdHF F7R8Mra5rc1PQDAGbAPFZScKwGYIScrGN7RZxPaykgNf+vgM/H4NPxijk+9zvYJRGhEPc2 DoXfrXiOYpAfRBafCMHn8k2Cyph9sJQNXE3f11EJey1DpjkPtf90e+UQwuxpiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206498; 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=0ta9LWr+IqvjdtytSdmLUiRWmRIbZDnbp9KrWTv9EII=; b=BDfNluz5WA2hE4euKFSqJ5TFwsXvru2X9i1bzQSLCphVJsOhu3lmwTgyTki75N5xpkeW31 buxRLCZqgb//4OAoXRxsD/VjBP7qLERLFLHV5sg6G/crMj5u9s4/0/iJF6GeiShlK5Jf8v 8k020cGTEu3yvY2ZLnYmc8OBL7Uov63Gd40U+Xa59fwMkS/nY1/uigepiPctCpJKPekoTg eBCN8AUjaXCw2bv8RIRg/ntaNPeJrnCEInvD1TxY/bS/P2JzIVfXU4ErZ/hFlq0w2Biswg 543jWWoNSi6Iui06U0FDK7C0fZ60e+Rw+ybofiHjIgqwUxYg8WpXgj94PZAdYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668206498; a=rsa-sha256; cv=none; b=XZpToyB5sOPIyb2lwi03F4JiQ1rlo+VST6vrSMHMv9zujHcwWTHQGpFgjL8555YxBNggxK br4uKsZ13eT4F4jL9U8sD+YuP0/NTWgxJ4zpVdIPrTW6UF4xv0OVMyaKIyKKYLlRTLttQl tHQluPWlMYnZYTRURU+asQQQKHYsIwP5bU6rE/RZHMXpoPa+sLyqAg9Ph7XKWEEdas+RAS nid76bddoYcJyWFW7C80+maKUunuq+ULHU3k/lycagmz5Bii/hG43lhaWhu+HYQ4BZHqrz FzSAuxBIudxjoKM/eOQB83RlpBTeaChTrk++7IK+u8etV81/JwDO8QjJ5SykpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4N8DG96g4cz10d2; Fri, 11 Nov 2022 22:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2ABMfbTU059347; Fri, 11 Nov 2022 22:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABMfb2n059346; Fri, 11 Nov 2022 22:41:37 GMT (envelope-from git) Date: Fri, 11 Nov 2022 22:41:37 GMT Message-Id: <202211112241.2ABMfb2n059346@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: c717faa5c764 - main - x11-toolkits/wlroots: fork 0.15 into a pinned port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: c717faa5c764af20fbd12ec544b9b81dc4f97b56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=c717faa5c764af20fbd12ec544b9b81dc4f97b56 commit c717faa5c764af20fbd12ec544b9b81dc4f97b56 Author: Jan Beich AuthorDate: 2022-03-23 13:08:41 +0000 Commit: Jan Beich CommitDate: 2022-11-11 22:39:54 +0000 x11-toolkits/wlroots: fork 0.15 into a pinned port Some consumers are ready for 0.16 API but many are not. For smooth transition use non-default PREFIX, so both can be installed together. --- x11-toolkits/Makefile | 1 + x11-toolkits/wlroots015/Makefile | 84 ++++++++++++++++++++++++++++++++ x11-toolkits/wlroots015/distinfo | 11 +++++ x11-toolkits/wlroots015/override.mk | 8 +++ x11-toolkits/wlroots015/pkg-descr | 28 +++++++++++ x11-toolkits/wlroots015/pkg-message | 9 ++++ x11-toolkits/wlroots015/pkg-plist | 97 +++++++++++++++++++++++++++++++++++++ 7 files changed, 238 insertions(+) diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index ec65532eed9e..0da1553ee8a9 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -226,6 +226,7 @@ SUBDIR += vte3 SUBDIR += wlroots SUBDIR += wlroots-devel + SUBDIR += wlroots015 SUBDIR += wmapp SUBDIR += wxgtk28 SUBDIR += wxgtk28-common diff --git a/x11-toolkits/wlroots015/Makefile b/x11-toolkits/wlroots015/Makefile new file mode 100644 index 000000000000..c625c7f399eb --- /dev/null +++ b/x11-toolkits/wlroots015/Makefile @@ -0,0 +1,84 @@ +PORTNAME= wlroots +DISTVERSION= 0.15.1 +DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} +CATEGORIES= x11-toolkits +PKGNAMESUFFIX= 015 + +PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github +PATCHFILES+= 7c0e2a271a4c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCHFILES+= 55a8d225cf8c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 +PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ +PATCHFILES+= 347b32642fb6.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3318 + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Modular Wayland compositor library (deprecated 0.15.* series) +WWW= https://gitlab.freedesktop.org/wlroots/wlroots + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= wayland-protocols>=1.24: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 +GL_COMMIT= 29938b74251e826f3778f6bf9c54974a30488cc1 +MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} + +.ifdef PKGNAMESUFFIX +PORTSCOUT= limit:^0\.15\. +PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default +MESON_ARGS+= -Ddatadir="${LOCALBASE}/share" +.endif + +OPTIONS_DEFINE= DRM NVIDIA OPENGL VULKAN X11 +OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 +OPTIONS_SUB= yes + +DRM_DESC= KMS console support +DRM_LIB_DEPENDS= libinput.so:x11/libinput +DRM_VARS= BACKENDS+="drm libinput" + +NVIDIA_DESC= EGLStreams support for DRM backend (experimental) +NVIDIA_PATCH_SITES= https://github.com/danvd/${GL_PROJECT}-eglstreams/commit/:nvidia +NVIDIA_PATCHFILES= c0fc017207f0.patch:-p1:nvidia # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2769 +NVIDIA_IMPLIES= DRM OPENGL X11 +.if make(makesum) +.MAKEFLAGS: WITH+=NVIDIA +.endif + +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/wlroots015/distinfo b/x11-toolkits/wlroots015/distinfo new file mode 100644 index 000000000000..de04adb00a97 --- /dev/null +++ b/x11-toolkits/wlroots015/distinfo @@ -0,0 +1,11 @@ +TIMESTAMP = 1643923194 +SHA256 (wlroots-wlroots-29938b74251e826f3778f6bf9c54974a30488cc1_GL0.tar.gz) = 7d3bc1ee9851354a76632de5d0428a3b9583f43ee3e3194f7be616f404f8eae1 +SIZE (wlroots-wlroots-29938b74251e826f3778f6bf9c54974a30488cc1_GL0.tar.gz) = 566013 +SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e +SIZE (7c0e2a271a4c.patch) = 5729 +SHA256 (55a8d225cf8c.patch) = f9df98540fdabe35c61ed828f6d64633aab72edf0ba1c7ad0849594f10383ce7 +SIZE (55a8d225cf8c.patch) = 4209 +SHA256 (347b32642fb6.patch) = 56804ce34cd02cb3b2b11a0dbf27c2820c2c0d112f351cdaed5d160e0536d418 +SIZE (347b32642fb6.patch) = 3810 +SHA256 (c0fc017207f0.patch) = bdafef91a067cc95d9b47f5a837e400b641d9479393136818c34f5eb6b846d71 +SIZE (c0fc017207f0.patch) = 108229 diff --git a/x11-toolkits/wlroots015/override.mk b/x11-toolkits/wlroots015/override.mk new file mode 100644 index 000000000000..556e497fa9e2 --- /dev/null +++ b/x11-toolkits/wlroots015/override.mk @@ -0,0 +1,8 @@ +WLR_SUFFIX= 015 + +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/wlroots015/pkg-descr b/x11-toolkits/wlroots015/pkg-descr new file mode 100644 index 000000000000..6daf6a788b68 --- /dev/null +++ b/x11-toolkits/wlroots015/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/wlroots015/pkg-message b/x11-toolkits/wlroots015/pkg-message new file mode 100644 index 000000000000..59db8a7fadd8 --- /dev/null +++ b/x11-toolkits/wlroots015/pkg-message @@ -0,0 +1,9 @@ +[ +{ type: install + message: <