From nobody Sun Aug 04 23:47:11 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wcbp82qK3z5S4t8; Sun, 04 Aug 2024 23:47:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wcbp76NFCz481B; Sun, 4 Aug 2024 23:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722815231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8TvaUKiG+FFkUC+ai6o2vWmixQ+bSpDUl+CZ7JrCxk0=; b=nxmxZ8UGIM1AjQa9QDj8JieLTK/QjMewyuix/9cB++J2EzuoN+Foxlw6Ly8nl7FKoHybhS xjzakHnr9o6rsyFXd4jUU2obBLPbv4038jCgsmNNPvS2Nq8WyLHHfdsPaiibA9r3hHdq76 8khT1NgzUJmkE2NqwnBs5HWdyEtijR/lVPPC5GBJVXSyYJOyV+BaUWxnbIrsMEA3kv2Ne4 T1N3OOlTKjzRHrW5PE1/yEoZUhxAi8feOCgCuOZjTcupM9Th+Q+5mHZjqSinuWy7P48DIr tVoc95P9jL6q55lZokrnyUGMvG30iA95Qr2CxlzlFX85nAZYWjs/Rd1QqJkP6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722815231; a=rsa-sha256; cv=none; b=QeLKhoTQwgN7ydFWa9Kk0kVE90eALLqdrim2bmanYvflKmT4u2GRAw5NFsG7+/yOk4mjCW u2wKltgd+AtFqHrjGdL+DGgs1c6irEsspnbiJqEowhkkj2+z1cppx90lmLYtv3Rm+zKOPY B4YeALQktT+ceVYgIIXVoHqbKaF/k722yBWz6erGad4cqsD5tCjJNNCPKEO+ff2qMM9+d4 5t48hL0Tc67a3ACeJ9VRQsWC2bMUUtqAP3KTvijiWE6kRjNHjqaVURG7/2xmvcclc9p4XD o00E9qAs+FDpmblPC2MbDoFIvFFpHx1Ua5T4RUjwpyIk5Rx4iYW98t+zX/+XDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722815231; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8TvaUKiG+FFkUC+ai6o2vWmixQ+bSpDUl+CZ7JrCxk0=; b=tzeXYnkkbjOnKuAjlQuFM0ZXaz8kpZEQWLy4drUgHWfvzV1UO8CFmbIf/06pl4bc+nKMX9 6+UdJ6YFagMzHIOsCVTieF03q5SbMVew63kuMZhVCgzV0lLfi2NMxa47l3EfETtAz5WueE +UZPEgQanN03Px/FSf0PumcxwUDCTKUMx9UstRsQmioC/jd//ZjUnWTtr8r6WyIpMaUYlX RCmJEZBMZ2+T6SbMvB3AafKsrgcJprIIFfv7Zw6XR01jYdPvvwo9bG3Pr2VVID6LZbBAYz hmCZPSqJD4T9hbj0aUe8PyuGkLfMuRaEfZ1E/4L/jPgupDP8HkxpoaOchK6vPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wcbp75rh0z1FrB; Sun, 4 Aug 2024 23:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 474NlBl1019067; Sun, 4 Aug 2024 23:47:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 474NlBSk019064; Sun, 4 Aug 2024 23:47:11 GMT (envelope-from git) Date: Sun, 4 Aug 2024 23:47:11 GMT Message-Id: <202408042347.474NlBSk019064@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 307f75413336 - main - graphics/nvidia-drm-kmod: prepare for 555 update List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 307f75413336d33a6570616e5e2af3b659e2951d Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=307f75413336d33a6570616e5e2af3b659e2951d commit 307f75413336d33a6570616e5e2af3b659e2951d Author: Austin Shafer AuthorDate: 2024-07-30 18:45:39 +0000 Commit: Charlie Li 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/