From nobody Tue Oct 29 18:39:03 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 4XdJtv2xzKz5bmTx; Tue, 29 Oct 2024 18:39:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XdJtv2S0tz40L1; Tue, 29 Oct 2024 18:39:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730227143; 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=1ODEFdWPoHxxF4cvYen/mwK1dQuoA293FchWheiznjI=; b=XrLgKJRX4WvBHMtpiWAAHjuNpVl8ypOL1XDQ0CH3IJRfgTHLhaHt6aNYYmCNi/UUxjPfPF ltKCUGBGTR1qPkTitVrQhGday4la42SupBvAwJlbYnutPqE4BkFn3a3dkRxHrVS/5ODxk+ 0xvfo7uKJWHPlh+i0Yoa5wMITFZ90KAbP5gr9kspVhRsSJOq8R32zvSb4I8ipSnEmSMvyq CeEGKUY2chB8AiouR+2SrwrenG5SFM0eQQptTV8nu6I1Mq+oGUZF+bxhxjRpMqfnuINrB3 aCBSf9+WBxYqKQseF+iSC+esy7J2mqXHryuRcz6vT3ge7ZQCE4RSklBUOjzktg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730227143; 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=1ODEFdWPoHxxF4cvYen/mwK1dQuoA293FchWheiznjI=; b=wfKHBb+qCP26yDKK4eziULZUMEMH9AOvRkz1gmpTvum/VnfZBq7K6G2XX2ejmc/ubP9/vk XCba9GJhLkUxqPu4ybSSqtCN6votvveffIsUtkRwoLj67rnbkFOz8+UmDelfBT0lOF0bIM tM/SooqDpnXHgnMMIHeYN8oPqH2YtXOQmvy0WLES8UWPknPJqwdHpvjoh5yCDTBk/vVWjY Q2xFswgfxxUmk/ZtNg2Ftktn6u3xEUolsso+xBtqWz+PxkmSGR0elnD+9b+qfWYsxwVP42 87+FfZrbsCFJtrwJ/ygTaTovwXyXRWgJ4L4mTmgWMW8NTdoFsXxnPjQgI2xryQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730227143; a=rsa-sha256; cv=none; b=FwlFfvdKicQ5nQz6xhdkTS6a1Z8zUtD30jc1+0TkVgF52lZj1JY/s4GcwfTMUyqxziKSoA RXuelE2WFyrYFri5DDCpqGd59u6JnZp7mVSVjGF/Oe9PYJitF5fpGrSdDpnIkbdsppJehe R2cjDjkiAf733zpQuIbFJGKwbQrfA9E2TvYTEwWYbKt6qkCI4XK4EOTKrALkSsqE6pcGE/ jBDZnm/+4YKhqtlT2SsHl6+PsZDsDmuGrOHIheCr0/MMgp6D90vc+EKMssjwomQmAjbvkm C87VE8cQHkd34oLeBFGheEgHXTdJQvX4KA3jein27M6Mq1HFnMy0T987o+9oxQ== 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 4XdJtv23KrzZZl; Tue, 29 Oct 2024 18:39:03 +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 49TId3gD099318; Tue, 29 Oct 2024 18:39:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49TId3FV099315; Tue, 29 Oct 2024 18:39:03 GMT (envelope-from git) Date: Tue, 29 Oct 2024 18:39:03 GMT Message-Id: <202410291839.49TId3FV099315@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: 4d5697a5022f - main - x11/nvidia-driver, linux-nvidia-libs, nvidia-drm: Update to 550.127.05 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: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4d5697a5022f9846836a0185bda68557fd6f364b Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=4d5697a5022f9846836a0185bda68557fd6f364b commit 4d5697a5022f9846836a0185bda68557fd6f364b Author: Tomoaki AOKI AuthorDate: 2024-10-29 18:24:07 +0000 Commit: Kevin Bowling CommitDate: 2024-10-29 18:37:31 +0000 x11/nvidia-driver, linux-nvidia-libs, nvidia-drm: Update to 550.127.05 Approved by: blanket, Austin Shafer PR: 282312 --- graphics/nvidia-drm-510-kmod/distinfo | 6 +++--- .../files/extra-patch-nvidia-drm-conftest.h} | 0 graphics/nvidia-drm-515-kmod/distinfo | 4 ++-- .../files/extra-patch-nvidia-drm-conftest.h} | 0 graphics/nvidia-drm-61-kmod/distinfo | 4 ++-- .../files/extra-patch-nvidia-drm-conftest.h | 14 ++++++++++++++ graphics/nvidia-drm-kmod/Makefile.common | 7 +++++++ x11/linux-nvidia-libs/Makefile | 15 ++++++++++++--- x11/linux-nvidia-libs/distinfo | 6 +++--- x11/nvidia-driver/Makefile.version | 2 +- x11/nvidia-driver/distinfo | 6 +++--- 11 files changed, 47 insertions(+), 17 deletions(-) diff --git a/graphics/nvidia-drm-510-kmod/distinfo b/graphics/nvidia-drm-510-kmod/distinfo index abc709fa60bb..acb84ed393aa 100644 --- a/graphics/nvidia-drm-510-kmod/distinfo +++ b/graphics/nvidia-drm-510-kmod/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1727593803 -SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e -SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952 +TIMESTAMP = 1729779540 +SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3 +SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432 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/files/patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-510-kmod/files/extra-patch-nvidia-drm-conftest.h similarity index 100% rename from graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h rename to graphics/nvidia-drm-510-kmod/files/extra-patch-nvidia-drm-conftest.h diff --git a/graphics/nvidia-drm-515-kmod/distinfo b/graphics/nvidia-drm-515-kmod/distinfo index beb33eae58d2..d62b49230fa7 100644 --- a/graphics/nvidia-drm-515-kmod/distinfo +++ b/graphics/nvidia-drm-515-kmod/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1729926280 -SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e -SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952 +SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3 +SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432 SHA256 (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = b48e104c3437ac6e8a58e734fe943281f43b31d9327d50457bb26d8a2106bf64 SIZE (freebsd-drm-kmod-drm_v5.15.160_1_GH0.tar.gz) = 26098489 diff --git a/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-conftest.h similarity index 100% rename from graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h rename to graphics/nvidia-drm-515-kmod/files/extra-patch-nvidia-drm-conftest.h diff --git a/graphics/nvidia-drm-61-kmod/distinfo b/graphics/nvidia-drm-61-kmod/distinfo index 8dc4b5369ed2..848238468490 100644 --- a/graphics/nvidia-drm-61-kmod/distinfo +++ b/graphics/nvidia-drm-61-kmod/distinfo @@ -1,5 +1,5 @@ TIMESTAMP = 1729926563 -SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e -SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952 +SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3 +SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432 SHA256 (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 0c28dc918dc16a103ac93ec8f7521145115e24f7c462595ce4433e1769708122 SIZE (freebsd-drm-kmod-drm_v6.1.92_2_GH0.tar.gz) = 37101285 diff --git a/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-conftest.h new file mode 100644 index 000000000000..2c0524341c4d --- /dev/null +++ b/graphics/nvidia-drm-61-kmod/files/extra-patch-nvidia-drm-conftest.h @@ -0,0 +1,14 @@ +--- nvidia-drm-conftest.h.orig 2024-02-22 01:03:15 UTC ++++ nvidia-drm-conftest.h +@@ -85,7 +85,11 @@ + + /* For nv_drm_gem_prime_force_fence_signal */ + #ifndef spin_is_locked ++#if ((__FreeBSD_version >= 1500000) && (__FreeBSD_version < 1500018)) || (__FreeBSD_version < 1401501) + #define spin_is_locked(lock) mtx_owned(lock.m) ++#else ++#define spin_is_locked(lock) mtx_owned(lock) ++#endif + #endif + + #ifndef rwsem_is_locked diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common index b9dc46449455..1194e9b396dc 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} < 565.00000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-conftest.h +.endif #565.00 + .if ${NVVERSION} < 555.04202 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-nvidia-drm-freebsd-lkpi.c .endif @@ -39,6 +43,9 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/20-nvidia-drm-outputclass.conf ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d/ post-patch: + # Workaround for LLVM/Clang19 + ${REINPLACE_CMD} -e '/DRMKMODDIR.*\/linuxkpi\/dummy\/include/d' \ + ${WRKSRC}/Makefile # We should support -CURRENT: kill the check (first #if __FreeBSD_version) linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \ ${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \ diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile index 3fe7d7798371..a20dcac257e7 100644 --- a/x11/linux-nvidia-libs/Makefile +++ b/x11/linux-nvidia-libs/Makefile @@ -129,7 +129,11 @@ LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION} .endif -.if ${NVVERSION} >= 550.00000 # 550.00 +.if ${NVVERSION} >= 565.00000 # 565.00 +LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.17 +LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.17 libnvidia-egl-wayland.so.1 +PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.17/' +.elif ${NVVERSION} >= 550.00000 # 550.00 LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.13 LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.13 libnvidia-egl-wayland.so.1 PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.13/' @@ -290,7 +294,12 @@ LINUX32_LIBS+= libnvidia-gpucomp.so.${PORTVERSION} .else PLIST_RE+= '\,${LINUXBASE}.*libnvidia-gpucomp\.so,d' .endif # 545.00 -.if ${NVVERSION} >= 550.00000 # 550.00 +.if ${NVVERSION} >= 565.00000 # 565.00 +LINUX_LIBS+= libnvidia-egl-gbm.so.1.1.2 +LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so.1 \ + libnvidia-egl-gbm.so.1.1.2 libnvidia-egl-gbm.so +PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.2/' +.elif ${NVVERSION} >= 550.00000 # 550.00 LINUX_LIBS+= libnvidia-egl-gbm.so.1.1.1 LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so.1 \ libnvidia-egl-gbm.so.1.1.1 libnvidia-egl-gbm.so @@ -300,7 +309,7 @@ LINUX_LIBS+= libnvidia-egl-gbm.so.1.1.0 LINUX_LINKS+= libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so.1 \ libnvidia-egl-gbm.so.1.1.0 libnvidia-egl-gbm.so PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-gbm\.so)\.X/\1.1.1.0/' -.endif # 550.00 +.endif # 565.00 .if ${NVVERSION} >= 525.08902 # 525.89.02 LINUX_LIBS+= libnvoptix.so.${PORTVERSION} \ libnvidia-nvvm.so.${PORTVERSION} \ diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo index 2deda76487a2..6141edfc2152 100644 --- a/x11/linux-nvidia-libs/distinfo +++ b/x11/linux-nvidia-libs/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1727593735 -SHA256 (NVIDIA-Linux-x86_64-550.120.run) = 801928274753ccce7627098ea078cc37070ddae04de3aa084591c05fc7035697 -SIZE (NVIDIA-Linux-x86_64-550.120.run) = 307064664 +TIMESTAMP = 1729779155 +SHA256 (NVIDIA-Linux-x86_64-550.127.05.run) = d384f34f5d2a896bd7536d3deb6a6d973d8094a3ad485a1c2ee3bf5192086ae9 +SIZE (NVIDIA-Linux-x86_64-550.127.05.run) = 307139930 SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640 SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700 SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c diff --git a/x11/nvidia-driver/Makefile.version b/x11/nvidia-driver/Makefile.version index 51a725215671..03d4d5525224 100644 --- a/x11/nvidia-driver/Makefile.version +++ b/x11/nvidia-driver/Makefile.version @@ -1,4 +1,4 @@ # NVIDIA Distversion # # This will be included from x11/nvidia-driver and the nvidia-drm port -NVIDIA_DISTVERSION = 550.120 +NVIDIA_DISTVERSION = 550.127.05 diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo index 21ddd102bf53..8243d14c80f8 100644 --- a/x11/nvidia-driver/distinfo +++ b/x11/nvidia-driver/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1727593598 -SHA256 (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 9e2bb3dc93be5da6abe0c78621120e71dfcc0973577c9e63386e9a582501147e -SIZE (NVIDIA-FreeBSD-x86_64-550.120.tar.xz) = 143460952 +TIMESTAMP = 1729779540 +SHA256 (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 74557d328ad74f604599ee2df3d42defc86ebe231e7cbe99c860f928f16a0bc3 +SIZE (NVIDIA-FreeBSD-x86_64-550.127.05.tar.xz) = 143641432 SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607 SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576 SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84