git: 0b25e08a0d2b - main - x11/nvidia-driver: unbreak the build of nVidia legacy drivers

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0b25e08a0d2b4b5f0022ac26dbd987302a238d9b

commit 0b25e08a0d2b4b5f0022ac26dbd987302a238d9b
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-01-16 08:23:32 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-01-16 08:23:32 +0000

    x11/nvidia-driver: unbreak the build of nVidia legacy drivers
    
    This partially reverts unapproved commit 010b19127cc8.
---
 .../files/patch-src_nvidia_nvidia__os.c            | 34 ----------------------
 x11/nvidia-driver/pkg-message                      | 10 -------
 2 files changed, 44 deletions(-)

diff --git a/x11/nvidia-driver/files/patch-src_nvidia_nvidia__os.c b/x11/nvidia-driver/files/patch-src_nvidia_nvidia__os.c
deleted file mode 100644
index 42ab3ffa2d9d..000000000000
--- a/x11/nvidia-driver/files/patch-src_nvidia_nvidia__os.c
+++ /dev/null
@@ -1,34 +0,0 @@
-- vbe framebuffer mode adjustment that enables switch back and forth to the black terminal
-- from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=213912#c17
-
---- src/nvidia/nvidia_os.c.orig	2022-12-27 22:31:44 UTC
-+++ src/nvidia/nvidia_os.c
-@@ -789,6 +789,28 @@ void NV_API_CALL os_get_screen_info(
-             *pFbPitch = efifb->fb_stride * (bpp / NBBY);
-             return;
-         }
-+
-+        const struct vbe_fb *vbefb =
-+            (const struct vbe_fb *)preload_search_info(kmdp, MODINFO_METADATA |
-+                                                             MODINFOMD_VBE_FB);
-+
-+        /* Make sure base address is mapped to GPU BAR */
-+        if ((vbefb != NULL) &&
-+            ((vbefb->fb_addr == consoleBar1Address) ||
-+             (vbefb->fb_addr == consoleBar2Address)))
-+        {
-+            int depth = fls(vbefb->fb_mask_red | vbefb->fb_mask_green |
-+                            vbefb->fb_mask_blue | vbefb->fb_mask_reserved);
-+            int bpp = roundup2(depth, NBBY);
-+
-+            *pPhysicalAddress = vbefb->fb_addr;
-+            *pFbWidth = vbefb->fb_width;
-+            *pFbHeight = vbefb->fb_height;
-+            *pFbDepth = depth;
-+            /* fb_stride is in pixels. Convert to bytes */
-+            *pFbPitch = vbefb->fb_stride * (bpp / NBBY);
-+            return;
-+        }
-     }
-     {
-         const sc_softc_t *sc = sc_get_softc(0, SC_KERNEL_CONSOLE);
diff --git a/x11/nvidia-driver/pkg-message b/x11/nvidia-driver/pkg-message
deleted file mode 100644
index 3751893d1775..000000000000
--- a/x11/nvidia-driver/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Please add the line
-vbe_max_resolution="720p"
-to /boot/loader.conf to put vt into the vbe framebuffer mode that would
-allow terminals to work simultaneously with graphics.
-EOM
-}
-]