git: 50bae2203980 - main - graphics/nvidia-drm-{515,61}-kmod: Build fix stable/14
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 29 Sep 2024 09:45:35 UTC
The branch main has been updated by kbowling:
URL: https://cgit.FreeBSD.org/ports/commit/?id=50bae2203980aacc742dbf1f69bcb5ead7bad4eb
commit 50bae2203980aacc742dbf1f69bcb5ead7bad4eb
Author: Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
AuthorDate: 2024-09-29 09:44:25 +0000
Commit: Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2024-09-29 09:44:25 +0000
graphics/nvidia-drm-{515,61}-kmod: Build fix stable/14
---
graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h | 2 +-
graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h
index 6809b4bfdfc0..2c0524341c4d 100644
--- a/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h
+++ b/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h
@@ -4,7 +4,7 @@
/* For nv_drm_gem_prime_force_fence_signal */
#ifndef spin_is_locked
-+#if __FreeBSD_version < 1500018
++#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
#define spin_is_locked(lock) mtx_owned(lock.m)
+#else
+#define spin_is_locked(lock) mtx_owned(lock)
diff --git a/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h
index 6809b4bfdfc0..2c0524341c4d 100644
--- a/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h
+++ b/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h
@@ -4,7 +4,7 @@
/* For nv_drm_gem_prime_force_fence_signal */
#ifndef spin_is_locked
-+#if __FreeBSD_version < 1500018
++#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
#define spin_is_locked(lock) mtx_owned(lock.m)
+#else
+#define spin_is_locked(lock) mtx_owned(lock)