From nobody Sat Jul 05 10:32:58 2025 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 4bZ6K72jyxz61dMF; Sat, 05 Jul 2025 10:32:59 +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 4bZ6K65FX8z3nT5; Sat, 05 Jul 2025 10:32:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751711578; 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=qhQPImIdxizAKr6bn1/sDac3bsEPiPuGmqZ0dKXiThU=; b=qJDJNhz4zgj983bRB8Q5VYor8ToFim3HroPQSDCnmaUjrE/K1iQwFWhnPFpwmuu77uM3Dd eDgfOa1qaIJtrzLtOSwFXkbsGxWzwrQnxoBCnB74/Uam7GnfmGK7fBSeuRHkfWG0unqOaL 07Y2CZlENWxn6rjEwFLiK0NFqZLed+fVkapuNDSLyW347ey8N9ZRxln72UKl9HOAW4f9OL KKDcO9t4G51sNR4la7+4IbNm0KZvtWbJxewAomTziyh6p6zc3A61oHsa2Z7AtLvZ4A2GAU Vnkx724T5SBbN0RBV2LnfqBWq5FC+ayhoLsjB32yP1ng3Sa3jD5mnmHR6coamQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751711578; 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=qhQPImIdxizAKr6bn1/sDac3bsEPiPuGmqZ0dKXiThU=; b=P9aQhl7rc4/VtC4f45j6rPHCXGjoXtOlvU6E/OPoiMcFYVRSmfx88J0G06QLlNPL6N/bIh FQz1HmZtZhF0q6+LooaIGeYfUTtuKdke7KPRl8q+hIDdLO5SuQO0XLRAMjUPgGEn/fQ6/v SDlpG0ZpfoEZdwHqLFV1On80Wxd9zzAsAEJNX3YRybFz84tnN8zeITf1403FtNyd+CxzxA BlOh9ZPoZU3OYG56pimEFr2G5lDkR+dOmroMF6yCJ/rweSL0bMcdnrj0kT92AuCk98o+oV TziTcl5pzj06uQfAlpGFdbDscL/Qfi9z9Purb/A5iyQIuyuYOnnzqUrHdpf00Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751711578; a=rsa-sha256; cv=none; b=o4VXhDBIE3wF/2SA0Ea3MIPlOospD2VQkXo05XFJdaDnh8bAjPAffMLwpnS1AuM9IWLkLC jXTeZ+XucQKIlwZEF91Z1EYVSpWy5iFKrCgB2gLi/dyRBUVQoQvuH3LyJ7wvW0gWBrmLed Oh+f5H4xv3204pdohL0qCg55kzBi5dBlacIF1gOMRCqp8soQi4ESOMKFWnf8q6vLgT8XZH bqdDDY/DPCLraeK4XwfIN++S9WUUPFODgB3MnFM1oHKfDptsQrSmCKE0McHDc8xtMyCq4Q tYR0LmUld45aFGpQAUsJGaszGoLdrKKhefeqipWscNFxzOoMpqWO0xsHIzMYnQ== 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 4bZ6K63ggLzYB6; Sat, 05 Jul 2025 10:32:58 +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 565AWwhQ095092; Sat, 5 Jul 2025 10:32:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 565AWw3v095089; Sat, 5 Jul 2025 10:32:58 GMT (envelope-from git) Date: Sat, 5 Jul 2025 10:32:58 GMT Message-Id: <202507051032.565AWw3v095089@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 6a391a807ce8 - main - multimedia/libva: fix default LIBVA_DRIVER_NAME with nvidia-drm.ko 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a391a807ce892476d15888de7494dc9768829a1 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a391a807ce892476d15888de7494dc9768829a1 commit 6a391a807ce892476d15888de7494dc9768829a1 Author: Jan Beich AuthorDate: 2025-07-05 10:19:21 +0000 Commit: Jan Beich CommitDate: 2025-07-05 10:32:41 +0000 multimedia/libva: fix default LIBVA_DRIVER_NAME with nvidia-drm.ko In order to support both libva-vdpau-driver and libva-nvidia-driver on NVIDIA GPUs let libva-drm get driver name from kernel DRM driver. libva-nvidia-driver uses DRI2 instead of DRM, so not affected. libva info: Trying to open /usr/local/lib/dri/nvidia_drv_video.so libva info: va_openDriver() returns -1 vaInitialize failed with error code -1 (unknown libva error),exit Reported by: rhurlin Regressed by: https://github.com/intel/libva/commit/5dae76daad3f --- multimedia/libva/Makefile | 1 + multimedia/libva/files/patch-nvidia-drm | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 8d089702416b..ee83c8fc4727 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -1,5 +1,6 @@ PORTNAME= libva DISTVERSION= 2.22.0 +PORTREVISION= 1 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/multimedia/libva/files/patch-nvidia-drm b/multimedia/libva/files/patch-nvidia-drm new file mode 100644 index 000000000000..da6a5acf0e03 --- /dev/null +++ b/multimedia/libva/files/patch-nvidia-drm @@ -0,0 +1,12 @@ +- Avoid conflict between libva-nvidia-driver and libva-vdpau-driver + +--- va/drm/va_drm_utils.c.orig 2024-06-20 06:49:27 UTC ++++ va/drm/va_drm_utils.c +@@ -65,7 +65,6 @@ VA_DRM_GetDriverNames(VADriverContextP ctx, char **dri + { "radeon", { "r600", "radeonsi" } }, // Mesa Gallium + { "amdgpu", { "radeonsi" } }, // Mesa Gallium + { "WSL", { "d3d12" } }, // Mesa Gallium +- { "nvidia-drm", { "nvidia" } }, // Unofficial NVIDIA + }; + + const struct drm_state * const drm_state = ctx->drm_state;