Date: Sun, 4 Aug 2024 23:47:11 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 307f75413336 - main - graphics/nvidia-drm-kmod: prepare for 555 update Message-ID: <202408042347.474NlBSk019064@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=307f75413336d33a6570616e5e2af3b659e2951d commit 307f75413336d33a6570616e5e2af3b659e2951d Author: Austin Shafer <ashafer@badland.io> AuthorDate: 2024-07-30 18:45:39 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2024-08-04 23:46:00 +0000 graphics/nvidia-drm-kmod: prepare for 555 update This makes a patch ignored on the newer 555 versions, which now ship with it. Also match the behavior or nvidia-drm-kmod to drm-kmod, selecting drm-61-kmod on 14. Differential Revision: https://reviews.freebsd.org/D45400 --- ...vidia-drm-freebsd-lkpi.c => extra-patch-nvidia-drm-freebsd-lkpi.c} | 0 ...vidia-drm-freebsd-lkpi.c => extra-patch-nvidia-drm-freebsd-lkpi.c} | 0 ...vidia-drm-freebsd-lkpi.c => extra-patch-nvidia-drm-freebsd-lkpi.c} | 0 graphics/nvidia-drm-kmod/Makefile | 4 ++-- graphics/nvidia-drm-kmod/Makefile.common | 4 ++++ 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/graphics/nvidia-drm-510-kmod/files/patch-nvidia-drm-freebsd-lkpi.c b/graphics/nvidia-drm-510-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c similarity index 100% rename from graphics/nvidia-drm-510-kmod/files/patch-nvidia-drm-freebsd-lkpi.c rename to graphics/nvidia-drm-510-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c diff --git a/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-freebsd-lkpi.c b/graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c similarity index 100% rename from graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-freebsd-lkpi.c rename to graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c diff --git a/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-freebsd-lkpi.c b/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c similarity index 100% rename from graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-freebsd-lkpi.c rename to graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-freebsd-lkpi.c diff --git a/graphics/nvidia-drm-kmod/Makefile b/graphics/nvidia-drm-kmod/Makefile index 81341a2e8349..eb16697ffb65 100644 --- a/graphics/nvidia-drm-kmod/Makefile +++ b/graphics/nvidia-drm-kmod/Makefile @@ -18,9 +18,9 @@ IGNORE= not supported on anything but FreeBSD (missing linuxkpi function RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod . elif ${OSVERSION} >= 1400097 && (${ARCH} == i386 || ${ARCH} == aarch64) RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-510-kmod -. elif ${OSVERSION} >= 1400097 && ${OSVERSION} < 1500008 +. elif ${OSVERSION} >= 1400097 && ${OSVERSION} < 1400508 RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-515-kmod -. elif ${OSVERSION} >= 1500008 +. elif ${OSVERSION} >= 1400508 RUN_DEPENDS+= ${KMODDIR}/nvidia-drm.ko:graphics/nvidia-drm-61-kmod . endif .endif diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common index 87251dad9970..b9dc46449455 100644 --- a/graphics/nvidia-drm-kmod/Makefile.common +++ b/graphics/nvidia-drm-kmod/Makefile.common @@ -30,6 +30,10 @@ MAKE_ENV+= DEBUG_FLAGS=${DEBUG_FLAGS} \ WRKSRC= ${WRKDIR}/NVIDIA-FreeBSD-${ARCH_SUFX}-${NVIDIA_DISTVERSION}/ WRKSRC_SUBDIR= src/nvidia-drm/ +.if ${NVVERSION} < 555.04202 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c +.endif + 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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408042347.474NlBSk019064>