View | Details | Raw Unified | Return to bug 282312 | Differences between
and this patch

Collapse All | Expand All

(-)b/graphics/nvidia-drm-510-kmod/distinfo (-3 / +3 lines)
Lines 1-5 Link Here
1 
TIMESTAMP = 1727593803
 1 
TIMESTAMP = 1729779540
2 
SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e
 2 
SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
3 
SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952
 3 
SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
4 
SHA256 (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = dbdff8ad8cad8152d1c286b058f1f5114b3672f1a936e13933ce52915b77eaaa
 4 
SHA256 (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = dbdff8ad8cad8152d1c286b058f1f5114b3672f1a936e13933ce52915b77eaaa
5 
SIZE (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = 20095338
 5 
SIZE (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = 20095338
(-)b/graphics/nvidia-drm-510-kmod/files/extra-patch-nvidia-drm-conftest.h (+14 lines)
Line 0 Link Here
1 
--- nvidia-drm-conftest.h.orig	2024-02-22 01:03:15 UTC
2 
+++ nvidia-drm-conftest.h
3 
@@ -85,7 +85,11 @@
4
5 
 /* For nv_drm_gem_prime_force_fence_signal */
6 
 #ifndef spin_is_locked
7 
+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
8 
 #define spin_is_locked(lock) mtx_owned(lock.m)
9 
+#else
10 
+#define spin_is_locked(lock) mtx_owned(lock)
11 
+#endif
12 
 #endif
13
14 
 #ifndef rwsem_is_locked
(-)b/graphics/nvidia-drm-515-kmod/distinfo (-2 / +2 lines)
Lines 1-5 Link Here
1 
TIMESTAMP = 1729926280
 1 
TIMESTAMP = 1729926280
2 
SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e
 2 
SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
3 
SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952
 3 
SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
4 
SHA256 (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = b48e104c3437ac6e8a58e734fe943281f43b31d9327d50457bb26d8a2106bf64
 4 
SHA256 (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = b48e104c3437ac6e8a58e734fe943281f43b31d9327d50457bb26d8a2106bf64
5 
SIZE (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = 26098489
 5 
SIZE (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = 26098489
(-)b/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h (-14 lines)
Lines 1-14 Link Here
1 
--- nvidia-drm-conftest.h.orig	2024-02-22 01:03:15 UTC
2 
+++ nvidia-drm-conftest.h
3 
@@ -85,7 +85,11 @@
4
5 
 /* For nv_drm_gem_prime_force_fence_signal */
6 
 #ifndef spin_is_locked
7 
+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
8 
 #define spin_is_locked(lock) mtx_owned(lock.m)
9 
+#else
10 
+#define spin_is_locked(lock) mtx_owned(lock)
11 
+#endif
12 
 #endif
13
14 
 #ifndef rwsem_is_locked
(-)b/graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-conftest.h (+14 lines)
Line 0 Link Here
1 
--- nvidia-drm-conftest.h.orig	2024-02-22 01:03:15 UTC
2 
+++ nvidia-drm-conftest.h
3 
@@ -85,7 +85,11 @@
4
5 
 /* For nv_drm_gem_prime_force_fence_signal */
6 
 #ifndef spin_is_locked
7 
+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
8 
 #define spin_is_locked(lock) mtx_owned(lock.m)
9 
+#else
10 
+#define spin_is_locked(lock) mtx_owned(lock)
11 
+#endif
12 
 #endif
13
14 
 #ifndef rwsem_is_locked
(-)b/graphics/nvidia-drm-61-kmod/distinfo (-2 / +2 lines)
Lines 1-5 Link Here
1 
TIMESTAMP = 1729926563
 1 
TIMESTAMP = 1729926563
2 
SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e
 2 
SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3
3 
SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952
 3 
SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432
4 
SHA256 (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 0c28dc918dc16a103ac93ec8f7521145115e24f7c462595ce4433e1769708122
 4 
SHA256 (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 0c28dc918dc16a103ac93ec8f7521145115e24f7c462595ce4433e1769708122
5 
SIZE (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 37101285
 5 
SIZE (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 37101285
(-)b/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h (-14 lines)
Lines 1-14 Link Here
1 
--- nvidia-drm-conftest.h.orig	2024-02-22 01:03:15 UTC
2 
+++ nvidia-drm-conftest.h
3 
@@ -85,7 +85,11 @@
4
5 
 /* For nv_drm_gem_prime_force_fence_signal */
6 
 #ifndef spin_is_locked
7 
+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
8 
 #define spin_is_locked(lock) mtx_owned(lock.m)
9 
+#else
10 
+#define spin_is_locked(lock) mtx_owned(lock)
11 
+#endif
12 
 #endif
13
14 
 #ifndef rwsem_is_locked
(-)b/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-conftest.h (+14 lines)
Line 0 Link Here
1 
--- nvidia-drm-conftest.h.orig	2024-02-22 01:03:15 UTC
2 
+++ nvidia-drm-conftest.h
3 
@@ -85,7 +85,11 @@
4
5 
 /* For nv_drm_gem_prime_force_fence_signal */
6 
 #ifndef spin_is_locked
7 
+#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501)
8 
 #define spin_is_locked(lock) mtx_owned(lock.m)
9 
+#else
10 
+#define spin_is_locked(lock) mtx_owned(lock)
11 
+#endif
12 
 #endif
13
14 
 #ifndef rwsem_is_locked
(-)b/graphics/nvidia-drm-kmod/Makefile.common (+4 lines)
Lines 30-35 MAKE_ENV+= DEBUG_FLAGS=${DEBUG_FLAGS} \ Link Here
30 
WRKSRC=		${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/
 30 
WRKSRC=		${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/
31 
WRKSRC_SUBDIR=	src/nvidia-drm/
 31 
WRKSRC_SUBDIR=	src/nvidia-drm/
32 

          32
          

        

            

              
              
              33
              
.if ${NVVERSION} < 565.00000

            

            

              34
              
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-conftest.h

            

            

              35
              
.endif #565.00

            

            

              36
              

            

        

          33
          
.if ${NVVERSION} < 555.04202

          37
          
.if ${NVVERSION} < 555.04202

        

        

          34
          
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c

          38
          
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c

        

        

          35
          
.endif

          39
          
.endif

        



(-)b/x11/linux-nvidia-libs/Makefile
      (-3 / +12 lines)




  

    
      
            Lines 129-135
          LINUX32_LIBS+=	libnvidia-compiler.so.${PORTVERSION}
      
      
        Link Here
      
    
  

        

          129
          
.endif

          129
          
.endif

        

        

          130
          

          130
          

        

        

          131
          

          131
          

        

          
            

              132
              
.if ${NVVERSION} >= 550.00000 # 550.00


              132
              
.if ${NVVERSION} >= 565.00000 # 565.00

            

            

              
              

              133
              
LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.17

            

            


              134
              
LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.17 libnvidia-egl-wayland.so.1

            

            


              135
              
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.17/'

            

            


              136
              
.elif ${NVVERSION} >= 550.00000 # 550.00

            

        

          133
          
LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.13

          137
          
LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.13

        

        

          134
          
LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.13 libnvidia-egl-wayland.so.1

          138
          
LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.13 libnvidia-egl-wayland.so.1

        

        

          135
          
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.13/'

          139
          
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.13/'

        

  

    
      
            Lines 290-296
          LINUX32_LIBS+=  libnvidia-gpucomp.so.${PORTVERSION}
      
      
        Link Here
      
    
  

        

          290
          
.else

          294
          
.else

        

        

          291
          
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-gpucomp\.so,d'

          295
          
PLIST_RE+=	'\,${LINUXBASE}.*libnvidia-gpucomp\.so,d'

        

        

          292
          
.endif # 545.00

          296
          
.endif # 545.00

        

          
            

              293
              
.if ${NVVERSION} >= 550.00000 # 550.00


              297
              
.if ${NVVERSION} >= 560.00000 # 560.00

            

            

              
              

              298
              
LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.2

            

            


              299
              
LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \

            

            


              300
              
		libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so

            

            


              301
              
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.2/'

            

            


              302
              
.elif ${NVVERSION} >= 550.00000 # 550.00

            

        

          294
          
LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.1

          303
          
LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.1

        

        

          295
          
LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so.1 \

          304
          
LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so.1 \

        

        

          296
          
		libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so

          305
          
		libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so

        

  

    
      
            Lines 300-306
          LINUX_LIBS+=	libnvidia-egl-gbm.so.1.1.0
      
      
        Link Here
      
    
  

        

          300
          
LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \

          309
          
LINUX_LINKS+=	libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \

        

        

          301
          
		libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so

          310
          
		libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so

        

        

          302
          
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.0/'

          311
          
PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.0/'

        

          
            

              303
              
.endif # 550.00


              312
              
.endif # 560.00

            

        

          304
          
.if ${NVVERSION} >= 525.08902 # 525.89.02

          313
          
.if ${NVVERSION} >= 525.08902 # 525.89.02

        

        

          305
          
LINUX_LIBS+=	libnvoptix.so.${PORTVERSION} \

          314
          
LINUX_LIBS+=	libnvoptix.so.${PORTVERSION} \

        

        

          306
          
		libnvidia-nvvm.so.${PORTVERSION} \

          315
          
		libnvidia-nvvm.so.${PORTVERSION} \

        



(-)b/x11/linux-nvidia-libs/distinfo
      (-3 / +3 lines)




  

    
      
            Lines 1-6
          
      
      
        Link Here
      
    
  

          
            

              1
              
TIMESTAMP = 1727593735


              1
              
TIMESTAMP = 1729779155

            

            

              2
              
SHA256 (NVIDIA-Linux-x86_64-550.120.run) = 801928274753ccce7627098ea078cc37070ddae04de3aa084591c05fc7035697


              2
              
SHA256 (NVIDIA-Linux-x86_64-550.127.05.run) = d384f34f5d2a896bd7536d3deb6a6d973d8094a3ad485a1c2ee3bf5192086ae9

            

            

              3
              
SIZE (NVIDIA-Linux-x86_64-550.120.run) = 307064664


              3
              
SIZE (NVIDIA-Linux-x86_64-550.127.05.run) = 307139930

            

        

          4
          
SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640

          4
          
SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640

        

        

          5
          
SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700

          5
          
SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700

        

        

          6
          
SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c

          6
          
SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c

        



(-)b/x11/nvidia-driver/Makefile.version
      (-1 / +1 lines)




  

    
      
            Lines 1-4
          
      
      
        Link Here
      
    
  

        

          1
          
# NVIDIA Distversion

          1
          
# NVIDIA Distversion

        

        

          2
          
#

          2
          
#

        

        

          3
          
# This will be included from x11/nvidia-driver and the nvidia-drm port

          3
          
# This will be included from x11/nvidia-driver and the nvidia-drm port

        

          
            

              4
              
NVIDIA_DISTVERSION = 550.120


              4
              
NVIDIA_DISTVERSION = 550.127.05

            



(-)b/x11/nvidia-driver/distinfo
      (-3 / +3 lines)




  

    
      
            Lines 1-6
          
      
      
        Link Here
      
    
  

          
            

              1
              
TIMESTAMP = 1727593598


              1
              
TIMESTAMP = 1729779540

            

            

              2
              
SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e


              2
              
SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3

            

            

              3
              
SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952


              3
              
SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432

            

        

          4
          
SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607

          4
          
SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607

        

        

          5
          
SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576

          5
          
SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576

        

        

          6
          
SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84

          6
          
SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84

        






  

  Return to bug 282312