From nobody Tue Sep 02 12:07:03 2025 X-Original-To: dev-commits-ports-all@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 4cGPcR34Nsz66cL3; Tue, 02 Sep 2025 12:07: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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cGPcR2R4nz3S48; Tue, 02 Sep 2025 12:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756814823; 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=TYSr3dWrkHHVVk0GKwg4CYsj6gOQBhJQSGCV0Ky5gmk=; b=SojvgsacrJR00nWzRVpyLeOwVKPky6mr8+bl5GX2rr7L+2/eFkPePEZ27ATpqM8Fw+NLvi jiS0FICdFx/miDiLoznBgj2qpEgbuz+HTZ2J3f9atLWoigp3HtIqmhlIvRVnCUc4aDwOHG K91/aH4xA6dE8qE25tCdsTcmXzT/QAD8g4jRWL4AzVqB2NnS2ZoejMQwt6AKdFNYCEnSe5 l8O8bxHDE4R/iLzO6dehsgoOByBMupJ1O7uUdA846AAftwr2d1dgHFO1gHooBbvZiKs3h4 ORkP8QjEDQUTeunZDq4wmgFkLtA8gTMgCR9lUeLC6w9KwJ2A+jfJPXBFx0H+hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756814823; 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=TYSr3dWrkHHVVk0GKwg4CYsj6gOQBhJQSGCV0Ky5gmk=; b=hJdME5DD5ZDRdF2j6+RS7t0rHorLAlLLBDbsaahytMlvDJTZBVLdljXSOvGqpUjXFyiBAz VQiwkAffFNtFQ97tmISVGd+z7qkHlq5vK21VPB6i1JvLX8DcJiQBhe6P82fJaNf/QkudTO X9LbvBk2x5m/6CUw7SbMV2cfOkb/WUs3NHCs+fFzni7TL1JvOAVG+kYIkxu8B5KfOeInI0 clRBdGksNQbVqBMmSPTLSMSsKYeYFwFL4OxnI3rfm/2FnUdKhoq622N90iZS7LjmJ7Dqy1 03UJzBzcko1ouZKSVSOIbBYGeNeWcQoVZeqGLZjIdD0taoX5uVeaOsbMsvO+GA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756814823; a=rsa-sha256; cv=none; b=HlngIMjbloID3eVrxGTxZDIcylWRZJ1FuV3jjgjGDYH08VtatIp1xhclNkIv0nb2MfktCv NRQZUQzRl9QGtVLFLKfkCV55rg2SxPu4rUSsTzg0qU/PrADtzBuDU2vnvhqrUELBDJJPr5 vTGWmGWwGUSA4rIKJL9AoBpd5eQTDQmvsq5osXTlFI9cyqoGvRiCwhTMNhtFSXLSdEKr8l ixWYwa6vlGOZP7Y3uNu5A7HnrTpJk/HW+OkLwnQTO7CqhFm8M1xZe83b+KOUPzVS7/tILS a9REaq33LYEiQy7TBrvZPpbwCBSBhOFxB2bxXRagxEU/pr/jojHNRyFBqXfSFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cGPcR1yRZzl5j; Tue, 02 Sep 2025 12:07: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 582C73W9098291; Tue, 2 Sep 2025 12:07:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 582C731o098288; Tue, 2 Sep 2025 12:07:03 GMT (envelope-from git) Date: Tue, 2 Sep 2025 12:07:03 GMT Message-Id: <202509021207.582C731o098288@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 7fb8879d2796 - main - x11/linux-nvidia-libs: fix packaging for 32bit libs (+) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fb8879d27960e3043251ff08703d702c3b6c621 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fb8879d27960e3043251ff08703d702c3b6c621 commit 7fb8879d27960e3043251ff08703d702c3b6c621 Author: Dima Panov AuthorDate: 2025-09-02 12:06:19 +0000 Commit: Dima Panov CommitDate: 2025-09-02 12:06:19 +0000 x11/linux-nvidia-libs: fix packaging for 32bit libs (+) Reported by: bulk -t Approved by: portmgr blanket --- x11/linux-nvidia-libs/Makefile | 2 ++ x11/linux-nvidia-libs/pkg-plist | 2 ++ 2 files changed, 4 insertions(+) diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile index 708beb3439b2..498ada9909e6 100644 --- a/x11/linux-nvidia-libs/Makefile +++ b/x11/linux-nvidia-libs/Makefile @@ -168,6 +168,8 @@ LINUX_LINKS+= libnvidia-egl-wayland.so.${NV_EGL_W_VERSION} libnvidia-egl-wayla . if ${NVVERSION} >= 570.12400 # 570.124 added 32bit version supports LINUX32_LIBS+= libnvidia-egl-wayland.so.${NV_EGL_W_VERSION} LINUX32_LINKS+= libnvidia-egl-wayland.so.${NV_EGL_W_VERSION} libnvidia-egl-wayland.so.1 +.else +PLIST_RE+= '\,${LINUXBASE}.*lib\/libnvidia-egl-wayland\.so,d' . endif # 570.124 PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.${NV_EGL_W_VERSION}/' .else diff --git a/x11/linux-nvidia-libs/pkg-plist b/x11/linux-nvidia-libs/pkg-plist index e0fb55446692..2964641d60e3 100644 --- a/x11/linux-nvidia-libs/pkg-plist +++ b/x11/linux-nvidia-libs/pkg-plist @@ -48,6 +48,8 @@ %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-gbm.so %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-gbm.so.1 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-gbm.so.X +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-wayland.so.1 +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-wayland.so.X %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xcb.so %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xcb.so.1 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-egl-xcb.so.X