From cc03f7e1da0924174419d506de32e672e7d26522 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Thu, 23 Jan 2020 18:29:38 +0300
Subject: [PATCH 1/4] module-nvidia-current add dep

---
 kernel/drivers/module-nvidia-current/pspec.xml | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/kernel/drivers/module-nvidia-current/pspec.xml b/kernel/drivers/module-nvidia-current/pspec.xml
index 01e33e4205..8c10c4ac88 100644
--- a/kernel/drivers/module-nvidia-current/pspec.xml
+++ b/kernel/drivers/module-nvidia-current/pspec.xml
@@ -104,6 +104,8 @@
             <Dependency>libX11</Dependency>
             <Dependency>mesa</Dependency>
             <Dependency>xorg-server</Dependency>
+            <Dependency>opencl-icd</Dependency>
+            <Dependency>vulkan</Dependency>
             <AnyDependency>
                 <Dependency version="current">module-nvidia-current</Dependency>
                 <Dependency>nvidia-current-dkms</Dependency>
@@ -125,7 +127,7 @@
         </BuildFlags>
     </Package>
 
-    <!--Package>
+    <Package>
     <Name>xorg-video-nvidia-current-32bit</Name>
     <PartOf>emul32</PartOf>
     <Summary>32-bit shared libraries for xorg-video-nvidia-current</Summary>
@@ -138,14 +140,9 @@
         <Dependency>mesa-32bit</Dependency>
         <Dependency>libX11-32bit</Dependency>
         <Dependency>libXext-32bit</Dependency>
+        <Dependency>vulkan-32bit</Dependency>
+        <Dependency>opencl-icd-32bit</Dependency>
         <Dependency release="current">xorg-video-nvidia-current</Dependency>
-        <Dependency>atk</Dependency>
-        <Dependency>gtk2</Dependency>
-        <Dependency>gtk3</Dependency>
-        <Dependency>cairo</Dependency>
-        <Dependency>glib2</Dependency>
-        <Dependency>pango</Dependency>
-        <Dependency>gdk-pixbuf</Dependency>
     </RuntimeDependencies>
     <Files>
         <Path fileType="library">/usr/lib32</Path>
@@ -154,7 +151,7 @@
     <BuildFlags>
         <Flag>noDelta</Flag>
     </BuildFlags>
-    </Package-->
+    </Package>
 
     <Package>
         <Name>nvidia-current-dkms</Name>

From c1ecd24a89293540a8a444c32a73e2df7c495234 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Thu, 23 Jan 2020 18:33:44 +0300
Subject: [PATCH 2/4] module-nvidia390 add dep

---
 kernel/drivers/module-nvidia390/actions.py | 8 ++++----
 kernel/drivers/module-nvidia390/pspec.xml  | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/kernel/drivers/module-nvidia390/actions.py b/kernel/drivers/module-nvidia390/actions.py
index 54588e03d0..097510826d 100644
--- a/kernel/drivers/module-nvidia390/actions.py
+++ b/kernel/drivers/module-nvidia390/actions.py
@@ -97,7 +97,7 @@ def install():
     pisitools.dolib("libGL.so.%s" % version, nvlibdir)
 #    pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1.2.0" % nvlibdir)
     pisitools.dosym("libGL.so.%s" % version, "%s/libGL.so.1" % nvlibdir)
-    pisitools.dolib("libGL.so.%s" % version, libdir)
+    #pisitools.dolib("libGL.so.%s" % version, libdir)
     
     pisitools.dolib("libEGL.so.1.1.0", nvlibdir)
     pisitools.dosym("libEGL.so.1.1.0", "%s/libEGL.so.1" % nvlibdir)
@@ -110,9 +110,9 @@ def install():
     pisitools.dolib("libnvidia-compiler.so.%s" % version, libdir)
     pisitools.dosym("libnvidia-compiler.so.%s" % version, "%s/libnvidia-compiler.so.1" % libdir)
     
-    pisitools.dolib("libOpenCL.so.1.0.0", libdir)
-    pisitools.dosym("libOpenCL.so.1.0.0", "%s/libOpenCL.so.1.0" % libdir)
-    pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir)
+    #pisitools.dolib("libOpenCL.so.1.0.0", libdir)
+    #pisitools.dosym("libOpenCL.so.1.0.0", "%s/libOpenCL.so.1.0" % libdir)
+    #pisitools.dosym("libOpenCL.so.1.0", "%s/libOpenCL.so.1" % libdir)
     
     pisitools.dolib("libnvidia-opencl.so.%s" % version, libdir)
     pisitools.dosym("libnvidia-opencl.so.%s" % version, "%s/libnvidia-opencl.so.1" % libdir)
diff --git a/kernel/drivers/module-nvidia390/pspec.xml b/kernel/drivers/module-nvidia390/pspec.xml
index 3434e0d094..e428318bc0 100644
--- a/kernel/drivers/module-nvidia390/pspec.xml
+++ b/kernel/drivers/module-nvidia390/pspec.xml
@@ -73,6 +73,9 @@
             <Dependency>libX11</Dependency>
             <Dependency>mesa</Dependency>
             <Dependency>xorg-server</Dependency>
+            <Dependency>vulkan</Dependency>
+            <Dependency>opencl-icd</Dependency>
+            <Dependency>libglvnd</Dependency>
             <AnyDependency>
                 <Dependency version="current">module-nvidia390</Dependency>
                 <Dependency>nvidia390-dkms</Dependency>
@@ -110,6 +113,9 @@
             <Dependency>mesa-32bit</Dependency>
             <Dependency>libX11-32bit</Dependency>
             <Dependency>libXext-32bit</Dependency>
+            <Dependency>opencl-icd-32bit</Dependency>
+            <Dependency>vulkan-32bit</Dependency>
+            <Dependency>libglvnd-32bit</Dependency>
             <Dependency release="current">xorg-video-nvidia390</Dependency>
             <Dependency>atk</Dependency>
             <Dependency>gtk2</Dependency>

From ab25794ce6d6730ee4d75a3f9de7d3d3569d71d2 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Thu, 23 Jan 2020 18:35:21 +0300
Subject: [PATCH 3/4] module-nvidia430 add dep

---
 kernel/drivers/module-nvidia430/pspec.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/kernel/drivers/module-nvidia430/pspec.xml b/kernel/drivers/module-nvidia430/pspec.xml
index 5668625c2d..320ca0f9f6 100644
--- a/kernel/drivers/module-nvidia430/pspec.xml
+++ b/kernel/drivers/module-nvidia430/pspec.xml
@@ -13,7 +13,7 @@
         <Description>NVIDIA graphics drivers provide optimized 2D/3D performance.</Description>
         <Archive sha1sum="3ff62a457f2570eb67c3ce7fb3800ddcbe54164e" type="binary">http://http.download.nvidia.com/XFree86/Linux-x86_64/430.64/NVIDIA-Linux-x86_64-430.64.run</Archive>
         <BuildDependencies>
-            <Dependency version="5.4.2">kernel-module-headers</Dependency>
+            <Dependency version="5.4.10">kernel-module-headers</Dependency>
             <Dependency>libX11-devel</Dependency>
             <Dependency>gtk2-devel</Dependency>
             <Dependency>gtk3-devel</Dependency>
@@ -28,7 +28,7 @@
         <IsA>driver</IsA>
         <Summary>Kernel module for current NVIDIA graphics driver releases</Summary>
         <RuntimeDependencies>
-            <Dependency version="5.4.2">kernel</Dependency>
+            <Dependency version="5.4.10">kernel</Dependency>
 <!--             <Dependency release="current">module-nvidia430-userspace</Dependency> -->
         </RuntimeDependencies>
         <Files>
@@ -112,7 +112,8 @@
             <Dependency>mesa</Dependency>
             <Dependency>xorg-server</Dependency>
             <Dependency>opencl-icd</Dependency>
-            <Dependency>vulkan</Dependency>         
+            <Dependency>vulkan</Dependency>
+            <Dependency>libglvnd</Dependency>         
             <AnyDependency>
                 <Dependency version="current">module-nvidia430</Dependency>
                 <Dependency>nvidia430-dkms</Dependency>
@@ -147,6 +148,7 @@
             <Dependency>libXext-32bit</Dependency>
             <Dependency>opencl-icd-32bit</Dependency>
             <Dependency>vulkan-32bit</Dependency>
+            <Dependency>libglvnd-32bit</Dependency>
             <Dependency release="current">xorg-video-nvidia430</Dependency>
             <Dependency>atk</Dependency>
             <Dependency>gtk2</Dependency>

From ec077546666f0e5b994ffa852827e1e9bb15f496 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Thu, 23 Jan 2020 18:35:40 +0300
Subject: [PATCH 4/4] module-nvidia390 fix dep

---
 kernel/drivers/module-nvidia390/pspec.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/drivers/module-nvidia390/pspec.xml b/kernel/drivers/module-nvidia390/pspec.xml
index e428318bc0..7d9c0868eb 100644
--- a/kernel/drivers/module-nvidia390/pspec.xml
+++ b/kernel/drivers/module-nvidia390/pspec.xml
@@ -17,7 +17,7 @@
             <AdditionalFile owner="root" permission="0644" target="dkms.conf">dkms.conf</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
-            <Dependency version="5.4.2">kernel-module-headers</Dependency>
+            <Dependency version="5.4.10">kernel-module-headers</Dependency>
             <Dependency>libX11-devel</Dependency>
             <Dependency>gtk2-devel</Dependency>
             <Dependency>gtk3-devel</Dependency>
@@ -29,7 +29,7 @@
         <IsA>driver</IsA>
         <Summary>Kernel module for current NVIDIA graphics driver releases</Summary>
         <RuntimeDependencies>
-            <Dependency version="5.4.2">kernel</Dependency>
+            <Dependency version="5.4.10">kernel</Dependency>
 <!--             <Dependency release="current">module-nvidia-current-userspace</Dependency> -->
         </RuntimeDependencies>
         <Files>