From nobody Fri Nov 11 22:41:40 2022 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 4N8DGD3vzmz4YTCY; Fri, 11 Nov 2022 22:41:40 +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 4N8DGD2RBGz3Kph; Fri, 11 Nov 2022 22:41:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206500; 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=5mq4VCcxhhluqUl/dFwCbVuduUB8jbP0XhVYGpfBvlU=; b=FtV/OImeCHo3oLOFMfoy4mvEmJikezQm/y3I9GzHik6DVzG5DQ2O14FkDgqDqYcEX26orT mRUJ2Gqe/x9XjOSg2DJXzVZml6Ox0Az1N+7sdy3vZTFwqyrizj7XglHG89WRoy20r/H9uA PJ2S0Bp6G9EEFCmqHQXSkeSRl3Glsm+KA9MjgL+wD1OtjhqABvVP8ueK9rGJwnyEec/k4K zEIAjq332jJW9K2zGEXnDPR/oOxME7fm+chVy0w1p3fX+BBi5I2ZUkN1Gfu8dWNM/Ekyf6 ZdHrcBOgT/e0a8b0zdhhyOsd+w3OL4cFOyAcH8AUW6a9jXMXrmKJW5OxD+s29g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668206500; 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=5mq4VCcxhhluqUl/dFwCbVuduUB8jbP0XhVYGpfBvlU=; b=V+dXNQU+t0q5DSQnvivJjppFEQN/+9/QMT3b3bwTgirPyb49zyyk4/d4HkIKHNL7/wm//N 2viS/vyqaAh31J0FYq6tyj6ghZPNrWdMM7Z04hl7uaKZtFxCzhxYsHQBvynhdB1tnqp9fS SRJdeb0EIjXmiSQ58qZD7kIjAMO7oU8FcoA5jGKolek/DiOtDbYcOZJjM5POmc3avnz59e Ey21W1zLMWa1XCIHo9yA1YEfKNg0kYQwCBCPsfXmWLfWLLpotHh9ocS4mpcu9wADnU66Ks 52Yw8tqVQlJ22oZkYetAovwONQSMgaAs97PN6nlTC9LWLgzTubcpP1jmqeadOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668206500; a=rsa-sha256; cv=none; b=x+CzQ2RSuVDswiWcyU0yhKB2flKsEAfHmyQCCWgqwkK5/XdE4gRKhUzXQP7AzFRyi+l3H3 l2aVldf9FoiEv1ZTJUoDDfy/N+QDdqfUDvfGstsYMD1+r93nwcNfcWulueCYsRZak68EUz SbsZmoqXZB0iT1/WadgcyVisxMn7bOMJ5OKjwlg1465itEVvKSdG4qhKdNvJ22R7RzMSzv WgOrs7d/kvRl+e2LpBXAA9xU6GnGXQJUpQ3U/tbjiBhjMhQv+JTqZkBevkn9jHy2nCriKH BiQPUS3eTZHVJHKUrqad7Kpn2m+wmxj68pKWP2GPSUq9h9Liaw1998T1i862pg== 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 4N8DGD1DDnz10km; Fri, 11 Nov 2022 22:41:40 +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 2ABMfeBw059395; Fri, 11 Nov 2022 22:41:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ABMfeFw059394; Fri, 11 Nov 2022 22:41:40 GMT (envelope-from git) Date: Fri, 11 Nov 2022 22:41:40 GMT Message-Id: <202211112241.2ABMfeFw059394@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: 95c12168657a - main - x11-toolkits/wlroots: drop NVIDIA option 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: 95c12168657aee3dfc9db7e93106d9dc42854e69 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=95c12168657aee3dfc9db7e93106d9dc42854e69 commit 95c12168657aee3dfc9db7e93106d9dc42854e69 Author: Jan Beich AuthorDate: 2022-06-21 17:02:25 +0000 Commit: Jan Beich CommitDate: 2022-11-11 22:39:55 +0000 x11-toolkits/wlroots: drop NVIDIA option Needs rebase for 0.16.0 but abandoned by the author. Also obsoleted by GBM support in nvidia-driver >= 495. This reverts commit f406592a8e37f2c889ea0a2966cdd9cc751f7c8c. --- x11-toolkits/wlroots/Makefile | 11 +---------- x11-toolkits/wlroots/distinfo | 2 -- x11-toolkits/wlroots/pkg-message | 9 --------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 997c19b70ce9..f5035eb99f0a 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -34,7 +34,7 @@ GL_SITE= https://gitlab.freedesktop.org GL_COMMIT= 1712a7d27444d62f8da8eeedf0840b386a810e96 MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} -OPTIONS_DEFINE= DRM NVIDIA OPENGL VULKAN X11 +OPTIONS_DEFINE= DRM OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 OPTIONS_SUB= yes @@ -42,15 +42,6 @@ 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= 5bde12a6dbf4.patch:-p1:nvidia # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2769 -NVIDIA_IMPLIES= DRM OPENGL X11 -NVIDIA_BROKEN= fails to patch -.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 diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index 8312c7f2366b..042eeb775e55 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -7,5 +7,3 @@ SHA256 (29cb694655db.patch) = ef36e6b7a0bea0b82469c395feac303f50bf940ae651d91370 SIZE (29cb694655db.patch) = 4233 SHA256 (91a8ff42d26e.patch) = 5c48b35841a3614fe589d8f31323deceaf6be2209b9350a128315cdfc6c95d2c SIZE (91a8ff42d26e.patch) = 3659 -SHA256 (5bde12a6dbf4.patch) = 5bec2c114d6f5bb8cece6c8fe681d6c30b05c625b130dea50122a91212ea846a -SIZE (5bde12a6dbf4.patch) = 110451 diff --git a/x11-toolkits/wlroots/pkg-message b/x11-toolkits/wlroots/pkg-message deleted file mode 100644 index 59db8a7fadd8..000000000000 --- a/x11-toolkits/wlroots/pkg-message +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: <