diff --git a/graphics/Makefile b/graphics/Makefile --- a/graphics/Makefile +++ b/graphics/Makefile @@ -618,10 +618,15 @@ SUBDIR += nsxiv SUBDIR += nurbs++ SUBDIR += nvidia-drm-510-kmod + SUBDIR += nvidia-drm-510-kmod-devel SUBDIR += nvidia-drm-515-kmod + SUBDIR += nvidia-drm-515-kmod-devel SUBDIR += nvidia-drm-61-kmod + SUBDIR += nvidia-drm-61-kmod-devel SUBDIR += nvidia-drm-66-kmod + SUBDIR += nvidia-drm-66-kmod-devel SUBDIR += nvidia-drm-kmod + SUBDIR += nvidia-drm-kmod-devel SUBDIR += nvidia-texture-tools SUBDIR += ocaml-cairo SUBDIR += ocaml-images diff --git a/graphics/nvidia-drm-510-kmod-devel/Makefile b/graphics/nvidia-drm-510-kmod-devel/Makefile new file mode 100644 --- /dev/null +++ b/graphics/nvidia-drm-510-kmod-devel/Makefile @@ -0,0 +1,7 @@ +NVIDIA_DISTVERSION= 575.57.08 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 +MASTERDIR= ${.CURDIR}/../nvidia-drm-510-kmod +PKGNAMESUFFIX= -devel + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/nvidia-drm-510-kmod-devel/distinfo b/graphics/nvidia-drm-510-kmod-devel/distinfo new file mode 100644 --- /dev/null +++ b/graphics/nvidia-drm-510-kmod-devel/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1748674829 +SHA256 (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = b6552467311a3ef994a4b2dd1572ee2fce51ea6752a50a8c1ec61fd58542e5d8 +SIZE (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = 287937620 +SHA256 (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = dbdff8ad8cad8152d1c286b058f1f5114b3672f1a936e13933ce52915b77eaaa +SIZE (freebsd-drm-kmod-drm_v5.10.163_7_GH0.tar.gz) = 20095338 diff --git a/graphics/nvidia-drm-510-kmod/Makefile b/graphics/nvidia-drm-510-kmod/Makefile --- a/graphics/nvidia-drm-510-kmod/Makefile +++ b/graphics/nvidia-drm-510-kmod/Makefile @@ -3,7 +3,7 @@ BUILD_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-510-kmod RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-510-kmod -CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-61-kmod nvidia-drm-66-kmod +CONFLICTS_INSTALL= nvidia-drm-515-kmod* nvidia-drm-61-kmod* nvidia-drm-66-kmod* .include "${.CURDIR}/../drm-510-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-515-kmod-devel/Makefile b/graphics/nvidia-drm-515-kmod-devel/Makefile new file mode 100644 --- /dev/null +++ b/graphics/nvidia-drm-515-kmod-devel/Makefile @@ -0,0 +1,7 @@ +NVIDIA_DISTVERSION= 575.57.08 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 +MASTERDIR= ${.CURDIR}/../nvidia-drm-515-kmod +PKGNAMESUFFIX= -devel + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/nvidia-drm-515-kmod-devel/distinfo b/graphics/nvidia-drm-515-kmod-devel/distinfo new file mode 100644 --- /dev/null +++ b/graphics/nvidia-drm-515-kmod-devel/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1748675145 +SHA256 (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = b6552467311a3ef994a4b2dd1572ee2fce51ea6752a50a8c1ec61fd58542e5d8 +SIZE (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = 287937620 +SHA256 (freebsd-drm-kmod-drm_v5.15.160_3_GH0.tar.gz) = e6eef2927f3d683be0faf286b2723fecf962ef2e48a2be87326a83579f82a55b +SIZE (freebsd-drm-kmod-drm_v5.15.160_3_GH0.tar.gz) = 26098374 diff --git a/graphics/nvidia-drm-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile --- a/graphics/nvidia-drm-515-kmod/Makefile +++ b/graphics/nvidia-drm-515-kmod/Makefile @@ -4,7 +4,7 @@ BUILD_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-515-kmod RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-515-kmod -CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-61-kmod nvidia-drm-66-kmod +CONFLICTS_INSTALL= nvidia-drm-510-kmod* nvidia-drm-61-kmod* nvidia-drm-66-kmod* .include "${.CURDIR}/../drm-515-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-61-kmod-devel/Makefile b/graphics/nvidia-drm-61-kmod-devel/Makefile new file mode 100644 --- /dev/null +++ b/graphics/nvidia-drm-61-kmod-devel/Makefile @@ -0,0 +1,7 @@ +NVIDIA_DISTVERSION= 575.57.08 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 +MASTERDIR= ${.CURDIR}/../nvidia-drm-61-kmod +PKGNAMESUFFIX= -devel + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/nvidia-drm-61-kmod-devel/distinfo b/graphics/nvidia-drm-61-kmod-devel/distinfo new file mode 100644 --- /dev/null +++ b/graphics/nvidia-drm-61-kmod-devel/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1748674242 +SHA256 (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = b6552467311a3ef994a4b2dd1572ee2fce51ea6752a50a8c1ec61fd58542e5d8 +SIZE (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = 287937620 +SHA256 (freebsd-drm-kmod-drm_v6.1.128_3_GH0.tar.gz) = 6b786181c38e9cc820772c19f97a37198fe510b229597a2b0b018cbe3486fd0b +SIZE (freebsd-drm-kmod-drm_v6.1.128_3_GH0.tar.gz) = 37102599 diff --git a/graphics/nvidia-drm-61-kmod/Makefile b/graphics/nvidia-drm-61-kmod/Makefile --- a/graphics/nvidia-drm-61-kmod/Makefile +++ b/graphics/nvidia-drm-61-kmod/Makefile @@ -4,7 +4,7 @@ BUILD_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod -CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-515-kmod nvidia-drm-66-kmod +CONFLICTS_INSTALL= nvidia-drm-510-kmod* nvidia-drm-515-kmod* nvidia-drm-66-kmod* .include "${.CURDIR}/../drm-61-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-66-kmod-devel/Makefile b/graphics/nvidia-drm-66-kmod-devel/Makefile new file mode 100644 --- /dev/null +++ b/graphics/nvidia-drm-66-kmod-devel/Makefile @@ -0,0 +1,7 @@ +NVIDIA_DISTVERSION= 575.57.08 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 +MASTERDIR= ${.CURDIR}/../nvidia-drm-66-kmod +PKGNAMESUFFIX= -devel + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/nvidia-drm-66-kmod-devel/distinfo b/graphics/nvidia-drm-66-kmod-devel/distinfo new file mode 100644 --- /dev/null +++ b/graphics/nvidia-drm-66-kmod-devel/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1748675194 +SHA256 (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = b6552467311a3ef994a4b2dd1572ee2fce51ea6752a50a8c1ec61fd58542e5d8 +SIZE (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = 287937620 +SHA256 (freebsd-drm-kmod-drm_v6.6.25_4_GH0.tar.gz) = 00c1cdba93dde777758273aa312ac47d08ea89b3c703cfb73b1826d14d1627c0 +SIZE (freebsd-drm-kmod-drm_v6.6.25_4_GH0.tar.gz) = 38487894 diff --git a/graphics/nvidia-drm-66-kmod/Makefile b/graphics/nvidia-drm-66-kmod/Makefile --- a/graphics/nvidia-drm-66-kmod/Makefile +++ b/graphics/nvidia-drm-66-kmod/Makefile @@ -4,7 +4,7 @@ BUILD_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-66-kmod RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-66-kmod -CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-515-kmod nvidia-drm-61-kmod +CONFLICTS_INSTALL= nvidia-drm-510-kmod* nvidia-drm-515-kmod* nvidia-drm-61-kmod* .include "${.CURDIR}/../drm-66-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-kmod-devel/Makefile b/graphics/nvidia-drm-kmod-devel/Makefile new file mode 100644 --- /dev/null +++ b/graphics/nvidia-drm-kmod-devel/Makefile @@ -0,0 +1,8 @@ +DISTVERSION= 575.57.08 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../nvidia-drm-kmod +PKGNAMESUFFIX= -devel + +.include "${MASTERDIR}/Makefile" diff --git a/graphics/nvidia-drm-kmod/Makefile b/graphics/nvidia-drm-kmod/Makefile --- a/graphics/nvidia-drm-kmod/Makefile +++ b/graphics/nvidia-drm-kmod/Makefile @@ -1,5 +1,5 @@ PORTNAME= nvidia-drm-kmod -PORTVERSION= ${NVIDIA_DISTVERSION} +DISTVERSION?= ${NVIDIA_DISTVERSION} CATEGORIES= graphics kld MAINTAINER= x11@FreeBSD.org @@ -15,12 +15,14 @@ IGNORE= not supported on anything but FreeBSD (missing linuxkpi functionality) .else . if ${OSVERSION} >= 1302000 && ${OSVERSION} < 1400097 -RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod +RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod${PKGNAMESUFFIX} . elif ${OSVERSION} >= 1400097 && (${ARCH} == i386 || ${ARCH} == aarch64) -RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod +RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod${PKGNAMESUFFIX} . elif ${OSVERSION} >= 1400508 -RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod +RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod${PKGNAMESUFFIX} . endif .endif +CONFLICTS_INSTALL= nvidia-drm-kmod* + .include 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 @@ -9,13 +9,18 @@ PORTREVISION?= 0 DISTFILES= NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}${EXTRACT_SUFX}:nvidia \ freebsd-drm-kmod-${DRM_KMOD_GH_TAGNAME}_GH0.tar.gz:drm +# Choose proper distinfo file using PKGNAMESUFFIX for slave ports. +# Kept for switching to centralized distinfo with suffixes. +.ifdef PKGNAMESUFFIX +DISTINFO_FILE= ${.CURDIR}/distinfo +.endif ONLY_FOR_ARCHS= amd64 USES= kmod uidfix tar:xz SUB_FILES= 20-nvidia-drm-outputclass.conf -RUN_DEPENDS+= ${KMODDIR}/nvidia.ko:x11/nvidia-driver +RUN_DEPENDS+= ${KMODDIR}/nvidia.ko:x11/nvidia-driver${PKGNAMESUFFIX} .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.version" .include "${.CURDIR}/../../x11/nvidia-driver/Makefile.common" diff --git a/x11/Makefile b/x11/Makefile --- a/x11/Makefile +++ b/x11/Makefile @@ -242,6 +242,7 @@ SUBDIR += linux-nvidia-libs-340 SUBDIR += linux-nvidia-libs-390 SUBDIR += linux-nvidia-libs-470 + SUBDIR += linux-nvidia-libs-devel SUBDIR += linux-rl9-libxkbcommon SUBDIR += linux-rl9-pixman SUBDIR += linux-rl9-qt5-qtx11extras @@ -293,6 +294,7 @@ SUBDIR += nvidia-driver-340 SUBDIR += nvidia-driver-390 SUBDIR += nvidia-driver-470 + SUBDIR += nvidia-driver-devel SUBDIR += nvidia-settings SUBDIR += nvidia-xconfig SUBDIR += nwg-bar diff --git a/x11/linux-nvidia-libs-devel/Makefile b/x11/linux-nvidia-libs-devel/Makefile new file mode 100644 --- /dev/null +++ b/x11/linux-nvidia-libs-devel/Makefile @@ -0,0 +1,8 @@ +DISTVERSION= 575.57.08 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../linux-nvidia-libs +PKGNAMESUFFIX= -devel + +.include "${MASTERDIR}/Makefile" diff --git a/x11/linux-nvidia-libs-devel/distinfo b/x11/linux-nvidia-libs-devel/distinfo new file mode 100644 --- /dev/null +++ b/x11/linux-nvidia-libs-devel/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1748628500 +SHA256 (NVIDIA-Linux-x86_64-575.57.08.run) = 2aa701dac180a7b20a6e578cccd901ded8d44e57d60580f08f9d28dd1fffc6f2 +SIZE (NVIDIA-Linux-x86_64-575.57.08.run) = 389558524 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 @@ -16,6 +16,8 @@ .include "${.CURDIR}/../nvidia-driver/Makefile.version" .include "${.CURDIR}/../nvidia-driver/Makefile.common" +CONFLICTS_INSTALL= linux-nvidia-libs* + # Choose proper distinfo file using PKGNAMESUFFIX for slave ports. # Kept for switching to centralized distinfo with suffixes. .ifdef PKGNAMESUFFIX @@ -274,7 +276,7 @@ # nvidia-egl-X11 supports (not in x11/nvidia-driver nor separate ports) # Estimated to be upgrated often. -.if ${NVVERSION} >= 570.15302 && ${NVVERSION} < 575.00000 +.if ${NVVERSION} >= 570.15302 && ${NVVERSION} < 575.00000 || ${NVVERSION} >= 575.05708 NV_EGL_X_VERSION= 1.0.2 .elif ${NVVERSION} >= 570.14400 # 570.144 NV_EGL_X_VERSION= 1.0.1 diff --git a/x11/nvidia-driver-devel/Makefile b/x11/nvidia-driver-devel/Makefile new file mode 100644 --- /dev/null +++ b/x11/nvidia-driver-devel/Makefile @@ -0,0 +1,8 @@ +DISTVERSION= 575.57.08 +# Explicitly set PORTREVISION as it can be overridden by the master port +PORTREVISION= 0 + +MASTERDIR= ${.CURDIR}/../nvidia-driver +PKGNAMESUFFIX= -devel + +.include "${MASTERDIR}/Makefile" diff --git a/x11/nvidia-driver-devel/distinfo b/x11/nvidia-driver-devel/distinfo new file mode 100644 --- /dev/null +++ b/x11/nvidia-driver-devel/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1748625370 +SHA256 (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = b6552467311a3ef994a4b2dd1572ee2fce51ea6752a50a8c1ec61fd58542e5d8 +SIZE (NVIDIA-FreeBSD-x86_64-575.57.08.tar.xz) = 287937620 diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -159,7 +159,7 @@ PLIST_FILES+= lib/libnvidia-wayland-client.so.${DISTVERSION} .endif -CONFLICTS_INSTALL+= nvidia-driver nvidia-driver-* +CONFLICTS_INSTALL+= nvidia-driver* .if ${PORTNAME} != nvidia-secondary-driver CONFLICTS_INSTALL+= nvidia-secondary-driver .endif