4 files changed, 16 insertions, 1 deletions
diff --git a/multimedia/libva-nvidia-driver/Makefile b/multimedia/libva-nvidia-driver/Makefile
index e6ee6c08c04f..70c88522f136 100644
--- a/multimedia/libva-nvidia-driver/Makefile
+++ b/multimedia/libva-nvidia-driver/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libva-nvidia-driver
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.0.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/multimedia/libva-nvidia-driver/pkg-message b/multimedia/libva-nvidia-driver/pkg-message
index 3709e7625098..892aab5d7693 100644
--- a/multimedia/libva-nvidia-driver/pkg-message
+++ b/multimedia/libva-nvidia-driver/pkg-message
@@ -7,6 +7,8 @@ To use VA-API in apps like Firefox make sure DRM and CUDA are enabled e.g.,
    # sysrc kld_list+=nvidia-drm
    # service kld restart
    $ test -e /dev/dri/renderD* || bsddialog --title Error --msgbox "nvidia-drm-kmod failed" 0 0
+   $ test -n "$WAYLAND_DISPLAY" || export LIBVA_DRIVER_NAME=nvidia-drm
+   $ test -n "$WAYLAND_DISPLAY" || setenv LIBVA_DRIVER_NAME nvidia-drm
    $ nv-sglrun vainfo
    $ nv-sglrun firefox
 
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;