Page MenuHomeFreeBSD
Files F171669417

D59609.diff
No OneTemporary
Actions

D59609.diff
View Options

diff --git a/graphics/nvidia-drm-515-kmod-devel/Makefile b/graphics/nvidia-drm-515-kmod-devel/Makefile
--- a/graphics/nvidia-drm-515-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-515-kmod-devel/Makefile
@@ -1,6 +1,6 @@
-NVIDIA_DISTVERSION?= 610.57.04
+NVIDIA_DISTVERSION?= 615.71.09
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 1
+PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../nvidia-drm-515-kmod
PKGNAMESUFFIX= -devel
diff --git a/graphics/nvidia-drm-515-kmod-devel/distinfo b/graphics/nvidia-drm-515-kmod-devel/distinfo
--- a/graphics/nvidia-drm-515-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-515-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1788982594
-SHA256 (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = c717f1031fed0a8e1dd6b1a71922fce1480ebe5fcc7f10ef89532320fe663ee3
-SIZE (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = 356764440
+TIMESTAMP = 1789004766
+SHA256 (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 7f81d9e722e9c0ec21def990f1d50bc6db3701caabbb7346cd7f76ae3f01288c
+SIZE (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 346334360
SHA256 (freebsd-drm-kmod-drm_v5.15.160_8_GH0.tar.gz) = 022ec92c52a6fe2d1933b14df3cc6b691f9b79abf697d4aa257ae328c4a065df
SIZE (freebsd-drm-kmod-drm_v5.15.160_8_GH0.tar.gz) = 26098371
diff --git a/graphics/nvidia-drm-61-kmod-devel/Makefile b/graphics/nvidia-drm-61-kmod-devel/Makefile
--- a/graphics/nvidia-drm-61-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-61-kmod-devel/Makefile
@@ -1,6 +1,6 @@
-NVIDIA_DISTVERSION?= 610.57.04
+NVIDIA_DISTVERSION?= 615.71.09
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 1
+PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../nvidia-drm-61-kmod
PKGNAMESUFFIX= -devel
diff --git a/graphics/nvidia-drm-61-kmod-devel/distinfo b/graphics/nvidia-drm-61-kmod-devel/distinfo
--- a/graphics/nvidia-drm-61-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-61-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1788982572
-SHA256 (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = c717f1031fed0a8e1dd6b1a71922fce1480ebe5fcc7f10ef89532320fe663ee3
-SIZE (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = 356764440
+TIMESTAMP = 1789004811
+SHA256 (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 7f81d9e722e9c0ec21def990f1d50bc6db3701caabbb7346cd7f76ae3f01288c
+SIZE (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 346334360
SHA256 (freebsd-drm-kmod-drm_v6.1.128_12_GH0.tar.gz) = 0a885b238bffb23f2d4054b9a34e7101613b31fc2469f7a00932f458cc953529
SIZE (freebsd-drm-kmod-drm_v6.1.128_12_GH0.tar.gz) = 37112282
diff --git a/graphics/nvidia-drm-612-kmod-devel/Makefile b/graphics/nvidia-drm-612-kmod-devel/Makefile
--- a/graphics/nvidia-drm-612-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-612-kmod-devel/Makefile
@@ -1,6 +1,6 @@
-NVIDIA_DISTVERSION?= 610.57.04
+NVIDIA_DISTVERSION?= 615.71.09
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 1
+PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../nvidia-drm-612-kmod
PKGNAMESUFFIX= -devel
diff --git a/graphics/nvidia-drm-612-kmod-devel/distinfo b/graphics/nvidia-drm-612-kmod-devel/distinfo
--- a/graphics/nvidia-drm-612-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-612-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1788982607
-SHA256 (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = c717f1031fed0a8e1dd6b1a71922fce1480ebe5fcc7f10ef89532320fe663ee3
-SIZE (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = 356764440
+TIMESTAMP = 1789005991
+SHA256 (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 7f81d9e722e9c0ec21def990f1d50bc6db3701caabbb7346cd7f76ae3f01288c
+SIZE (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 346334360
SHA256 (freebsd-drm-kmod-drm_v6.12.85_3_GH0.tar.gz) = 664bc6d77ddc0e103d523563a804644aca14b46d8a3c1af268ea79846139ef60
SIZE (freebsd-drm-kmod-drm_v6.12.85_3_GH0.tar.gz) = 44076233
diff --git a/graphics/nvidia-drm-66-kmod-devel/Makefile b/graphics/nvidia-drm-66-kmod-devel/Makefile
--- a/graphics/nvidia-drm-66-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-66-kmod-devel/Makefile
@@ -1,6 +1,6 @@
-NVIDIA_DISTVERSION?= 610.57.04
+NVIDIA_DISTVERSION?= 615.71.09
# Explicitly set PORTREVISION as it can be overridden by the master port
-PORTREVISION= 1
+PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../nvidia-drm-66-kmod
PKGNAMESUFFIX= -devel
diff --git a/graphics/nvidia-drm-66-kmod-devel/distinfo b/graphics/nvidia-drm-66-kmod-devel/distinfo
--- a/graphics/nvidia-drm-66-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-66-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1788982585
-SHA256 (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = c717f1031fed0a8e1dd6b1a71922fce1480ebe5fcc7f10ef89532320fe663ee3
-SIZE (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = 356764440
+TIMESTAMP = 1789004854
+SHA256 (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 7f81d9e722e9c0ec21def990f1d50bc6db3701caabbb7346cd7f76ae3f01288c
+SIZE (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 346334360
SHA256 (freebsd-drm-kmod-drm_v6.6.25_14_GH0.tar.gz) = 7239e96b0f61e50f099aa08bd5de8507fb9357baea81462a3337d361ed4fbbea
SIZE (freebsd-drm-kmod-drm_v6.6.25_14_GH0.tar.gz) = 38488401
diff --git a/graphics/nvidia-drm-kmod-devel/Makefile b/graphics/nvidia-drm-kmod-devel/Makefile
--- a/graphics/nvidia-drm-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-kmod-devel/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?= 610.57.04
+DISTVERSION?= 615.71.09
# Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 0
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -81,6 +81,42 @@
${WRKSRC}/nvidia-drm-drv.c
${REINPLACE_CMD} -e 's:struct nv_drm_mst_display_info \*r_info = (struct nv_drm_mst_display_info:const struct nv_drm_mst_display_info \*r_info = (const struct nv_drm_mst_display_info:' \
${WRKSRC}/nvidia-drm-drv.c
+.endif
+ # Workaround for build failure on 615.71.09. There are no other "%llu" in this file.
+ # --- nvidia-drm-fence.o ---
+ # nvidia-drm-fence.c:1908:13: error: format specifies type 'unsigned long long' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
+ # 1907 | "Failed to create fence for wait_value: %llu",
+ # | ~~~~
+ # | %lu
+ # 1908 | p->wait_value);
+ # | ^~~~~~~~~~~~~
+ # ./nvidia-drm-priv.h:73:72: note: expanded from macro 'NV_DRM_DEV_LOG_ERR'
+ # 73 | NV_DRM_LOG_ERR("[GPU ID 0x%08x] " __fmt, __dev->gpu_info.gpu_id, ##__VA_ARGS__)
+ # | ~~~~~ ^~~~~~~~~~~
+ # ./nvidia-drm-priv.h:43:45: note: expanded from macro 'NV_DRM_LOG_ERR'
+ # 43 | DRM_ERROR("[nvidia-drm] " __fmt "\n", ##__VA_ARGS__)
+ # | ~~~~~ ^~~~~~~~~~~
+ # /usr/ports/graphics/nvidia-drm-612-kmod-devel/work/drm-kmod-drm_v6.12.85_3//include/drm/drm_print.h:697:29: note: expanded from macro 'DRM_ERROR'
+ # 697 | __drm_err(__func__, fmt, ##__VA_ARGS__)
+ # | ~~~ ^~~~~~~~~~~
+ # nvidia-drm-fence.c:1972:13: error: format specifies type 'unsigned long long' but the argument has type 'uint64_t' (aka 'unsigned long') [-Werror,-Wformat]
+ # 1970 | "Failed to find fence for syncobj 0x%08x at point %llu",
+ # | ~~~~
+ # | %lu
+ # 1971 | p->syncobj_handle,
+ # 1972 | p->syncobj_point);
+ # | ^~~~~~~~~~~~~~~~
+ # ./nvidia-drm-priv.h:73:72: note: expanded from macro 'NV_DRM_DEV_LOG_ERR'
+ # 73 | NV_DRM_LOG_ERR("[GPU ID 0x%08x] " __fmt, __dev->gpu_info.gpu_id, ##__VA_ARGS__)
+ # | ~~~~~ ^~~~~~~~~~~
+ # ./nvidia-drm-priv.h:43:45: note: expanded from macro 'NV_DRM_LOG_ERR'
+ # 43 | DRM_ERROR("[nvidia-drm] " __fmt "\n", ##__VA_ARGS__)
+ # | ~~~~~ ^~~~~~~~~~~
+ # /usr/ports/graphics/nvidia-drm-612-kmod-devel/work/drm-kmod-drm_v6.12.85_3//include/drm/drm_print.h:697:29: note: expanded from macro 'DRM_ERROR'
+ # 697 | __drm_err(__func__, fmt, ##__VA_ARGS__)
+ # | ~~~ ^~~~~~~~~~~
+.if ${NVVERSION} >= 615.00000
+ ${REINPLACE_CMD} -e 's/%llu\"/%lu\"/' ${WRKSRC}/nvidia-drm-fence.c
.endif
# Workaround for build failure on graphics/nvidia-drm-515-kmod*,
# as struct dma_buf_map was renamed to struct iosys_map at Linux 5.18 (DRM5.18).
diff --git a/graphics/nvidia-drm-latest-kmod-devel/Makefile b/graphics/nvidia-drm-latest-kmod-devel/Makefile
--- a/graphics/nvidia-drm-latest-kmod-devel/Makefile
+++ b/graphics/nvidia-drm-latest-kmod-devel/Makefile
@@ -1,4 +1,4 @@
-NVIDIA_DISTVERSION?= 610.57.04
+NVIDIA_DISTVERSION?= 615.71.09
# Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../nvidia-drm-latest-kmod
diff --git a/graphics/nvidia-drm-latest-kmod-devel/distinfo b/graphics/nvidia-drm-latest-kmod-devel/distinfo
--- a/graphics/nvidia-drm-latest-kmod-devel/distinfo
+++ b/graphics/nvidia-drm-latest-kmod-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1785766233
-SHA256 (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = c717f1031fed0a8e1dd6b1a71922fce1480ebe5fcc7f10ef89532320fe663ee3
-SIZE (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = 356764440
+TIMESTAMP = 1789005016
+SHA256 (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 7f81d9e722e9c0ec21def990f1d50bc6db3701caabbb7346cd7f76ae3f01288c
+SIZE (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 346334360
SHA256 (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = d14ee33f3ff5e32aa0d1dffa43a27d93b2083ec9c4216508b29cf4c519ffc5df
SIZE (freebsd-drm-kmod-drm_v6.12_GH0.tar.gz) = 44013275
diff --git a/x11/linux-nvidia-libs-devel/Makefile b/x11/linux-nvidia-libs-devel/Makefile
--- a/x11/linux-nvidia-libs-devel/Makefile
+++ b/x11/linux-nvidia-libs-devel/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?= 610.57.04
+DISTVERSION?= 615.71.09
# Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 0
diff --git a/x11/linux-nvidia-libs-devel/distinfo b/x11/linux-nvidia-libs-devel/distinfo
--- a/x11/linux-nvidia-libs-devel/distinfo
+++ b/x11/linux-nvidia-libs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1785765653
-SHA256 (NVIDIA-Linux-x86_64-610.57.04.run) = b2e935c66b83bb00c0c857bc8e0ee0fd52de9286b40c9cc1eec29a7ce7eb116d
-SIZE (NVIDIA-Linux-x86_64-610.57.04.run) = 463025450
+TIMESTAMP = 1789002739
+SHA256 (NVIDIA-Linux-x86_64-615.71.09.run) = cdceed22bbeb61248d1a6deabc2596673e3a6501698ee71ac8d2fdc28f3b70fe
+SIZE (NVIDIA-Linux-x86_64-615.71.09.run) = 529618784
diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
--- a/x11/linux-nvidia-libs/Makefile
+++ b/x11/linux-nvidia-libs/Makefile
@@ -194,7 +194,9 @@
## graphics/egl-wayland2 supports
## Estimated to be upgraded often.
-.if ${NVVERSION} >= 590.00000
+.if ${NVVERSION} >= 615.00000
+NV_EGL_W2_VERSION= 1.0.2
+.elif ${NVVERSION} >= 590.00000
NV_EGL_W2_VERSION= 1.0.1
.else # Fool proof (Poka-yoke)
NV_EGL_W2_VERSION= ""
@@ -314,7 +316,9 @@
# nvidia-egl-X11 supports (not in x11/nvidia-driver nor separate ports)
# Estimated to be upgrated often.
-.if ${NVVERSION} >= 595.00000 || \
+.if ${NVVERSION} >= 615.00000
+NV_EGL_X_VERSION= 1.0.6
+.elif ${NVVERSION} >= 595.00000 || \
${NVVERSION} >= 580.14200 && ${NVVERSION} < 590.00000 # 580.142 or 595
NV_EGL_X_VERSION= 1.0.5
.elif ${NVVERSION} >= 580.10508 # 580.105.08
diff --git a/x11/nvidia-driver-devel/Makefile b/x11/nvidia-driver-devel/Makefile
--- a/x11/nvidia-driver-devel/Makefile
+++ b/x11/nvidia-driver-devel/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?= 610.57.04
+DISTVERSION?= 615.71.09
# Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 0
diff --git a/x11/nvidia-driver-devel/distinfo b/x11/nvidia-driver-devel/distinfo
--- a/x11/nvidia-driver-devel/distinfo
+++ b/x11/nvidia-driver-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1785765531
-SHA256 (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = c717f1031fed0a8e1dd6b1a71922fce1480ebe5fcc7f10ef89532320fe663ee3
-SIZE (NVIDIA-FreeBSD-x86_64-610.57.04.tar.xz) = 356764440
+TIMESTAMP = 1789002729
+SHA256 (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 7f81d9e722e9c0ec21def990f1d50bc6db3701caabbb7346cd7f76ae3f01288c
+SIZE (NVIDIA-FreeBSD-x86_64-615.71.09.tar.xz) = 346334360
diff --git a/x11/nvidia-kmod-devel/Makefile b/x11/nvidia-kmod-devel/Makefile
--- a/x11/nvidia-kmod-devel/Makefile
+++ b/x11/nvidia-kmod-devel/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION?= 610.57.04
+DISTVERSION?= 615.71.09
# Explicitly set PORTREVISION as it can be overridden by the master port
PORTREVISION= 0

File Metadata

Mime Type
text/plain
Expires
Sun, Sep 13, 1:49 PM (22 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38855198
Default Alt Text
D59609.diff (12 KB)

Event Timeline