From nobody Sun Sep 29 09:45:35 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 4XGfTC4HGhz5XQww; Sun, 29 Sep 2024 09:45:35 +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 4XGfTC3kkwz4BrJ; Sun, 29 Sep 2024 09:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727603135; 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=qtLzYlHzFlGt5ueTSnda4WGFkDPcjmO0v/Ft6yLCI+s=; b=wHDJTeMU8GsRgPRoriinfx0CJ0/pcZbkEoYxtbKETV/0giCMV2McfcEUeNxwMLivbl1/oy Wjhvz29OIltjoXYnFX06b4DROkB7oddKRiMGfAyGk8e2Gfu+3CDVdNYze/5T36xH8qmiy2 I2vQXMLKbrQ3Azk0WVYOZYUR46UM+flMoH4kTVaXed8zlkfg5deQh8/mYRkMmoKYve91jL cuspXu4FV93Zwo0mxQFuxUUDEqbpRigvn6q4PJ0KhSk/aPeSfxpIpA65VCKR4xG07J7t3Y jYRH2xzXTB1ImvC7elThZfFjAZgRQgTapJWTQOdimmykj8j7IOhAgdhxL5MTIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727603135; 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=qtLzYlHzFlGt5ueTSnda4WGFkDPcjmO0v/Ft6yLCI+s=; b=r3CzpvUvdgYC1LA1kYwQrmbOsFhFgjOby8iYUsnewbmHgghPVBADM3XYJlLJHhXHEDPDC8 liIt+5nND52DH+MJFGBwrDM48bdU/+pbzvlKzg5dTl/Wlfsk0aC6ED6EzgzP7hJJbm2FIS IzIPmxGO5/9WX+E3TgHLSJgIr1Phg0mQI0rEzL1XS1Erq7I3DfRRzmaVu/zWvdPngaMjGg ExFykv9QdVpQMRwYE7Pjm4hff8n2HGZAUUaklBd5cZ43PRUi8XV96V0oGMHoQJzgpODEWD PeOEUNjV8htr+C7AhXym/Rm61KonBJbCFyDdFKrkChrlPhspbJ6aqMCh3Heoag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727603135; a=rsa-sha256; cv=none; b=e5vjSpT6rBGVqWFJqO5bKm/PAX7d+jtTK/wdJzbZUefep3QDMV21JF7ohiSZl8mZiT2KNE nDAqc+f/x9Q+dk4fpoozUIP6w1kxejTHwO7ZY6mkvbbV1wwYwSknImKSJAVt2AFpzMo05p CZJEPVHZtA7ES4kOeSoRCxRJNwXAfP/leypXQ06OA2DZaXjsj1KmmKRtRIwHNYFQmyaBnc cVAa8n96WA4x7eIOdNxVA+2CfRPvO3stxicS5XG8ZhDavjF++ArURmFiySgnJaEo8lXjd1 LV1hCnMgJLhEQ6KB3JSHNeonwQ654OKt4944pxq/lXEiHbXIug3ovd09NnOeGg== 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 4XGfTC3CT0z13vn; Sun, 29 Sep 2024 09:45:35 +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 48T9jZhP055689; Sun, 29 Sep 2024 09:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48T9jZlv055686; Sun, 29 Sep 2024 09:45:35 GMT (envelope-from git) Date: Sun, 29 Sep 2024 09:45:35 GMT Message-Id: <202409290945.48T9jZlv055686@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: 50bae2203980 - main - graphics/nvidia-drm-{515,61}-kmod: Build fix stable/14 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: 50bae2203980aacc742dbf1f69bcb5ead7bad4eb Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=50bae2203980aacc742dbf1f69bcb5ead7bad4eb commit 50bae2203980aacc742dbf1f69bcb5ead7bad4eb Author: Tomoaki AOKI AuthorDate: 2024-09-29 09:44:25 +0000 Commit: Kevin Bowling CommitDate: 2024-09-29 09:44:25 +0000 graphics/nvidia-drm-{515,61}-kmod: Build fix stable/14 --- graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h | 2 +- graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h index 6809b4bfdfc0..2c0524341c4d 100644 --- a/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h +++ b/graphics/nvidia-drm-515-kmod/files/patch-nvidia-drm-conftest.h @@ -4,7 +4,7 @@ /* For nv_drm_gem_prime_force_fence_signal */ #ifndef spin_is_locked -+#if __FreeBSD_version < 1500018 ++#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) diff --git a/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h b/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h index 6809b4bfdfc0..2c0524341c4d 100644 --- a/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h +++ b/graphics/nvidia-drm-61-kmod/files/patch-nvidia-drm-conftest.h @@ -4,7 +4,7 @@ /* For nv_drm_gem_prime_force_fence_signal */ #ifndef spin_is_locked -+#if __FreeBSD_version < 1500018 ++#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)