From: Jeroen Roovers <jer@gentoo.org>
Date: Fri, 20 Jan 2017 10:07:08 +0000 (+0100)
Subject: x11-drivers/nvidia-drivers: Install 10_nvidia.json 10_nvidia_wayland.json by walterco... 
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8ebb593eea941ca9fd730d23bb9ae9178601ee80;p=gentoo.git

x11-drivers/nvidia-drivers: Install 10_nvidia.json 10_nvidia_wayland.json by waltercool (bug #606584).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild
similarity index 98%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r2.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild
index e01d187ebd19..5e05f9e7206c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-375.26-r3.ebuild
@@ -308,6 +308,14 @@ src_install() {
 			insinto /usr/share/X11/xorg.conf.d
 			newins {,50-}nvidia-drm-outputclass.conf
 		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia_wayland.json
 	fi
 
 	# OpenCL ICD for NVIDIA
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild
index 1a63f6618967..5daae3070778 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-378.09.ebuild
@@ -306,6 +306,14 @@ src_install() {
 			insinto /usr/share/X11/xorg.conf.d
 			newins {,50-}nvidia-drm-outputclass.conf
 		fi
+
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia.json
+	fi
+
+	if use wayland; then
+		insinto /usr/share/glvnd/egl_vendor.d
+		doins ${NV_X11}/10_nvidia_wayland.json
 	fi
 
 	# OpenCL ICD for NVIDIA