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 @@ -5,6 +5,8 @@ RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-510-kmod CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-61-kmod nvidia-drm-66-kmod +DRMNAME= drm-510-kmod + .include "${.CURDIR}/../drm-510-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" .include diff --git a/graphics/nvidia-drm-510-kmod/distinfo b/graphics/nvidia-drm-510-kmod/distinfo deleted file mode 100644 --- a/graphics/nvidia-drm-510-kmod/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1740840763 -SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026 -SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688 -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-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile --- a/graphics/nvidia-drm-515-kmod/Makefile +++ b/graphics/nvidia-drm-515-kmod/Makefile @@ -6,6 +6,8 @@ RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-515-kmod CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-61-kmod nvidia-drm-66-kmod +DRMNAME= drm-515-kmod + .include "${.CURDIR}/../drm-515-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo deleted file mode 100644 --- a/graphics/nvidia-drm-515-kmod/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1741856037 -SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026 -SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688 -SHA256 (freebsd-drm-kmod-drm_v5.15.160_2_GH0.tar.gz) = 85914f9a39c6919d9a725a3252ea541d11394c3051a3600707fa6d865a082728 -SIZE (freebsd-drm-kmod-drm_v5.15.160_2_GH0.tar.gz) = 26098303 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 @@ -6,6 +6,8 @@ RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-61-kmod CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-515-kmod nvidia-drm-66-kmod +DRMNAME= drm-61-kmod + .include "${.CURDIR}/../drm-61-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-61-kmod/distinfo b/graphics/nvidia-drm-61-kmod/distinfo deleted file mode 100644 --- a/graphics/nvidia-drm-61-kmod/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1745474929 -SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026 -SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688 -SHA256 (freebsd-drm-kmod-drm_v6.1.128_2_GH0.tar.gz) = fe9d37f3b7c010c781b054a55b23b19b38eb3c5673234b186e0d392be2838c4d -SIZE (freebsd-drm-kmod-drm_v6.1.128_2_GH0.tar.gz) = 37107528 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 @@ -6,6 +6,8 @@ RUN_DEPENDS+= ${KMODDIR}/drm.ko:graphics/drm-66-kmod CONFLICTS_INSTALL= nvidia-drm-510-kmod nvidia-drm-515-kmod nvidia-drm-61-kmod +DRMNAME= drm-66-kmod + .include "${.CURDIR}/../drm-66-kmod/Makefile.version" .include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common" diff --git a/graphics/nvidia-drm-66-kmod/distinfo b/graphics/nvidia-drm-66-kmod/distinfo deleted file mode 100644 --- a/graphics/nvidia-drm-66-kmod/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -TIMESTAMP = 1745475021 -SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026 -SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688 -SHA256 (freebsd-drm-kmod-drm_v6.6.25_3_GH0.tar.gz) = b12d5375df0aae8804e869d9d30efbcffebe5848981700144719a9c86fa48409 -SIZE (freebsd-drm-kmod-drm_v6.6.25_3_GH0.tar.gz) = 38487651 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 @@ -4,11 +4,11 @@ COMMENT= NVIDIA DRM Kernel Module WWW= https://www.nvidia.com/object/unix.html MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${NVIDIA_DISTVERSION}:nvidia \ - https://codeload.github.com/freebsd/drm-kmod/tar.gz/${DRM_KMOD_GH_TAGNAME}?dummy=/:drm + https://codeload.github.com/freebsd/drm-kmod/tar.gz/${DRM_KMOD_DISTVERSION}-${DRM_KMOD_GH_TAGNAME}?dummy=/:drm DISTVERSION?= ${NVIDIA_DISTVERSION} -PORTREVISION= 1 +PORTREVISION?= 2 DISTFILES= NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}${EXTRACT_SUFX}:nvidia \ - freebsd-drm-kmod-${DRM_KMOD_GH_TAGNAME}_GH0.tar.gz:drm + freebsd-drm-kmod-${DRM_KMOD_DISTVERSION}-${DRM_KMOD_GH_TAGNAME}_GH0.tar.gz:drm ONLY_FOR_ARCHS= amd64 USES= kmod uidfix tar:xz @@ -30,6 +30,11 @@ WRKSRC= ${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/ WRKSRC_SUBDIR= src/nvidia-drm/ +WRKDIST= ${.CURDIR}/workdist +TMPDST_NV= ${WRKDIST}/distinfo-nvidia +TMPDST_DRM= ${WRKDIST}/distinfo-drm +DISTINFO_FILE= ${WRKDIST}/distinfo${PKGNAMESUFFIX} + .if ${NVVERSION} < 565.00000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-conftest.h .endif #565.00 @@ -38,6 +43,16 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c .endif +pre-fetch: .SILENT + ${MKDIR} ${WRKDIST} + ${CP} ${.CURDIR}/../${DRMNAME}/distinfo ${TMPDST_DRM} + ${CP} ${.CURDIR}/../../x11/nvidia-driver${PKGNAMESUFFIX}/distinfo ${TMPDST_NV} + ${REINPLACE_CMD} -e '/TIMESTAMP/d' ${TMPDST_DRM} + ${CAT} ${TMPDST_NV} ${TMPDST_DRM} > ${DISTINFO_FILE} + +post-clean: .SILENT + ${RM} -r ${WRKDIST} + post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/ ${INSTALL_DATA} ${WRKDIR}/20-nvidia-drm-outputclass.conf ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/ diff --git a/x11/linux-nvidia-libs-304/distinfo b/x11/linux-nvidia-libs-304/distinfo --- a/x11/linux-nvidia-libs-304/distinfo +++ b/x11/linux-nvidia-libs-304/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1743665760 +SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2 +SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133 +SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8 +SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115 diff --git a/x11/linux-nvidia-libs-340/distinfo b/x11/linux-nvidia-libs-340/distinfo --- a/x11/linux-nvidia-libs-340/distinfo +++ b/x11/linux-nvidia-libs-340/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1743665760 +SHA256 (NVIDIA-Linux-x86_64-340.108.run) = c671d4f1b7c09bc1af079b98b447adb06d704b04f802f7045a611fa50133b71b +SIZE (NVIDIA-Linux-x86_64-340.108.run) = 70165522 +SHA256 (NVIDIA-Linux-x86-340.108.run) = 2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca +SIZE (NVIDIA-Linux-x86-340.108.run) = 38902892 diff --git a/x11/linux-nvidia-libs-390/distinfo b/x11/linux-nvidia-libs-390/distinfo --- a/x11/linux-nvidia-libs-390/distinfo +++ b/x11/linux-nvidia-libs-390/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1743665760 +SHA256 (NVIDIA-Linux-x86_64-390.157.run) = 5bebbca6e8fed5d6b9d81070fb9e351f18edc534952553cbdc71e8fd0b9b328a +SIZE (NVIDIA-Linux-x86_64-390.157.run) = 85835541 +SHA256 (NVIDIA-Linux-x86-390.157.run) = 55d65e0a4539a9cb796200c5f1082fe263fb0951deaaf96a9cffeb8a80f70799 +SIZE (NVIDIA-Linux-x86-390.157.run) = 49417041 diff --git a/x11/linux-nvidia-libs-470/distinfo b/x11/linux-nvidia-libs-470/distinfo --- a/x11/linux-nvidia-libs-470/distinfo +++ b/x11/linux-nvidia-libs-470/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1743665760 +SHA256 (NVIDIA-Linux-x86_64-470.256.02.run) = d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de +SIZE (NVIDIA-Linux-x86_64-470.256.02.run) = 272850014 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,12 @@ .include "${.CURDIR}/../nvidia-driver/Makefile.version" .include "${.CURDIR}/../nvidia-driver/Makefile.common" +# Choose proper distinfo file using PKGNAMESUFFIX +# for slave ports +.ifdef PKGNAMESUFFIX +DISTINFO_FILE= ${.CURDIR}/distinfo +.endif + .if ${DISTVERSION:R} > 390 PORTSCOUT= limit:\.\d+$$ # ignore *-no-compat32 distfiles .else diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo --- a/x11/linux-nvidia-libs/distinfo +++ b/x11/linux-nvidia-libs/distinfo @@ -1,17 +1,3 @@ TIMESTAMP = 1743665760 SHA256 (NVIDIA-Linux-x86_64-570.124.04.run) = 1b786a4b7122d7c4216c58ae4007688a4f778c196c148d919163815ee10d53c4 SIZE (NVIDIA-Linux-x86_64-570.124.04.run) = 375582187 -SHA256 (NVIDIA-Linux-x86_64-470.256.02.run) = d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de -SIZE (NVIDIA-Linux-x86_64-470.256.02.run) = 272850014 -SHA256 (NVIDIA-Linux-x86_64-390.157.run) = 5bebbca6e8fed5d6b9d81070fb9e351f18edc534952553cbdc71e8fd0b9b328a -SIZE (NVIDIA-Linux-x86_64-390.157.run) = 85835541 -SHA256 (NVIDIA-Linux-x86-390.157.run) = 55d65e0a4539a9cb796200c5f1082fe263fb0951deaaf96a9cffeb8a80f70799 -SIZE (NVIDIA-Linux-x86-390.157.run) = 49417041 -SHA256 (NVIDIA-Linux-x86_64-340.108.run) = c671d4f1b7c09bc1af079b98b447adb06d704b04f802f7045a611fa50133b71b -SIZE (NVIDIA-Linux-x86_64-340.108.run) = 70165522 -SHA256 (NVIDIA-Linux-x86-340.108.run) = 2032aad612d9f3af1aecf979cfdfe423d79aa76929ef8bf8d3a403076f507cca -SIZE (NVIDIA-Linux-x86-340.108.run) = 38902892 -SHA256 (NVIDIA-Linux-x86_64-304.137.run) = eb1f56db3a2bea13e3ccde7b5ae14abe8cd6c6dbe69af4c71c68a623cc96e3e2 -SIZE (NVIDIA-Linux-x86_64-304.137.run) = 70087133 -SHA256 (NVIDIA-Linux-x86-304.137.run) = ca98379fc2090bdfe8b74113d6ac7bcc7eadbd86a489c3c4ec4cd5ba9f6064f8 -SIZE (NVIDIA-Linux-x86-304.137.run) = 41504115 diff --git a/x11/nvidia-driver-304/distinfo b/x11/nvidia-driver-304/distinfo --- a/x11/nvidia-driver-304/distinfo +++ b/x11/nvidia-driver-304/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1743664922 +SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120 +SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676 +SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb +SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011 diff --git a/x11/nvidia-driver-340/distinfo b/x11/nvidia-driver-340/distinfo --- a/x11/nvidia-driver-340/distinfo +++ b/x11/nvidia-driver-340/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1743664922 +SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f +SIZE (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = 61500286 +SHA256 (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 87b8523fb29e2bf51c2daf555e6dc46bbc6e5fd76b07a2034d3a5485a7cf99bf +SIZE (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 60616768 diff --git a/x11/nvidia-driver-390/distinfo b/x11/nvidia-driver-390/distinfo --- a/x11/nvidia-driver-390/distinfo +++ b/x11/nvidia-driver-390/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1743664922 +SHA256 (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 51db7d824e9f190a0bff792f520cab029a10c94aedf92ab267fb5916a2f272b0 +SIZE (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 65337455 +SHA256 (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 2553ea15568dea95714a8560075c84af8a797f290f2621fb6986d0d105bab247 +SIZE (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 65983616 diff --git a/x11/nvidia-driver-470/distinfo b/x11/nvidia-driver-470/distinfo --- a/x11/nvidia-driver-470/distinfo +++ b/x11/nvidia-driver-470/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1743664922 +SHA256 (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 40d787fae82d653893b08afac4e0ec37a88f37154406bfb13d02bfc986881f5c +SIZE (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 99491020 diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -14,7 +14,7 @@ PORTNAME?= nvidia-driver DISTVERSION?= ${NVIDIA_DISTVERSION} # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} @@ -33,6 +33,12 @@ # to end up depending on non existing libraries NO_SHLIB_REQUIRES_GLOB=*:32 +# Choose proper distinfo file using PKGNAMESUFFIX +# for slave ports +.ifdef PKGNAMESUFFIX +DISTINFO_FILE= ${.CURDIR}/distinfo +.endif + # Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and # obj/libEGL_nvidia.so.0 (see below) .if ${NVVERSION} >= 410.057 diff --git a/x11/nvidia-driver/Makefile.common b/x11/nvidia-driver/Makefile.common --- a/x11/nvidia-driver/Makefile.common +++ b/x11/nvidia-driver/Makefile.common @@ -29,13 +29,11 @@ # Target below can be used instead of standard `makesum' to correctly # update distinfo (i.e., keeping other driver version entries intact) -.if ${.TARGETS:Mupdate-distinfo} -DISTINFO_FILE= ${MASTERDIR}/distinfo.new -.endif +# This was somehow broken as TIMESTAMP line was not updated correctly +# (duplicated) and archs other than build host (i.e., i386 on amd64 +# host) cannot be updated. +# So switching to usual makesum on switching to separated distinfo, +# as DISTINFO?FILE is already set properly in ${MASTERDIR}/Makefile, +# keeping make target itself not to violate POLA. update-distinfo: makesum .SILENT - ${REINPLACE_CMD} -e '/${ARCH_SUFX}-${NVVERSION:R}/s/^/~/' \ - ${MASTERDIR}/distinfo - ${REINPLACE_CMD} -e '/^~SHA256/r ${DISTINFO_FILE}' -e '/^~/d' \ - ${MASTERDIR}/distinfo - ${RM} ${DISTINFO_FILE} ${MASTERDIR}/distinfo.bak diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo --- a/x11/nvidia-driver/distinfo +++ b/x11/nvidia-driver/distinfo @@ -1,17 +1,3 @@ TIMESTAMP = 1743664922 SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026 SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688 -SHA256 (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 40d787fae82d653893b08afac4e0ec37a88f37154406bfb13d02bfc986881f5c -SIZE (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 99491020 -SHA256 (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 51db7d824e9f190a0bff792f520cab029a10c94aedf92ab267fb5916a2f272b0 -SIZE (NVIDIA-FreeBSD-x86_64-390.157.tar.gz) = 65337455 -SHA256 (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 2553ea15568dea95714a8560075c84af8a797f290f2621fb6986d0d105bab247 -SIZE (NVIDIA-FreeBSD-x86-390.157.tar.gz) = 65983616 -SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f -SIZE (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = 61500286 -SHA256 (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 87b8523fb29e2bf51c2daf555e6dc46bbc6e5fd76b07a2034d3a5485a7cf99bf -SIZE (NVIDIA-FreeBSD-x86-340.108.tar.gz) = 60616768 -SHA256 (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 231693189e1bdf5c1dd02315cde5ef9ed6c0854564314438f2f40f9788a34120 -SIZE (NVIDIA-FreeBSD-x86_64-304.137.tar.gz) = 36474676 -SHA256 (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 5f874133853eacc5b9a10311cec22d3c4898db7f75b92bb6c12d5be5126516fb -SIZE (NVIDIA-FreeBSD-x86-304.137.tar.gz) = 35399011