Attachment 10248 Details for Bug 23221 – Patch for the spec file

[patch] Patch for the spec file

nvidia-current.spec.patch (text/plain), 4.90 KB, created by Oleg Bosis on 2018-06-23 12:57:46 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Bosis

Created: 2018-06-23 12:57:46 CEST

Size: 4.90 KB

patch

obsolete

>--- nvidia-current.spec.orig	2018-05-17 15:19:44.000000000 +0300
>+++ nvidia-current.spec	2018-06-23 12:39:39.000000000 +0300
>@@ -19,8 +19,8 @@
> 
> %if !%simple
> # When updating, please add new ids to ldetect-lst (merge2pcitable.pl)
>-%define version		390.59
>-%define rel		1
>+%define version		390.67
>+%define rel		0.1
> # the highest supported videodrv abi (currently xorg 1.20)
> %define videodrv_abi	24
> %endif
>@@ -79,7 +79,7 @@
> # Other packages should not require any NVIDIA libraries, and this package
> # should not be pulled in when libGL.so.1 is required
> %global __provides_exclude \\.so
>-%global common__requires_exclude ^libGL\\.so|^libGLcore\\.so|^libGLdispatch\\.so|^libnvidia.*\\.so
>+%global common__requires_exclude ^libGL\\.so|^libGLX\\.so|^libGLcore\\.so|^libGLdispatch\\.so|^libnvidia.*\\.so
> 
> %ifarch %{biarches}
> # (anssi) Allow installing of 64-bit package if the runtime dependencies
>@@ -532,14 +532,14 @@
> 		;;
> 	EGL_CLIENT_LIB)
> 		parseparams arch libtype
>-		# (tmb) skip for now
>-		case $libtype in NON_GLVND);; *) continue; esac
>+		# (Oleg) install both NON_GLVND and GLVND binaries
>+		case $libtype in NON_GLVND|GLVND);; *) continue; esac
> 		install_file nvidia $nvidia_libdir
> 		;;
> 	EGL_CLIENT_SYMLINK)
> 		parseparams arch dest libtype
>-		# (tmb) skip for now
>-		case $libtype in NON_GLVND);; *) continue; esac
>+		# (Oleg) skip NON_GLVND symlinks
>+		case $libtype in GLVND);; *) continue; esac
> 		install_lib_symlink nvidia $nvidia_libdir
> 		;;
> 	EGL_EXTERNAL_PLATFORM_JSON)
>@@ -575,14 +575,14 @@
> 		;;
> 	GLX_CLIENT_LIB)
> 		parseparams arch libtype
>-		# (tmb) skip for now
>-		case $libtype in NON_GLVND);; *) continue; esac
>+		# (Oleg) install both GLVND and NON_GLVND binaries
>+		case $libtype in NON_GLVND|GLVND);; *) continue; esac
> 		install_file nvidia $nvidia_libdir
> 		;;
> 	GLX_CLIENT_SYMLINK)
> 		parseparams arch dest libtype
>-		# (tmb) skip for now
>-		case $libtype in NON_GLVND);; *) continue; esac
>+		# (Oleg) skip NON_GLVND symlinks
>+		case $libtype in GLVND);; *) continue; esac
> 		install_lib_symlink nvidia $nvidia_libdir
> 		;;
> 	NVCUVID_LIB)
>@@ -976,6 +976,9 @@
> 
> export EXCLUDE_FROM_STRIP="$(find %{buildroot} -type f \! -name nvidia-settings \! -name nvidia-xconfig \! -name nvidia-modprobe \! -name nvidia-persistenced \! -name 'libnvidia-gtk*.so')"
> 
>+sed -i 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' %{buildroot}%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json.template
>+mv %{buildroot}%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json.template %{buildroot}%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json
>+
> %post -n %{driverpkgname}
> # XFdrake used to generate an nvidia.conf file
> [ -L %{_sysconfdir}/modprobe.d/nvidia.conf ] || rm -f %{_sysconfdir}/modprobe.d/nvidia.conf
>@@ -1090,7 +1093,7 @@
> %{_sysconfdir}/%{drivername}/modprobe.conf
> %{_sysconfdir}/%{drivername}/ld.so.conf
> %{_sysconfdir}/%{drivername}/nvidia-settings.xinit
>-%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json.template
>+%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json
> %ghost %{_datadir}/nvidia
> %if !%simple
> %{_sysconfdir}/%{drivername}/nvidia.icd
>@@ -1167,9 +1170,11 @@
> %{nvidia_libdir}/libnvidia-tls.so.%{version}
> %{nvidia_libdir}/libEGL.so.1
> %{nvidia_libdir}/libEGL.so.%{version}
>+%{nvidia_libdir}/libEGL.so.1.1.0
> %{nvidia_libdir}/libEGL_nvidia.so.0
> %{nvidia_libdir}/libEGL_nvidia.so.%{version}
> %{nvidia_libdir}/libGL.so.1
>+%{nvidia_libdir}/libGL.so.1.7.0
> %{nvidia_libdir}/libGLdispatch.so.0
> %{nvidia_libdir}/libGLESv1_CM.so.1
> %{nvidia_libdir}/libGLESv1_CM.so.1.2.0
>@@ -1179,6 +1184,7 @@
> %{nvidia_libdir}/libGLESv2.so.2.1.0
> %{nvidia_libdir}/libGLESv2_nvidia.so.2
> %{nvidia_libdir}/libGLESv2_nvidia.so.%{version}
>+%{nvidia_libdir}/libGLX.so.0
> %{nvidia_libdir}/libGLX_indirect.so.0
> %{nvidia_libdir}/libGLX_nvidia.so.0
> %{nvidia_libdir}/libGLX_nvidia.so.%{version}
>@@ -1206,10 +1212,12 @@
> %dir %{nvidia_libdir32}/tls
> %dir %{nvidia_libdir32}/vdpau
> %{nvidia_libdir32}/libEGL.so.1
>+%{nvidia_libdir32}/libEGL.so.1.1.0
> %{nvidia_libdir32}/libEGL.so.%{version}
> %{nvidia_libdir32}/libEGL_nvidia.so.0
> %{nvidia_libdir32}/libEGL_nvidia.so.%{version}
> %{nvidia_libdir32}/libGL.so.1
>+%{nvidia_libdir32}/libGL.so.1.7.0
> %{nvidia_libdir32}/libGL.so.%{version}
> %{nvidia_libdir32}/libGLdispatch.so.0
> %{nvidia_libdir32}/libGLESv1_CM.so.1
>@@ -1220,6 +1228,7 @@
> %{nvidia_libdir32}/libGLESv2.so.2.1.0
> %{nvidia_libdir32}/libGLESv2_nvidia.so.2
> %{nvidia_libdir32}/libGLESv2_nvidia.so.%{version}
>+%{nvidia_libdir32}/libGLX.so.0
> %{nvidia_libdir32}/libGLX_indirect.so.0
> %{nvidia_libdir32}/libGLX_nvidia.so.0
> %{nvidia_libdir32}/libGLX_nvidia.so.%{version}
>@@ -1277,6 +1286,7 @@
> %{_includedir}/%{drivername}
> %{nvidia_libdir}/libEGL.so
> %{nvidia_libdir}/libGL.so
>+%{nvidia_libdir}/libGLX.so
> %{nvidia_libdir}/libGLESv1_CM.so
> %{nvidia_libdir}/libGLESv2.so
> %{nvidia_libdir}/libOpenCL.so
>@@ -1292,6 +1302,7 @@
> %ifarch %{biarches}
> %{nvidia_libdir32}/libEGL.so
> %{nvidia_libdir32}/libGL.so
>+%{nvidia_libdir32}/libGLX.so
> %{nvidia_libdir32}/libGLESv1_CM.so
> %{nvidia_libdir32}/libGLESv2.so
> %{nvidia_libdir32}/libOpenCL.so

--- nvidia-current.spec.orig	2018-05-17 15:19:44.000000000 +0300
+++ nvidia-current.spec	2018-06-23 12:39:39.000000000 +0300
@@ -19,8 +19,8 @@
 
 %if !%simple
 # When updating, please add new ids to ldetect-lst (merge2pcitable.pl)
-%define version		390.59
-%define rel		1
+%define version		390.67
+%define rel		0.1
 # the highest supported videodrv abi (currently xorg 1.20)
 %define videodrv_abi	24
 %endif
@@ -79,7 +79,7 @@
 # Other packages should not require any NVIDIA libraries, and this package
 # should not be pulled in when libGL.so.1 is required
 %global __provides_exclude \\.so
-%global common__requires_exclude ^libGL\\.so|^libGLcore\\.so|^libGLdispatch\\.so|^libnvidia.*\\.so
+%global common__requires_exclude ^libGL\\.so|^libGLX\\.so|^libGLcore\\.so|^libGLdispatch\\.so|^libnvidia.*\\.so
 
 %ifarch %{biarches}
 # (anssi) Allow installing of 64-bit package if the runtime dependencies
@@ -532,14 +532,14 @@
 		;;
 	EGL_CLIENT_LIB)
 		parseparams arch libtype
-		# (tmb) skip for now
-		case $libtype in NON_GLVND);; *) continue; esac
+		# (Oleg) install both NON_GLVND and GLVND binaries
+		case $libtype in NON_GLVND|GLVND);; *) continue; esac
 		install_file nvidia $nvidia_libdir
 		;;
 	EGL_CLIENT_SYMLINK)
 		parseparams arch dest libtype
-		# (tmb) skip for now
-		case $libtype in NON_GLVND);; *) continue; esac
+		# (Oleg) skip NON_GLVND symlinks
+		case $libtype in GLVND);; *) continue; esac
 		install_lib_symlink nvidia $nvidia_libdir
 		;;
 	EGL_EXTERNAL_PLATFORM_JSON)
@@ -575,14 +575,14 @@
 		;;
 	GLX_CLIENT_LIB)
 		parseparams arch libtype
-		# (tmb) skip for now
-		case $libtype in NON_GLVND);; *) continue; esac
+		# (Oleg) install both GLVND and NON_GLVND binaries
+		case $libtype in NON_GLVND|GLVND);; *) continue; esac
 		install_file nvidia $nvidia_libdir
 		;;
 	GLX_CLIENT_SYMLINK)
 		parseparams arch dest libtype
-		# (tmb) skip for now
-		case $libtype in NON_GLVND);; *) continue; esac
+		# (Oleg) skip NON_GLVND symlinks
+		case $libtype in GLVND);; *) continue; esac
 		install_lib_symlink nvidia $nvidia_libdir
 		;;
 	NVCUVID_LIB)
@@ -976,6 +976,9 @@
 
 export EXCLUDE_FROM_STRIP="$(find %{buildroot} -type f \! -name nvidia-settings \! -name nvidia-xconfig \! -name nvidia-modprobe \! -name nvidia-persistenced \! -name 'libnvidia-gtk*.so')"
 
+sed -i 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' %{buildroot}%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json.template
+mv %{buildroot}%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json.template %{buildroot}%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json
+
 %post -n %{driverpkgname}
 # XFdrake used to generate an nvidia.conf file
 [ -L %{_sysconfdir}/modprobe.d/nvidia.conf ] || rm -f %{_sysconfdir}/modprobe.d/nvidia.conf
@@ -1090,7 +1093,7 @@
 %{_sysconfdir}/%{drivername}/modprobe.conf
 %{_sysconfdir}/%{drivername}/ld.so.conf
 %{_sysconfdir}/%{drivername}/nvidia-settings.xinit
-%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json.template
+%{_sysconfdir}/vulkan/icd.d/nvidia_icd.json
 %ghost %{_datadir}/nvidia
 %if !%simple
 %{_sysconfdir}/%{drivername}/nvidia.icd
@@ -1167,9 +1170,11 @@
 %{nvidia_libdir}/libnvidia-tls.so.%{version}
 %{nvidia_libdir}/libEGL.so.1
 %{nvidia_libdir}/libEGL.so.%{version}
+%{nvidia_libdir}/libEGL.so.1.1.0
 %{nvidia_libdir}/libEGL_nvidia.so.0
 %{nvidia_libdir}/libEGL_nvidia.so.%{version}
 %{nvidia_libdir}/libGL.so.1
+%{nvidia_libdir}/libGL.so.1.7.0
 %{nvidia_libdir}/libGLdispatch.so.0
 %{nvidia_libdir}/libGLESv1_CM.so.1
 %{nvidia_libdir}/libGLESv1_CM.so.1.2.0
@@ -1179,6 +1184,7 @@
 %{nvidia_libdir}/libGLESv2.so.2.1.0
 %{nvidia_libdir}/libGLESv2_nvidia.so.2
 %{nvidia_libdir}/libGLESv2_nvidia.so.%{version}
+%{nvidia_libdir}/libGLX.so.0
 %{nvidia_libdir}/libGLX_indirect.so.0
 %{nvidia_libdir}/libGLX_nvidia.so.0
 %{nvidia_libdir}/libGLX_nvidia.so.%{version}
@@ -1206,10 +1212,12 @@
 %dir %{nvidia_libdir32}/tls
 %dir %{nvidia_libdir32}/vdpau
 %{nvidia_libdir32}/libEGL.so.1
+%{nvidia_libdir32}/libEGL.so.1.1.0
 %{nvidia_libdir32}/libEGL.so.%{version}
 %{nvidia_libdir32}/libEGL_nvidia.so.0
 %{nvidia_libdir32}/libEGL_nvidia.so.%{version}
 %{nvidia_libdir32}/libGL.so.1
+%{nvidia_libdir32}/libGL.so.1.7.0
 %{nvidia_libdir32}/libGL.so.%{version}
 %{nvidia_libdir32}/libGLdispatch.so.0
 %{nvidia_libdir32}/libGLESv1_CM.so.1
@@ -1220,6 +1228,7 @@
 %{nvidia_libdir32}/libGLESv2.so.2.1.0
 %{nvidia_libdir32}/libGLESv2_nvidia.so.2
 %{nvidia_libdir32}/libGLESv2_nvidia.so.%{version}
+%{nvidia_libdir32}/libGLX.so.0
 %{nvidia_libdir32}/libGLX_indirect.so.0
 %{nvidia_libdir32}/libGLX_nvidia.so.0
 %{nvidia_libdir32}/libGLX_nvidia.so.%{version}
@@ -1277,6 +1286,7 @@
 %{_includedir}/%{drivername}
 %{nvidia_libdir}/libEGL.so
 %{nvidia_libdir}/libGL.so
+%{nvidia_libdir}/libGLX.so
 %{nvidia_libdir}/libGLESv1_CM.so
 %{nvidia_libdir}/libGLESv2.so
 %{nvidia_libdir}/libOpenCL.so
@@ -1292,6 +1302,7 @@
 %ifarch %{biarches}
 %{nvidia_libdir32}/libEGL.so
 %{nvidia_libdir32}/libGL.so
+%{nvidia_libdir32}/libGLX.so
 %{nvidia_libdir32}/libGLESv1_CM.so
 %{nvidia_libdir32}/libGLESv2.so
 %{nvidia_libdir32}/libOpenCL.so

Actions: View | Diff

Attachments on bug 23221: 10248