git: 95c12168657a - main - x11-toolkits/wlroots: drop NVIDIA option
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 11 Nov 2022 22:41:40 UTC
The branch main has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=95c12168657aee3dfc9db7e93106d9dc42854e69
commit 95c12168657aee3dfc9db7e93106d9dc42854e69
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2022-06-21 17:02:25 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
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: <<EOM
-Known issues:
-- NVIDIA option (aka wlroots-eglstreams) requires nvidia-drm.ko from nvidia-driver,
- see https://github.com/aritger/eglstreams-kms-example/issues/7
-EOM
-}
-]