From 237ad3d673be80629c78113513937a51f0d694b2 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 13 Jan 2014 15:44:21 +0000 Subject: [PATCH 001/101] * Mon Jan 13 2014 Leigh Scott - 1:331.38-1 - Update to 331.38 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ea1ac01..6c0653e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-x86_64-331.20.run -NVIDIA-Linux-x86-331.20.run -NVIDIA-Linux-armv7l-gnueabihf-331.20.run +NVIDIA-Linux-armv7l-gnueabihf-331.38.run +NVIDIA-Linux-x86_64-331.38.run +NVIDIA-Linux-x86-331.38.run diff --git a/sources b/sources index b2411de..1784bf0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -7d10ca5e2bbb3c470a2e3366b5a33a32 NVIDIA-Linux-x86_64-331.20.run -801aa04a087891690f1cac09575b2ba9 NVIDIA-Linux-x86-331.20.run -2459508dca8cd7313a901a1c9cb321cb NVIDIA-Linux-armv7l-gnueabihf-331.20.run +fad752f6e29bf6d70eb810ee9091b7e8 NVIDIA-Linux-armv7l-gnueabihf-331.38.run +77f688822aea7e07f217d7cf5898d7d4 NVIDIA-Linux-x86_64-331.38.run +16aa229f7f118c8cafad6fb3f4ac082e NVIDIA-Linux-x86-331.38.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 4a582ca..15e79c6 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 331.20 -Release: 7%{?dist} +Version: 331.38 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -461,6 +461,9 @@ fi %{_libdir}/libcuda.so %changelog +* Mon Jan 13 2014 Leigh Scott - 1:331.38-1 +- Update to 331.38 + * Fri Dec 27 2013 Leigh Scott - 1:331.20-7 - fix module path issue with alien msttcore-fonts package From 46249a1c16ff89163b75a63ee8dba954beb2163b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 8 Feb 2014 16:00:23 +0000 Subject: [PATCH 002/101] * Sat Feb 08 2014 Leigh Scott - 1:334.16-1 - Update to 334.16 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 11 ++++++----- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 6c0653e..508f61a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-331.38.run -NVIDIA-Linux-x86_64-331.38.run -NVIDIA-Linux-x86-331.38.run +NVIDIA-Linux-x86_64-334.16.run +NVIDIA-Linux-x86-334.16.run +NVIDIA-Linux-armv7l-gnueabihf-334.16.run diff --git a/sources b/sources index 1784bf0..c9a313b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -fad752f6e29bf6d70eb810ee9091b7e8 NVIDIA-Linux-armv7l-gnueabihf-331.38.run -77f688822aea7e07f217d7cf5898d7d4 NVIDIA-Linux-x86_64-331.38.run -16aa229f7f118c8cafad6fb3f4ac082e NVIDIA-Linux-x86-331.38.run +7ed42d64213681b23e9e5b08c5b4d61a NVIDIA-Linux-x86_64-334.16.run +2503a9ce1c17154099b2bfbdde86caf7 NVIDIA-Linux-x86-334.16.run +2ce6adb82916448350c50e1e58857f94 NVIDIA-Linux-armv7l-gnueabihf-334.16.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 15e79c6..2954304 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 331.38 +Version: 334.16 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -439,19 +439,17 @@ fi %ifarch x86_64 i686 %{_nvidia_libdir}/libOpenCL.so %{_nvidia_libdir}/libnvidia-compiler.so -%{_nvidia_libdir}/libnvidia-encode.so -%{_nvidia_libdir}/libnvidia-ifr.so %{_nvidia_libdir}/libnvidia-opencl.so %{_nvidia_libdir}/tls/libnvidia-tls.so %{_libdir}/vdpau/libvdpau_nvidia.so %endif -%ifarch i686 armv7hl +%{_nvidia_libdir}/libnvidia-encode.so +%{_nvidia_libdir}/libnvidia-ifr.so %{_nvidia_libdir}/libEGL.so %{_nvidia_libdir}/libGLESv1_CM.so %{_nvidia_libdir}/libGLESv2.so %{_nvidia_libdir}/libnvidia-eglcore.so %{_nvidia_libdir}/libnvidia-glsi.so -%endif %{_nvidia_libdir}/libcuda.so %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libnvidia-glcore.so @@ -461,6 +459,9 @@ fi %{_libdir}/libcuda.so %changelog +* Sat Feb 08 2014 Leigh Scott - 1:334.16-1 +- Update to 334.16 + * Mon Jan 13 2014 Leigh Scott - 1:331.38-1 - Update to 331.38 From d820dc4e28d61e370598d362d845a736de8ae890 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 8 Feb 2014 18:03:58 +0000 Subject: [PATCH 003/101] * Sat Feb 08 2014 Leigh Scott - 1:334.16-2 - install the NVIDIA supplied application profile key documentation --- xorg-x11-drv-nvidia.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 2954304..6a822de 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 334.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -249,7 +249,7 @@ install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir} #install the NVIDIA supplied application profiles mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia -install -p -m 0644 nvidia-application-profiles-%{version}-rc $RPM_BUILD_ROOT%{_datadir}/nvidia +install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation} $RPM_BUILD_ROOT%{_datadir}/nvidia #Install the initscript tar jxf nvidia-persistenced-init.tar.bz2 @@ -408,7 +408,7 @@ fi %{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} #/no_multilib %dir %{_datadir}/nvidia -%{_datadir}/nvidia/nvidia-application-profiles-%{version}-rc +%{_datadir}/nvidia/nvidia-application-profiles-%{version}-* %{_datadir}/applications/*nvidia-settings.desktop %{_datadir}/pixmaps/*.png %{_mandir}/man1/nvidia-settings.* @@ -459,6 +459,9 @@ fi %{_libdir}/libcuda.so %changelog +* Sat Feb 08 2014 Leigh Scott - 1:334.16-2 +- install the NVIDIA supplied application profile key documentation + * Sat Feb 08 2014 Leigh Scott - 1:334.16-1 - Update to 334.16 From 2f6812d7e2db0448736619b7a010211602c3c5b7 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 3 Mar 2014 14:53:50 +0000 Subject: [PATCH 004/101] * Mon Mar 03 2014 Leigh Scott - 1:334.21-1 - Update to 334.21 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 508f61a..5ca7b2f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-x86_64-334.16.run -NVIDIA-Linux-x86-334.16.run -NVIDIA-Linux-armv7l-gnueabihf-334.16.run +NVIDIA-Linux-armv7l-gnueabihf-334.21.run +NVIDIA-Linux-x86-334.21.run +NVIDIA-Linux-x86_64-334.21.run diff --git a/sources b/sources index c9a313b..faf9faa 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -7ed42d64213681b23e9e5b08c5b4d61a NVIDIA-Linux-x86_64-334.16.run -2503a9ce1c17154099b2bfbdde86caf7 NVIDIA-Linux-x86-334.16.run -2ce6adb82916448350c50e1e58857f94 NVIDIA-Linux-armv7l-gnueabihf-334.16.run +430de8231dc548b96d26ef09a1b1cca4 NVIDIA-Linux-armv7l-gnueabihf-334.21.run +3b2736dd6ed7e24f71004bad0e55e32e NVIDIA-Linux-x86-334.21.run +557f9eba136667f9d9f9de3e8ac0c7b3 NVIDIA-Linux-x86_64-334.21.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 6a822de..a0914c5 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 334.16 -Release: 2%{?dist} +Version: 334.21 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -459,6 +459,9 @@ fi %{_libdir}/libcuda.so %changelog +* Mon Mar 03 2014 Leigh Scott - 1:334.21-1 +- Update to 334.21 + * Sat Feb 08 2014 Leigh Scott - 1:334.16-2 - install the NVIDIA supplied application profile key documentation From 4391f5fcb7eebc9bef3e790bf904a8d574000b13 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 8 Apr 2014 14:34:08 +0000 Subject: [PATCH 005/101] * Tue Apr 08 2014 Leigh Scott - 1:337.12-1 - Update to 337.12 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5ca7b2f..89b378a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-334.21.run -NVIDIA-Linux-x86-334.21.run -NVIDIA-Linux-x86_64-334.21.run +NVIDIA-Linux-armv7l-gnueabihf-337.12.run +NVIDIA-Linux-x86-337.12.run +NVIDIA-Linux-x86_64-337.12.run diff --git a/sources b/sources index faf9faa..a294803 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -430de8231dc548b96d26ef09a1b1cca4 NVIDIA-Linux-armv7l-gnueabihf-334.21.run -3b2736dd6ed7e24f71004bad0e55e32e NVIDIA-Linux-x86-334.21.run -557f9eba136667f9d9f9de3e8ac0c7b3 NVIDIA-Linux-x86_64-334.21.run +d657c444013f52abbac2508637222a05 NVIDIA-Linux-armv7l-gnueabihf-337.12.run +c610d5bff8f7f758dc25fdd51b1b65eb NVIDIA-Linux-x86-337.12.run +9cff14df93ce37054697060fc1685000 NVIDIA-Linux-x86_64-337.12.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index a0914c5..92a5874 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 334.21 +Version: 337.12 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -459,6 +459,9 @@ fi %{_libdir}/libcuda.so %changelog +* Tue Apr 08 2014 Leigh Scott - 1:337.12-1 +- Update to 337.12 + * Mon Mar 03 2014 Leigh Scott - 1:334.21-1 - Update to 334.21 From daa51bf20a6c110eda462a816071a5cc45008b6c Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 6 May 2014 15:54:14 +0000 Subject: [PATCH 006/101] * Tue May 06 2014 Leigh Scott - 1:337.19-1 - Update to 337.19 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 89b378a..bb9f398 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-337.12.run -NVIDIA-Linux-x86-337.12.run -NVIDIA-Linux-x86_64-337.12.run +NVIDIA-Linux-armv7l-gnueabihf-337.19.run +NVIDIA-Linux-x86-337.19.run +NVIDIA-Linux-x86_64-337.19.run diff --git a/sources b/sources index a294803..6f471c8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -d657c444013f52abbac2508637222a05 NVIDIA-Linux-armv7l-gnueabihf-337.12.run -c610d5bff8f7f758dc25fdd51b1b65eb NVIDIA-Linux-x86-337.12.run -9cff14df93ce37054697060fc1685000 NVIDIA-Linux-x86_64-337.12.run +c862734312ee408eec886fed3d562f34 NVIDIA-Linux-armv7l-gnueabihf-337.19.run +cf8e88e313928eb7a4d6f652ff287717 NVIDIA-Linux-x86-337.19.run +c23c7696ab71f3ad28f292159360b21c NVIDIA-Linux-x86_64-337.19.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 92a5874..f5afc05 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 337.12 +Version: 337.19 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -459,6 +459,9 @@ fi %{_libdir}/libcuda.so %changelog +* Tue May 06 2014 Leigh Scott - 1:337.19-1 +- Update to 337.19 + * Tue Apr 08 2014 Leigh Scott - 1:337.12-1 - Update to 337.12 From 391f8a4030d8c6b8f07b6de0514ae137d73142b2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 17 May 2014 13:15:59 +0000 Subject: [PATCH 007/101] - Provides libcuda.so in -libs rhbz#2979 - Split modules content into -kmodsrc reducing nvidia-kmod*.src.rpm size - Distribute libvdau_nvidia.so on ARM - Fix version macro on triggerpostun --- xorg-x11-drv-nvidia.spec | 46 ++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index f5afc05..f648870 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 337.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -65,7 +65,7 @@ Conflicts: xorg-x11-drv-catalyst #Support for cuda #Don't put an epoch here -Provides: cuda-driver = %{version} +Provides: cuda-drivers = %{version} %{?filter_setup: %filter_from_provides /^libnvidia/d; @@ -106,6 +106,14 @@ Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} This package provides the development files of the %{name} package, such as OpenGL headers. +%package kmodsrc +Summary: %{name} kernel module source code +Group: System Environment/Kernel + +%description kmodsrc +Source tree used for building kernel module packages (%{name}-kmod) +which is generated during the build of main package. + %package libs Summary: Libraries for %{name} Group: User Interface/X Hardware Support @@ -120,16 +128,18 @@ This package provides the shared libraries for %{name}. %setup -q -c -T #Only extract the needed arch %ifarch %{ix86} -sh %{SOURCE0} --extract-only --target nvidiapkg-i686 +sh %{SOURCE0} \ %endif %ifarch x86_64 -sh %{SOURCE1} --extract-only --target nvidiapkg-x86_64 +sh %{SOURCE1} \ %endif %ifarch armv7hl -sh %{SOURCE4} --extract-only --target nvidiapkg-armv7hl +sh %{SOURCE4} \ %endif + --extract-only --target nvidiapkg-%{_target_cpu} ln -s nvidiapkg-%{_target_cpu} nvidiapkg + %build # Nothing to build echo "Nothing to build" @@ -162,7 +172,6 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir} install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ %ifarch x86_64 i686 install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/ -install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/ %endif @@ -173,10 +182,11 @@ install -p -m 0755 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/ install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1 ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so +%endif #Vdpau +install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/ install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau -%endif # mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/ @@ -264,6 +274,10 @@ sed -i -e "s/__USER__/root/" $RPM_BUILD_ROOT%{_unitdir}/nvidia-persistenced.serv #Create the default nvidia config directory mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia +#Install the nvidia kernel modules sources archive +mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version} +tar Jcf $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz kernel + %pre if [ "$1" -eq "1" ]; then @@ -299,7 +313,7 @@ if [ "$1" -eq "1" ]; then %endif fi || : -%triggerpostun -- xorg-x11-drv-nvidia < 1:%{version}-5 +%triggerpostun -- xorg-x11-drv-nvidia < 1:319.23-5 if [ "$1" -eq "1" ]; then ISGRUB1="" if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then @@ -418,6 +432,10 @@ fi %{_mandir}/man1/nvidia-persistenced.1.* %{_mandir}/man1/nvidia-modprobe.1.* +%files kmodsrc +%dir %{_datadir}/nvidia-kmod-%{version} +%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz + %files libs %defattr(-,root,root,-) %dir %{_nvidia_libdir} @@ -427,11 +445,12 @@ fi %ifarch x86_64 i686 %dir %{_nvidia_libdir}/tls %{_nvidia_libdir}/tls/*.so.* +%endif %exclude %{_libdir}/vdpau/libvdpau.* %{_libdir}/vdpau/libvdpau_nvidia.so.* %exclude %{_libdir}/vdpau/libvdpau_trace.so* -%endif %{_libdir}/libcuda.so.1 +%{_libdir}/libcuda.so %files devel %defattr(-,root,root,-) @@ -441,8 +460,8 @@ fi %{_nvidia_libdir}/libnvidia-compiler.so %{_nvidia_libdir}/libnvidia-opencl.so %{_nvidia_libdir}/tls/libnvidia-tls.so -%{_libdir}/vdpau/libvdpau_nvidia.so %endif +%{_libdir}/vdpau/libvdpau_nvidia.so %{_nvidia_libdir}/libnvidia-encode.so %{_nvidia_libdir}/libnvidia-ifr.so %{_nvidia_libdir}/libEGL.so @@ -456,9 +475,14 @@ fi %{_nvidia_libdir}/libnvidia-fbc.so %{_nvidia_libdir}/libnvcuvid.so %{_nvidia_libdir}/libnvidia-ml.so -%{_libdir}/libcuda.so %changelog +* Sat May 17 2014 Nicolas Chauvet - 1:337.19-2 +- Provides libcuda.so in -libs rhbz#2979 +- Split modules content into -kmodsrc reducing nvidia-kmod*.src.rpm size +- Distribute libvdau_nvidia.so on ARM +- Fix version macro on triggerpostun + * Tue May 06 2014 Leigh Scott - 1:337.19-1 - Update to 337.19 From 8fb8df8d27163dac95dfe9e886847250e95dcecc Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 31 May 2014 08:07:54 +0000 Subject: [PATCH 008/101] * Sat May 31 2014 Leigh Scott - 1:337.25-1 - Update to 337.25 - adds support for X.org xserver ABI 18 (xorg-server 1.16) --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 8 ++++++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index bb9f398..a74d3d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-337.19.run -NVIDIA-Linux-x86-337.19.run -NVIDIA-Linux-x86_64-337.19.run +NVIDIA-Linux-armv7l-gnueabihf-337.25.run +NVIDIA-Linux-x86-337.25.run +NVIDIA-Linux-x86_64-337.25.run diff --git a/sources b/sources index 6f471c8..0cb105c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -c862734312ee408eec886fed3d562f34 NVIDIA-Linux-armv7l-gnueabihf-337.19.run -cf8e88e313928eb7a4d6f652ff287717 NVIDIA-Linux-x86-337.19.run -c23c7696ab71f3ad28f292159360b21c NVIDIA-Linux-x86_64-337.19.run +37ac863b8cd5fb902f4252704e3b210d NVIDIA-Linux-armv7l-gnueabihf-337.25.run +2a217632ced8952e21000a51065f85b8 NVIDIA-Linux-x86-337.25.run +25a93e4f9e1888142082f4e1046eaa11 NVIDIA-Linux-x86_64-337.25.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index f648870..d09002a 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 337.19 -Release: 2%{?dist} +Version: 337.25 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -477,6 +477,10 @@ fi %{_nvidia_libdir}/libnvidia-ml.so %changelog +* Sat May 31 2014 Leigh Scott - 1:337.25-1 +- Update to 337.25 +- adds support for X.org xserver ABI 18 (xorg-server 1.16) + * Sat May 17 2014 Nicolas Chauvet - 1:337.19-2 - Provides libcuda.so in -libs rhbz#2979 - Split modules content into -kmodsrc reducing nvidia-kmod*.src.rpm size From c3824ade6a5c9483fb1b9fc6a42143c42adfda3d Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 31 May 2014 08:49:43 +0000 Subject: [PATCH 009/101] make changes to snapshot tool --- .gitignore | 2 -- nvidia-snapshot.sh | 7 ------- sources | 2 -- 3 files changed, 11 deletions(-) diff --git a/.gitignore b/.gitignore index a74d3d3..9f63143 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -NVIDIA-Linux-armv7l-gnueabihf-337.25.run -NVIDIA-Linux-x86-337.25.run NVIDIA-Linux-x86_64-337.25.run diff --git a/nvidia-snapshot.sh b/nvidia-snapshot.sh index 5c0ce57..feead63 100755 --- a/nvidia-snapshot.sh +++ b/nvidia-snapshot.sh @@ -16,10 +16,6 @@ nvspec=$(ls ${pwd}/xorg-x11-drv-nvidia*.spec) version=$(grep ^Version: ${nvspec} | awk '{print $2}') arches="$(grep ^ExclusiveArch: ${nvspec} | awk '{print $2,$3,$4}')" - -#Avoid to re-create an existing tarball - [ -e ${pwd}/nvidia-kmod-data-${version}.tar.xz ] && exit 0 - for arch in ${arches} ; do nvarch=${arch} [ ${arch} == i686 ] && nvarch=x86 @@ -27,8 +23,5 @@ for arch in ${arches} ; do if [ ! -e NVIDIA-Linux-${nvarch}-${version}.run ] ; then spectool --gf -S ${nvspec} fi - sh NVIDIA-Linux-${nvarch}-${version}.run --extract-only --target nvidiapkg-${arch} done -tar Jcf nvidia-kmod-data-${version}.tar.xz nvidiapkg-*/LICENSE nvidiapkg-*/kernel - diff --git a/sources b/sources index 0cb105c..a72696c 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -37ac863b8cd5fb902f4252704e3b210d NVIDIA-Linux-armv7l-gnueabihf-337.25.run -2a217632ced8952e21000a51065f85b8 NVIDIA-Linux-x86-337.25.run 25a93e4f9e1888142082f4e1046eaa11 NVIDIA-Linux-x86_64-337.25.run From 09592234a9e65f707633e93257379e918ad2804f Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 4 Jun 2014 23:43:40 +0000 Subject: [PATCH 010/101] * Wed Jun 04 2014 Leigh Scott - 1:337.25-2 - Add support for IgnoreABI xorg option --- 00-ignoreabi.conf | 3 +++ xorg-x11-drv-nvidia.spec | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 00-ignoreabi.conf diff --git a/00-ignoreabi.conf b/00-ignoreabi.conf new file mode 100644 index 0000000..c2071f1 --- /dev/null +++ b/00-ignoreabi.conf @@ -0,0 +1,3 @@ +Section "ServerFlags" + Option "IgnoreABI" "True" +EndSection diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d09002a..fda96d3 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 337.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -22,6 +22,7 @@ Source3: nvidia-xorg.conf Source5: 00-avoid-glamor.conf Source6: blacklist-nouveau.conf Source7: alternate-install-present +Source8: 00-ignoreabi.conf BuildRequires: desktop-file-utils %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -234,6 +235,7 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ @@ -400,6 +402,7 @@ fi %dir %{_sysconfdir}/nvidia %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf +%config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -477,6 +480,9 @@ fi %{_nvidia_libdir}/libnvidia-ml.so %changelog +* Wed Jun 04 2014 Leigh Scott - 1:337.25-2 +- Add support for IgnoreABI xorg option + * Sat May 31 2014 Leigh Scott - 1:337.25-1 - Update to 337.25 - adds support for X.org xserver ABI 18 (xorg-server 1.16) From 3890c017cb7b5b1997285a5a131bcc0c19f87402 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 4 Jun 2014 23:51:51 +0000 Subject: [PATCH 011/101] fix sources --- sources | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sources b/sources index a72696c..0cb105c 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ +37ac863b8cd5fb902f4252704e3b210d NVIDIA-Linux-armv7l-gnueabihf-337.25.run +2a217632ced8952e21000a51065f85b8 NVIDIA-Linux-x86-337.25.run 25a93e4f9e1888142082f4e1046eaa11 NVIDIA-Linux-x86_64-337.25.run From 7a8a5028cc96403adfcade1185f840795caa1bf7 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 9 Jun 2014 19:15:13 +0000 Subject: [PATCH 012/101] * Mon Jun 09 2014 Leigh Scott - 1:340.17-1 - Update to 340.17 --- .gitignore | 4 +++- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 9f63143..40ec326 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -NVIDIA-Linux-x86_64-337.25.run +NVIDIA-Linux-armv7l-gnueabihf-340.17.run +NVIDIA-Linux-x86-340.17.run +NVIDIA-Linux-x86_64-340.17.run diff --git a/sources b/sources index 0cb105c..ff63e76 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -37ac863b8cd5fb902f4252704e3b210d NVIDIA-Linux-armv7l-gnueabihf-337.25.run -2a217632ced8952e21000a51065f85b8 NVIDIA-Linux-x86-337.25.run -25a93e4f9e1888142082f4e1046eaa11 NVIDIA-Linux-x86_64-337.25.run +046d5c1395c29270cfeef32711e42622 NVIDIA-Linux-armv7l-gnueabihf-340.17.run +37be8672fa46f153223dca80db5d3751 NVIDIA-Linux-x86-340.17.run +fdb8daa3e2a94b30966f7d9fdd40c56e NVIDIA-Linux-x86_64-340.17.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index fda96d3..d241c0c 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 337.25 -Release: 2%{?dist} +Version: 340.17 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -480,6 +480,9 @@ fi %{_nvidia_libdir}/libnvidia-ml.so %changelog +* Mon Jun 09 2014 Leigh Scott - 1:340.17-1 +- Update to 340.17 + * Wed Jun 04 2014 Leigh Scott - 1:337.25-2 - Add support for IgnoreABI xorg option From 06f44a26644937b299c31b799599c391bbd76f66 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 7 Jul 2014 13:47:29 +0000 Subject: [PATCH 013/101] * Mon Jul 07 2014 Leigh Scott - 1:340.17-2 - add autostart file to load user settings --- nvidia-settings.desktop | 12 ++++++++++++ xorg-x11-drv-nvidia.spec | 12 ++++++++++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 nvidia-settings.desktop diff --git a/nvidia-settings.desktop b/nvidia-settings.desktop new file mode 100644 index 0000000..838914b --- /dev/null +++ b/nvidia-settings.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Type=Application +Exec=nvidia-settings -l +Icon=nvidia-settings +Hidden=false +NoDisplay=false +Name[en_GB]=nvidia-settings +Name=nvidia-settings +Comment[en_GB]=Load user settings +Comment=Load user settings +X-GNOME-Autostart-Delay=30 +X-GNOME-Autostart-enabled=true diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d241c0c..d9b29ed 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 340.17 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -23,6 +23,7 @@ Source5: 00-avoid-glamor.conf Source6: blacklist-nouveau.conf Source7: alternate-install-present Source8: 00-ignoreabi.conf +Source9: nvidia-settings.desktop BuildRequires: desktop-file-utils %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -278,7 +279,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia #Install the nvidia kernel modules sources archive mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version} -tar Jcf $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz kernel +tar Jcf $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz kernel + +#Add autostart file for nvidia-settings to load user config +install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop %pre @@ -405,6 +409,7 @@ fi %config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf +%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 %{_unitdir}/nvidia-persistenced.service %endif @@ -480,6 +485,9 @@ fi %{_nvidia_libdir}/libnvidia-ml.so %changelog +* Mon Jul 07 2014 Leigh Scott - 1:340.17-2 +- add autostart file to load user settings + * Mon Jun 09 2014 Leigh Scott - 1:340.17-1 - Update to 340.17 From a6e9143b0fafd5a3b48bf0f6a565906ebbe30adf Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 8 Jul 2014 11:41:16 +0000 Subject: [PATCH 014/101] * Tue Jul 08 2014 Leigh Scott - 1:340.24-1 - Update to 340.24 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 40ec326..645fe9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-340.17.run -NVIDIA-Linux-x86-340.17.run -NVIDIA-Linux-x86_64-340.17.run +NVIDIA-Linux-x86-340.24.run +NVIDIA-Linux-x86_64-340.24.run +NVIDIA-Linux-armv7l-gnueabihf-340.24.run diff --git a/sources b/sources index ff63e76..6749fd7 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -046d5c1395c29270cfeef32711e42622 NVIDIA-Linux-armv7l-gnueabihf-340.17.run -37be8672fa46f153223dca80db5d3751 NVIDIA-Linux-x86-340.17.run -fdb8daa3e2a94b30966f7d9fdd40c56e NVIDIA-Linux-x86_64-340.17.run +edd4c618265d22ef4d2b28baf070c6ff NVIDIA-Linux-x86-340.24.run +84c9a35b20fe34cf6f1160d541673c76 NVIDIA-Linux-x86_64-340.24.run +1f1f9d23160a797c6bc5d4e3f10c69b9 NVIDIA-Linux-armv7l-gnueabihf-340.24.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d9b29ed..9605094 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 340.17 -Release: 2%{?dist} +Version: 340.24 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -485,6 +485,9 @@ fi %{_nvidia_libdir}/libnvidia-ml.so %changelog +* Tue Jul 08 2014 Leigh Scott - 1:340.24-1 +- Update to 340.24 + * Mon Jul 07 2014 Leigh Scott - 1:340.17-2 - add autostart file to load user settings From 8d4d271d9afed26f60cbb1eafa5bf269ce988c10 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 7 Aug 2014 08:38:16 +0000 Subject: [PATCH 015/101] * Thu Aug 07 2014 Leigh Scott - 1:343.13-1 - Update to 343.13 - removes support for the G8x, G9x, and GT2xx GPUs --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 6 +++++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 645fe9b..11276c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-x86-340.24.run -NVIDIA-Linux-x86_64-340.24.run -NVIDIA-Linux-armv7l-gnueabihf-340.24.run +NVIDIA-Linux-x86-343.13.run +NVIDIA-Linux-x86_64-343.13.run +NVIDIA-Linux-armv7l-gnueabihf-343.13.run diff --git a/sources b/sources index 6749fd7..8bb1966 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -edd4c618265d22ef4d2b28baf070c6ff NVIDIA-Linux-x86-340.24.run -84c9a35b20fe34cf6f1160d541673c76 NVIDIA-Linux-x86_64-340.24.run -1f1f9d23160a797c6bc5d4e3f10c69b9 NVIDIA-Linux-armv7l-gnueabihf-340.24.run +c708d533410ababc7a792fd132e5c51b NVIDIA-Linux-x86-343.13.run +583597fb4793542a65a889b6262a8816 NVIDIA-Linux-x86_64-343.13.run +e280f04ec10e155e0f73c1d9ae629fdf NVIDIA-Linux-armv7l-gnueabihf-343.13.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 9605094..33a558f 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 340.24 +Version: 343.13 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -485,6 +485,10 @@ fi %{_nvidia_libdir}/libnvidia-ml.so %changelog +* Thu Aug 07 2014 Leigh Scott - 1:343.13-1 +- Update to 343.13 +- removes support for the G8x, G9x, and GT2xx GPUs + * Tue Jul 08 2014 Leigh Scott - 1:340.24-1 - Update to 340.24 From 1c53ea1f0d3891f62cc7f90dc8dbb942ac7d3506 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 13:34:23 +0000 Subject: [PATCH 016/101] Preliminary split for cuda sub-package --- xorg-x11-drv-nvidia.spec | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 33a558f..1ee680e 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -64,11 +64,6 @@ Conflicts: xorg-x11-drv-nvidia-304xx Conflicts: xorg-x11-drv-fglrx Conflicts: xorg-x11-drv-catalyst - -#Support for cuda -#Don't put an epoch here -Provides: cuda-drivers = %{version} - %{?filter_setup: %filter_from_provides /^libnvidia/d; %filter_from_provides /^libEGL\.so/d; @@ -103,11 +98,23 @@ http://rpmfusion.org/Howto/nVidia Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name}-cuda%{_isa} = %{?epoch}:%{version}-%{release} %description devel This package provides the development files of the %{name} package, such as OpenGL headers. +%package cuda +Summary: CUDA libraries for %{name} +Group: Development/Libraries +Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version} + +#Don't put an epoch here +Provides: cuda-drivers = %{version} + +%description cuda +This package provides the CUDA driver libraries. + %package kmodsrc Summary: %{name} kernel module source code Group: System Environment/Kernel @@ -345,6 +352,8 @@ fi || : %post libs -p /sbin/ldconfig +%post cuda -p /sbin/ldconfig + %posttrans [ -f %{_sysconfdir}/X11/xorg.conf ] || \ cp -p %{_sysconfdir}/X11/nvidia-xorg.conf %{_sysconfdir}/X11/xorg.conf || : @@ -391,6 +400,8 @@ fi %postun libs -p /sbin/ldconfig +%postun cuda -p /sbin/ldconfig + %files %defattr(-,root,root,-) %doc nvidiapkg/LICENSE @@ -450,6 +461,7 @@ fi %config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf %{_nvidia_libdir}/alternate-install-present %{_nvidia_libdir}/*.so.* +%exclude %{_nvidia_libdir}/libcuda.so* %ifarch x86_64 i686 %dir %{_nvidia_libdir}/tls %{_nvidia_libdir}/tls/*.so.* @@ -457,8 +469,11 @@ fi %exclude %{_libdir}/vdpau/libvdpau.* %{_libdir}/vdpau/libvdpau_nvidia.so.* %exclude %{_libdir}/vdpau/libvdpau_trace.so* -%{_libdir}/libcuda.so.1 -%{_libdir}/libcuda.so + +%files cuda +%defattr(-,root,root,-) +%{_libdir}/libcuda.so* +%{_nvidia_libdir}/libcuda.so* %files devel %defattr(-,root,root,-) @@ -477,7 +492,6 @@ fi %{_nvidia_libdir}/libGLESv2.so %{_nvidia_libdir}/libnvidia-eglcore.so %{_nvidia_libdir}/libnvidia-glsi.so -%{_nvidia_libdir}/libcuda.so %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-fbc.so From b0854b9cfea2c9913f2bab3d5db998fd41836345 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 13:50:44 +0000 Subject: [PATCH 017/101] Move cuda tools into a cuda subpackage --- xorg-x11-drv-nvidia.spec | 77 ++++++++-------------------------------- 1 file changed, 15 insertions(+), 62 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 1ee680e..ed06425 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -35,15 +35,6 @@ Requires(postun): systemd ExclusiveArch: i686 x86_64 armv7hl -#Obsoletes: nvidia-xconfig < 1.0-30 -#Provides: nvidia-xconfig = %{version}-%{release} -#Obsoletes: nvidia-settings < 1.0-34 -#Provides: nvidia-settings = %{version}-%{release} -#Obsoletes: nvidia-settings-desktop < 1.0-34 -#Provides: nvidia-settings-desktop = %{version}-%{release} -Provides: nvidia-modprobe = %{version}-%{release} -Provides: nvidia-persistenced = %{version}-%{release} - Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version} Requires: which @@ -108,6 +99,8 @@ such as OpenGL headers. Summary: CUDA libraries for %{name} Group: Development/Libraries Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version} +Provides: nvidia-modprobe = %{version}-%{release} +Provides: nvidia-persistenced = %{version}-%{release} #Don't put an epoch here Provides: cuda-drivers = %{version} @@ -321,34 +314,8 @@ if [ "$1" -eq "1" ]; then &>/dev/null done fi -%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 - /bin/systemctl daemon-reload >/dev/null 2>&1 || : -%endif fi || : -%triggerpostun -- xorg-x11-drv-nvidia < 1:319.23-5 -if [ "$1" -eq "1" ]; then - ISGRUB1="" - if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then - ISGRUB1="--grub" - GFXPAYLOAD="vga=normal" - else - echo "GRUB_GFXPAYLOAD_LINUX=text" >> %{_sysconfdir}/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg - fi - if [ -x /sbin/grubby ] ; then - KERNELS=`/sbin/grubby --default-kernel` - DIST=`rpm -E %%{?dist}` - ARCH=`uname -m` - [ -z $KERNELS ] && KERNELS=`ls /boot/vmlinuz-*${DIST}.${ARCH}*` - for kernel in ${KERNELS} ; do - /sbin/grubby $ISGRUB1 \ - --update-kernel=${kernel} \ - --args="nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off $GFXPAYLOAD" \ - &>/dev/null - done - fi -fi || : %post libs -p /sbin/ldconfig @@ -379,25 +346,11 @@ if [ "$1" -eq "0" ]; then done fi -%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 - /bin/systemctl --no-reload disable nvidia-persistenced.service > /dev/null 2>&1 || : - /bin/systemctl stop nvidia-persistenced.service > /dev/null 2>&1 || : -%endif - #Backup and disable previously used xorg.conf [ -f %{_sysconfdir}/X11/xorg.conf ] && \ mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null fi ||: -%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 -%postun -/bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart nvidia-persistenced.service >/dev/null 2>&1 || : -fi -%endif - %postun libs -p /sbin/ldconfig %postun cuda -p /sbin/ldconfig @@ -421,17 +374,8 @@ fi %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop -%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 -%{_unitdir}/nvidia-persistenced.service -%endif %{_bindir}/nvidia-bug-report.sh %{_bindir}/nvidia-debugdump -%{_bindir}/nvidia-smi -%{_bindir}/nvidia-cuda-mps-control -%{_bindir}/nvidia-cuda-mps-server -%{_bindir}/nvidia-persistenced -#nvidia-modprobe is setuid root to allow users to load the module in -%attr(4755, root, root) %{_bindir}/nvidia-modprobe %{_bindir}/nvidia-settings %{_bindir}/nvidia-xconfig # Xorg libs that do not need to be multilib @@ -446,10 +390,6 @@ fi %{_datadir}/pixmaps/*.png %{_mandir}/man1/nvidia-settings.* %{_mandir}/man1/nvidia-xconfig.* -%{_mandir}/man1/nvidia-smi.* -%{_mandir}/man1/nvidia-cuda-mps-control.1.* -%{_mandir}/man1/nvidia-persistenced.1.* -%{_mandir}/man1/nvidia-modprobe.1.* %files kmodsrc %dir %{_datadir}/nvidia-kmod-%{version} @@ -472,8 +412,21 @@ fi %files cuda %defattr(-,root,root,-) +%if 0%{?rhel} > 6 || 0%{?fedora} >= 15 +%{_unitdir}/nvidia-persistenced.service +%endif +%{_bindir}/nvidia-smi +%{_bindir}/nvidia-cuda-mps-control +%{_bindir}/nvidia-cuda-mps-server +%{_bindir}/nvidia-persistenced +#nvidia-modprobe is setuid root to allow users to load the module in +%attr(4755, root, root) %{_bindir}/nvidia-modprobe %{_libdir}/libcuda.so* %{_nvidia_libdir}/libcuda.so* +%{_mandir}/man1/nvidia-smi.* +%{_mandir}/man1/nvidia-cuda-mps-control.1.* +%{_mandir}/man1/nvidia-persistenced.1.* +%{_mandir}/man1/nvidia-modprobe.1.* %files devel %defattr(-,root,root,-) From 7d39bfe3dd236bba57a926f0af422e70ccb3d5c9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 14:09:57 +0000 Subject: [PATCH 018/101] Add systemd units macros since fedora 18 --- xorg-x11-drv-nvidia.spec | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index ed06425..1291183 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -319,7 +319,11 @@ fi || : %post libs -p /sbin/ldconfig -%post cuda -p /sbin/ldconfig +%post cuda +/sbin/ldconfig +%if 0%{?rhel} > 6 || 0%{?fedora} >= 18 +%systemd_post nvidia-persistenced.service +%endif %posttrans [ -f %{_sysconfdir}/X11/xorg.conf ] || \ @@ -351,9 +355,18 @@ if [ "$1" -eq "0" ]; then mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null fi ||: +%if 0%{?rhel} > 6 || 0%{?fedora} >= 18 +%preun cuda +%systemd_preun nvidia-persistenced.service +%endif + %postun libs -p /sbin/ldconfig -%postun cuda -p /sbin/ldconfig +%postun cuda +/sbin/ldconfig +%if 0%{?rhel} > 6 || 0%{?fedora} >= 18 +%systemd_postun_with_restart nvidia-persistenced.service +%endif %files %defattr(-,root,root,-) From 34ddccb479e12f3634b3fa44146744bde997441a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 14:10:37 +0000 Subject: [PATCH 019/101] Add conflicts for 340xx --- xorg-x11-drv-nvidia.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 1291183..9b2cd0d 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -52,6 +52,7 @@ Conflicts: xorg-x11-drv-nvidia-71xx Conflicts: xorg-x11-drv-nvidia-96xx Conflicts: xorg-x11-drv-nvidia-173xx Conflicts: xorg-x11-drv-nvidia-304xx +Conflicts: xorg-x11-drv-nvidia-340xx Conflicts: xorg-x11-drv-fglrx Conflicts: xorg-x11-drv-catalyst From d99a6700f2bf0f21a728a20397a1dd15a35d11ba Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 14:11:42 +0000 Subject: [PATCH 020/101] Conflicts 340xx for -cuda --- xorg-x11-drv-nvidia.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 9b2cd0d..7ab6479 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -103,6 +103,8 @@ Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version} Provides: nvidia-modprobe = %{version}-%{release} Provides: nvidia-persistenced = %{version}-%{release} +Conflicts: xorg-x11-drv-nvidia-340xx-cuda + #Don't put an epoch here Provides: cuda-drivers = %{version} From 9067b6f5f5765650d9692ef8128e0005cb4411ab Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 14:18:45 +0000 Subject: [PATCH 021/101] Update description --- xorg-x11-drv-nvidia.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 7ab6479..44cb8fc 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -76,11 +76,11 @@ Conflicts: xorg-x11-drv-catalyst %description This package provides the most recent NVIDIA display driver which allows for -hardware accelerated rendering with NVIDIA chipsets GeForce8 series and newer. -GeForce7 and below are NOT supported by this release. +hardware accelerated rendering with current NVIDIA chipsets series. +GF8x, GF9x, and GT2xx GPUs NOT supported by this release. For the full product support list, please consult the release notes -for driver version %{version}. +http://download.nvidia.com/XFree86/Linux-x86/%{version}/README/index.html Please use the following documentation: http://rpmfusion.org/Howto/nVidia From bb7e6767c9fcf7008c73309541d9caa532a68102 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 14:41:46 +0000 Subject: [PATCH 022/101] Exclude vendor provided OpenCL.so, we can use fedora one --- xorg-x11-drv-nvidia.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 44cb8fc..d37419e 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -419,6 +419,9 @@ fi ||: %{_nvidia_libdir}/*.so.* %exclude %{_nvidia_libdir}/libcuda.so* %ifarch x86_64 i686 +%if 0%{?fedora} > 18 +%exclude %{_nvidia_libdir}/libOpenCL.so.* +%endif %dir %{_nvidia_libdir}/tls %{_nvidia_libdir}/tls/*.so.* %endif @@ -448,7 +451,11 @@ fi ||: %defattr(-,root,root,-) %{_includedir}/nvidia/ %ifarch x86_64 i686 +%if 0%{?fedora} > 18 +%exclude %{_nvidia_libdir}/libOpenCL.so +%else %{_nvidia_libdir}/libOpenCL.so +%endif %{_nvidia_libdir}/libnvidia-compiler.so %{_nvidia_libdir}/libnvidia-opencl.so %{_nvidia_libdir}/tls/libnvidia-tls.so From 5430322fc35a2b2e579c54450bf68055c69d17d6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 14:44:23 +0000 Subject: [PATCH 023/101] Move nvcuvid nvidia-encode into cuda --- xorg-x11-drv-nvidia.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d37419e..8aa38be 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -418,6 +418,8 @@ fi ||: %{_nvidia_libdir}/alternate-install-present %{_nvidia_libdir}/*.so.* %exclude %{_nvidia_libdir}/libcuda.so* +%exclude %{_nvidia_libdir}/libnvcuvid.so* +%exclude %{_nvidia_libdir}/libnvidia-encode.so* %ifarch x86_64 i686 %if 0%{?fedora} > 18 %exclude %{_nvidia_libdir}/libOpenCL.so.* @@ -442,6 +444,8 @@ fi ||: %attr(4755, root, root) %{_bindir}/nvidia-modprobe %{_libdir}/libcuda.so* %{_nvidia_libdir}/libcuda.so* +%{_nvidia_libdir}/libnvcuvid.so* +%{_nvidia_libdir}/libnvidia-encode.so* %{_mandir}/man1/nvidia-smi.* %{_mandir}/man1/nvidia-cuda-mps-control.1.* %{_mandir}/man1/nvidia-persistenced.1.* @@ -461,7 +465,6 @@ fi ||: %{_nvidia_libdir}/tls/libnvidia-tls.so %endif %{_libdir}/vdpau/libvdpau_nvidia.so -%{_nvidia_libdir}/libnvidia-encode.so %{_nvidia_libdir}/libnvidia-ifr.so %{_nvidia_libdir}/libEGL.so %{_nvidia_libdir}/libGLESv1_CM.so @@ -471,7 +474,6 @@ fi ||: %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-fbc.so -%{_nvidia_libdir}/libnvcuvid.so %{_nvidia_libdir}/libnvidia-ml.so %changelog From 21a04cca6a35263f5c006161eafc100526f20bec Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 15:12:09 +0000 Subject: [PATCH 024/101] Re-ordering --- xorg-x11-drv-nvidia.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 8aa38be..abd34f3 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -25,6 +25,8 @@ Source7: alternate-install-present Source8: 00-ignoreabi.conf Source9: nvidia-settings.desktop +ExclusiveArch: i686 x86_64 armv7hl + BuildRequires: desktop-file-utils %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 Buildrequires: systemd @@ -33,17 +35,14 @@ Requires(preun): systemd Requires(postun): systemd %endif -ExclusiveArch: i686 x86_64 armv7hl +Requires(post): ldconfig +Requires(postun): ldconfig +Requires(post): grubby +Requires: which Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version} - -Requires: which Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} -Requires(post): ldconfig -Requires(postun): ldconfig - - Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version} Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version} Conflicts: xorg-x11-drv-nvidia-beta From 6f5eb294dda89ab6774b306eae42bd2b5a7486ae Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 15:21:20 +0000 Subject: [PATCH 025/101] Simplify filter_setup --- xorg-x11-drv-nvidia.spec | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index abd34f3..035d2a1 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -55,23 +55,19 @@ Conflicts: xorg-x11-drv-nvidia-340xx Conflicts: xorg-x11-drv-fglrx Conflicts: xorg-x11-drv-catalyst +%if 0%{?fedora} || 0%{?rhel} >= 7 +%global __provides_exclude ^(lib.*GL.*\\.so.*|libOpenCL\\.so.*)$ +%global __requires_exclude ^(lib.*GL.*\\.so.*|libOpenCL\\.so.*)$ +%else + %{?filter_setup: -%filter_from_provides /^libnvidia/d; -%filter_from_provides /^libEGL\.so/d; -%filter_from_provides /^libGLcore\.so/d; -%filter_from_provides /^libGL\.so/d; -%filter_from_provides /^libGLES.*\.so/d; -%filter_from_provides /^libvdpau_nvidia\.so\.1/d; -%filter_from_provides /^libglx\.so/d; -%filter_from_requires /^libnvidia/d; -%filter_from_requires /^libEGL\.so/d; -%filter_from_requires /^libGLcore\.so/d; -%filter_from_requires /^libGL\.so/d; -%filter_from_requires /^libGLES.*\.so/d; -%filter_from_requires /^libvdpau_nvidia\.so\.1/d; -%filter_from_requires /^libglx\.so/d; +%filter_from_provides /^lib.*GL.*\.so/d; +%filter_from_provides /^libOpenCL\.so/d; +%filter_from_requires /^lib.*GL.*\.so/d; +%filter_from_requires /^libOpenCL\.so/d; %filter_setup } +%endif %description This package provides the most recent NVIDIA display driver which allows for From 0cd2e5a58505b23414d202ca04fbcac4ff39a207 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 15:32:59 +0000 Subject: [PATCH 026/101] Add outputclass support --- nvidia.conf | 8 ++++++++ xorg-x11-drv-nvidia.spec | 12 ++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 nvidia.conf diff --git a/nvidia.conf b/nvidia.conf new file mode 100644 index 0000000..9c5e953 --- /dev/null +++ b/nvidia.conf @@ -0,0 +1,8 @@ +#This file is provided by xorg-x11-drv-nvidia +#Do not edit + +Section "OutputClass" + Identifier "nvidia" + MatchDriver "nvidia-drm" + Driver "nvidia" +EndSection diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 035d2a1..6f042be 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -24,6 +24,7 @@ Source6: blacklist-nouveau.conf Source7: alternate-install-present Source8: 00-ignoreabi.conf Source9: nvidia-settings.desktop +Source10: nvidia.conf ExclusiveArch: i686 x86_64 armv7hl @@ -262,6 +263,12 @@ install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation} $RPM_BUILD_ROOT%{_datadir}/nvidia +#Install the output class configuration file - xorg-server >= 1.16 +%if 0%{?fedora} >= 21 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d +install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf +%endif + #Install the initscript tar jxf nvidia-persistenced-init.tar.bz2 %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -323,9 +330,11 @@ fi || : %systemd_post nvidia-persistenced.service %endif +%if 0%{?fedora} < 21 %posttrans [ -f %{_sysconfdir}/X11/xorg.conf ] || \ cp -p %{_sysconfdir}/X11/nvidia-xorg.conf %{_sysconfdir}/X11/xorg.conf || : +%endif %preun if [ "$1" -eq "0" ]; then @@ -395,6 +404,9 @@ fi ||: %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} #/no_multilib +%if 0%{?fedora} >= 21 +%{_datadir}/X11/xorg.conf.d/nvidia.conf +%endif %dir %{_datadir}/nvidia %{_datadir}/nvidia/nvidia-application-profiles-%{version}-* %{_datadir}/applications/*nvidia-settings.desktop From ba09f9aa48a43ee95786c6e849ff7c65b47076ab Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 15:39:10 +0000 Subject: [PATCH 027/101] Add nvidia compiler and opencl to -cuda --- xorg-x11-drv-nvidia.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 6f042be..0e3cdd6 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -431,6 +431,8 @@ fi ||: %if 0%{?fedora} > 18 %exclude %{_nvidia_libdir}/libOpenCL.so.* %endif +%exclude %{_nvidia_libdir}/libnvidia-compiler.so* +%exclude %{_nvidia_libdir}/libnvidia-opencl.so* %dir %{_nvidia_libdir}/tls %{_nvidia_libdir}/tls/*.so.* %endif @@ -453,6 +455,10 @@ fi ||: %{_nvidia_libdir}/libcuda.so* %{_nvidia_libdir}/libnvcuvid.so* %{_nvidia_libdir}/libnvidia-encode.so* +%ifarch x86_64 i686 +%{_nvidia_libdir}/libnvidia-compiler.so* +%{_nvidia_libdir}/libnvidia-opencl.so* +%endif %{_mandir}/man1/nvidia-smi.* %{_mandir}/man1/nvidia-cuda-mps-control.1.* %{_mandir}/man1/nvidia-persistenced.1.* @@ -467,8 +473,6 @@ fi ||: %else %{_nvidia_libdir}/libOpenCL.so %endif -%{_nvidia_libdir}/libnvidia-compiler.so -%{_nvidia_libdir}/libnvidia-opencl.so %{_nvidia_libdir}/tls/libnvidia-tls.so %endif %{_libdir}/vdpau/libvdpau_nvidia.so From 4599906360b86ed1ab23f63c5879bbe6943e6ee1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 15:41:21 +0000 Subject: [PATCH 028/101] Move opencl icd to the configuration --- xorg-x11-drv-nvidia.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 0e3cdd6..19afc73 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -382,11 +382,6 @@ fi ||: %doc nvidiapkg/README.txt %doc nvidiapkg/nvidia-application-profiles-%{version}-rc %doc nvidiapkg/html -%ifarch x86_64 i686 -%dir %{_sysconfdir}/OpenCL -%dir %{_sysconfdir}/OpenCL/vendors -%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd -%endif %dir %{_sysconfdir}/nvidia %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf @@ -456,6 +451,9 @@ fi ||: %{_nvidia_libdir}/libnvcuvid.so* %{_nvidia_libdir}/libnvidia-encode.so* %ifarch x86_64 i686 +%dir %{_sysconfdir}/OpenCL +%dir %{_sysconfdir}/OpenCL/vendors +%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd %{_nvidia_libdir}/libnvidia-compiler.so* %{_nvidia_libdir}/libnvidia-opencl.so* %endif From 3744d5dbe62529da50fe2c1de013772128522e07 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 16:08:18 +0000 Subject: [PATCH 029/101] Avoid prelink to mess with nvidia libs - rfbz#3258 --- xorg-x11-drv-nvidia.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 19afc73..743cb5d 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -269,6 +269,10 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf %endif +#Avoid prelink to mess with nvidia libs - rfbz#3258 +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d +touch $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/nvidia-%{lib}.conf + #Install the initscript tar jxf nvidia-persistenced-init.tar.bz2 %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 @@ -297,6 +301,11 @@ if [ "$1" -eq "1" ]; then fi fi +%pre libs +if [ -d %{_sysconfdir}/prelink.conf.d ]; then +echo "-b %{_nvidia_libdir}" > %{_sysconfdir}/prelink.conf.d/nvidia-%{lib}.conf +fi + %post if [ "$1" -eq "1" ]; then ISGRUB1="" @@ -417,6 +426,7 @@ fi ||: %defattr(-,root,root,-) %dir %{_nvidia_libdir} %config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf +%ghost %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf %{_nvidia_libdir}/alternate-install-present %{_nvidia_libdir}/*.so.* %exclude %{_nvidia_libdir}/libcuda.so* From a7b434ba76987b344a48d7b1e20d40d8739c5b3b Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 16:38:51 +0000 Subject: [PATCH 030/101] Update changelog --- xorg-x11-drv-nvidia.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 743cb5d..3caa1c2 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 343.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -496,6 +496,13 @@ fi ||: %{_nvidia_libdir}/libnvidia-ml.so %changelog +* Sat Aug 16 2014 Nicolas Chauvet - 1:343.13-2 +- Fix prelink and nvidia - rhbz#3258 +- Split cuda and opencl into a cuda subpackage +- Clean dependency filter script - Simone Caronni +- Add support for outputclass with xorg-server >= 1.16 +- Exclude vendor provided OpenCL.so, use system one when available. + * Thu Aug 07 2014 Leigh Scott - 1:343.13-1 - Update to 343.13 - removes support for the G8x, G9x, and GT2xx GPUs From 6672e065dd652ecc31a508025d415a44774129ae Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 16:41:08 +0000 Subject: [PATCH 031/101] Fix bz --- xorg-x11-drv-nvidia.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 3caa1c2..83f1b63 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -497,8 +497,8 @@ fi ||: %changelog * Sat Aug 16 2014 Nicolas Chauvet - 1:343.13-2 -- Fix prelink and nvidia - rhbz#3258 -- Split cuda and opencl into a cuda subpackage +- Fix prelink and nvidia - rfbz#3258 +- Split cuda and opencl into a cuda subpackage - rfbz#2973 - Clean dependency filter script - Simone Caronni - Add support for outputclass with xorg-server >= 1.16 - Exclude vendor provided OpenCL.so, use system one when available. From 9ea73fc0333b7f9906cb57c3e9d39ee4f9b165eb Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 16 Aug 2014 16:47:29 +0000 Subject: [PATCH 032/101] Fixup --- xorg-x11-drv-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 83f1b63..e73ead3 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -271,7 +271,7 @@ install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.c #Avoid prelink to mess with nvidia libs - rfbz#3258 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d -touch $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/nvidia-%{lib}.conf +touch $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf #Install the initscript tar jxf nvidia-persistenced-init.tar.bz2 From 73256cd1b008531385f05efc6b58bea02cccd541 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 18 Aug 2014 21:32:26 +0000 Subject: [PATCH 033/101] Add libnvidia-ml to the -cuda subpackage --- xorg-x11-drv-nvidia.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index e73ead3..9f1ad70 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -432,6 +432,7 @@ fi ||: %exclude %{_nvidia_libdir}/libcuda.so* %exclude %{_nvidia_libdir}/libnvcuvid.so* %exclude %{_nvidia_libdir}/libnvidia-encode.so* +%exclude %{_nvidia_libdir}/libnvidia-ml.so* %ifarch x86_64 i686 %if 0%{?fedora} > 18 %exclude %{_nvidia_libdir}/libOpenCL.so.* @@ -460,6 +461,7 @@ fi ||: %{_nvidia_libdir}/libcuda.so* %{_nvidia_libdir}/libnvcuvid.so* %{_nvidia_libdir}/libnvidia-encode.so* +%{_nvidia_libdir}/libnvidia-ml.so* %ifarch x86_64 i686 %dir %{_sysconfdir}/OpenCL %dir %{_sysconfdir}/OpenCL/vendors From a32c3635e8ce7d16187dd7dc5f541a7750a97a52 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 18 Aug 2014 21:33:59 +0000 Subject: [PATCH 034/101] Update changlog --- xorg-x11-drv-nvidia.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 9f1ad70..223d50d 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 343.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -495,9 +495,11 @@ fi ||: %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-fbc.so -%{_nvidia_libdir}/libnvidia-ml.so %changelog +* Mon Aug 18 2014 Nicolas Chauvet - 1:343.13-3 +- Add libnvidia-ml.so to the -cuda subpackage + * Sat Aug 16 2014 Nicolas Chauvet - 1:343.13-2 - Fix prelink and nvidia - rfbz#3258 - Split cuda and opencl into a cuda subpackage - rfbz#2973 From 4ad65bea58f2e41fa288c7d0d666deaa3d80fc42 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 19 Sep 2014 11:57:16 +0000 Subject: [PATCH 035/101] * Fri Sep 19 2014 Leigh Scott - 1:343.22-1 - Update to 343.22 - Remove IgnoreABI xorg override --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 14 ++++++++++---- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 11276c8..6bfea7b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-x86-343.13.run -NVIDIA-Linux-x86_64-343.13.run -NVIDIA-Linux-armv7l-gnueabihf-343.13.run +NVIDIA-Linux-armv7l-gnueabihf-343.22.run +NVIDIA-Linux-x86-343.22.run +NVIDIA-Linux-x86_64-343.22.run diff --git a/sources b/sources index 8bb1966..9391e09 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -c708d533410ababc7a792fd132e5c51b NVIDIA-Linux-x86-343.13.run -583597fb4793542a65a889b6262a8816 NVIDIA-Linux-x86_64-343.13.run -e280f04ec10e155e0f73c1d9ae629fdf NVIDIA-Linux-armv7l-gnueabihf-343.13.run +700f4ae82284d73a34b080ff7f057b4a NVIDIA-Linux-armv7l-gnueabihf-343.22.run +696d0bfa7195e22e0c4bd858fff2abb6 NVIDIA-Linux-x86-343.22.run +36841328bd3f642e860dca8d26cb90c9 NVIDIA-Linux-x86_64-343.22.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 223d50d..d1842e7 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 343.13 -Release: 3%{?dist} +Version: 343.22 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -235,7 +235,8 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d -install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +# Comment Xorg abi override +#install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ @@ -394,7 +395,8 @@ fi ||: %dir %{_sysconfdir}/nvidia %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf -%config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf +# Comment Xorg abi override +#config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop @@ -497,6 +499,10 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Fri Sep 19 2014 Leigh Scott - 1:343.22-1 +- Update to 343.22 +- Remove IgnoreABI xorg override + * Mon Aug 18 2014 Nicolas Chauvet - 1:343.13-3 - Add libnvidia-ml.so to the -cuda subpackage From 8b64a2fc884417ce0c6a0bbdbd87f1fd6b244d7f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 13 Oct 2014 18:49:21 +0000 Subject: [PATCH 036/101] Fixup --- xorg-x11-drv-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d1842e7..77496ce 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -304,7 +304,7 @@ fi %pre libs if [ -d %{_sysconfdir}/prelink.conf.d ]; then -echo "-b %{_nvidia_libdir}" > %{_sysconfdir}/prelink.conf.d/nvidia-%{lib}.conf +echo "-b %{_nvidia_libdir}" > %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf fi %post From 9d40311c720ae6fac15b8acf6d11fd039179543a Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 13 Oct 2014 18:53:54 +0000 Subject: [PATCH 037/101] Fix prelink hack --- xorg-x11-drv-nvidia.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 77496ce..107f895 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 343.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -499,6 +499,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Mon Oct 13 2014 kwizart - 1:343.22-2 +- Fix prelink hack - rfbz#3258#c13 + * Fri Sep 19 2014 Leigh Scott - 1:343.22-1 - Update to 343.22 - Remove IgnoreABI xorg override From 9e9101d8558eec65a29febcb5d7f69c92d130952 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 8 Dec 2014 13:34:25 +0000 Subject: [PATCH 038/101] Switch libnvidia-ml back to multilibs --- xorg-x11-drv-nvidia.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 107f895..5a142a1 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 343.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -434,7 +434,6 @@ fi ||: %exclude %{_nvidia_libdir}/libcuda.so* %exclude %{_nvidia_libdir}/libnvcuvid.so* %exclude %{_nvidia_libdir}/libnvidia-encode.so* -%exclude %{_nvidia_libdir}/libnvidia-ml.so* %ifarch x86_64 i686 %if 0%{?fedora} > 18 %exclude %{_nvidia_libdir}/libOpenCL.so.* @@ -463,7 +462,6 @@ fi ||: %{_nvidia_libdir}/libcuda.so* %{_nvidia_libdir}/libnvcuvid.so* %{_nvidia_libdir}/libnvidia-encode.so* -%{_nvidia_libdir}/libnvidia-ml.so* %ifarch x86_64 i686 %dir %{_sysconfdir}/OpenCL %dir %{_sysconfdir}/OpenCL/vendors @@ -499,6 +497,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Mon Dec 08 2014 Nicolas Chauvet - 1:343.22-3 +- Switch libnvidia-ml back to multilibs + * Mon Oct 13 2014 kwizart - 1:343.22-2 - Fix prelink hack - rfbz#3258#c13 From 00b9fd948ee2e04dcf03226713267fc06b10e7dd Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 8 Dec 2014 13:46:19 +0000 Subject: [PATCH 039/101] Fixup --- xorg-x11-drv-nvidia.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 5a142a1..8cac1b6 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -287,6 +287,9 @@ sed -i -e "s/__USER__/root/" $RPM_BUILD_ROOT%{_unitdir}/nvidia-persistenced.serv #Create the default nvidia config directory mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nvidia +#Ghost Xorg nvidia.conf file +touch $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/nvidia.conf + #Install the nvidia kernel modules sources archive mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version} tar Jcf $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz kernel @@ -393,6 +396,7 @@ fi ||: %doc nvidiapkg/nvidia-application-profiles-%{version}-rc %doc nvidiapkg/html %dir %{_sysconfdir}/nvidia +%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf # Comment Xorg abi override @@ -440,6 +444,7 @@ fi ||: %endif %exclude %{_nvidia_libdir}/libnvidia-compiler.so* %exclude %{_nvidia_libdir}/libnvidia-opencl.so* +%{_nvidia_libdir}/libnvidia-ml.so* %dir %{_nvidia_libdir}/tls %{_nvidia_libdir}/tls/*.so.* %endif @@ -499,6 +504,7 @@ fi ||: %changelog * Mon Dec 08 2014 Nicolas Chauvet - 1:343.22-3 - Switch libnvidia-ml back to multilibs +- ghost /etc/X11/xorg.conf.d/nvidia.conf file * Mon Oct 13 2014 kwizart - 1:343.22-2 - Fix prelink hack - rfbz#3258#c13 From fea1838753831586f3e88841305e42065fa87a94 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 16 Dec 2014 15:52:32 +0000 Subject: [PATCH 040/101] * Tue Dec 16 2014 Leigh Scott - 1:343.36-1 - Update to 343.36 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 6bfea7b..f8af7bc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-343.22.run -NVIDIA-Linux-x86-343.22.run -NVIDIA-Linux-x86_64-343.22.run +NVIDIA-Linux-armv7l-gnueabihf-343.36.run +NVIDIA-Linux-x86-343.36.run +NVIDIA-Linux-x86_64-343.36.run diff --git a/sources b/sources index 9391e09..02a9cc9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -700f4ae82284d73a34b080ff7f057b4a NVIDIA-Linux-armv7l-gnueabihf-343.22.run -696d0bfa7195e22e0c4bd858fff2abb6 NVIDIA-Linux-x86-343.22.run -36841328bd3f642e860dca8d26cb90c9 NVIDIA-Linux-x86_64-343.22.run +eb7b19982aa435544c29b0f163236a9d NVIDIA-Linux-armv7l-gnueabihf-343.36.run +eae5d5407df0b371929a76f96aec4020 NVIDIA-Linux-x86-343.36.run +ff6a3dff5f334b2af0a1c29c7ac311e9 NVIDIA-Linux-x86_64-343.36.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 8cac1b6..a69a7e3 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 343.22 -Release: 3%{?dist} +Version: 343.36 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -502,6 +502,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Tue Dec 16 2014 Leigh Scott - 1:343.36-1 +- Update to 343.36 + * Mon Dec 08 2014 Nicolas Chauvet - 1:343.22-3 - Switch libnvidia-ml back to multilibs - ghost /etc/X11/xorg.conf.d/nvidia.conf file From 31f0a62403969c3a7767673a9795a0fb465a326c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 11 Jan 2015 11:56:33 +0000 Subject: [PATCH 041/101] - Move libnvidia-ml back into -cuda along with nvidia-debugdump --- xorg-x11-drv-nvidia.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index a69a7e3..3c5ea37 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 343.36 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -405,7 +405,6 @@ fi ||: %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop %{_bindir}/nvidia-bug-report.sh -%{_bindir}/nvidia-debugdump %{_bindir}/nvidia-settings %{_bindir}/nvidia-xconfig # Xorg libs that do not need to be multilib @@ -444,7 +443,6 @@ fi ||: %endif %exclude %{_nvidia_libdir}/libnvidia-compiler.so* %exclude %{_nvidia_libdir}/libnvidia-opencl.so* -%{_nvidia_libdir}/libnvidia-ml.so* %dir %{_nvidia_libdir}/tls %{_nvidia_libdir}/tls/*.so.* %endif @@ -457,6 +455,7 @@ fi ||: %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 %{_unitdir}/nvidia-persistenced.service %endif +%{_bindir}/nvidia-debugdump %{_bindir}/nvidia-smi %{_bindir}/nvidia-cuda-mps-control %{_bindir}/nvidia-cuda-mps-server @@ -467,6 +466,7 @@ fi ||: %{_nvidia_libdir}/libcuda.so* %{_nvidia_libdir}/libnvcuvid.so* %{_nvidia_libdir}/libnvidia-encode.so* +%{_nvidia_libdir}/libnvidia-ml.so* %ifarch x86_64 i686 %dir %{_sysconfdir}/OpenCL %dir %{_sysconfdir}/OpenCL/vendors @@ -502,6 +502,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Sun Jan 11 2015 Nicolas Chauvet - 1:343.36-2 +- Move libnvidia-ml back into -cuda along with nvidia-debugdump + * Tue Dec 16 2014 Leigh Scott - 1:343.36-1 - Update to 343.36 From cf8ad5c433423c288f48589e26795aea971bc672 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 16 Jan 2015 17:04:22 +0000 Subject: [PATCH 042/101] Fixup nvidia.icd perm --- xorg-x11-drv-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 3c5ea37..1086818 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -179,7 +179,7 @@ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ %ifarch x86_64 i686 # OpenCL config install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/ -install -p -m 0755 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/ +install -p -m 0644 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/ install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1 ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so From b9932ad0980ca97953fb1c8b69d15e2d05a4d98b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 17 Jan 2015 00:26:36 +0000 Subject: [PATCH 043/101] * Fri Jan 16 2015 Leigh Scott - 1:346.35-1 - Update to 346.35 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 10 ++++++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f8af7bc..d0a5436 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-343.36.run -NVIDIA-Linux-x86-343.36.run -NVIDIA-Linux-x86_64-343.36.run +NVIDIA-Linux-armv7l-gnueabihf-346.35.run +NVIDIA-Linux-x86-346.35.run +NVIDIA-Linux-x86_64-346.35.run diff --git a/sources b/sources index 02a9cc9..23066bc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -eb7b19982aa435544c29b0f163236a9d NVIDIA-Linux-armv7l-gnueabihf-343.36.run -eae5d5407df0b371929a76f96aec4020 NVIDIA-Linux-x86-343.36.run -ff6a3dff5f334b2af0a1c29c7ac311e9 NVIDIA-Linux-x86_64-343.36.run +fff0937cd11b22b86e37fbdcfef8556f NVIDIA-Linux-armv7l-gnueabihf-346.35.run +d2b8f7f90ef5037f03f94519f9809511 NVIDIA-Linux-x86-346.35.run +f225dd17a6b325ba6aa98c6035c62d78 NVIDIA-Linux-x86_64-346.35.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 1086818..2351a69 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 343.36 -Release: 2%{?dist} +Version: 346.35 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -412,6 +412,9 @@ fi ||: %{_nvidia_xorgdir}/*.so* %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} +# It's time that nvidia-settings used gtk3 +%exclude %{_nvidia_libdir}/libnvidia-gtk2.so +%{_nvidia_libdir}/libnvidia-gtk3.so #/no_multilib %if 0%{?fedora} >= 21 %{_datadir}/X11/xorg.conf.d/nvidia.conf @@ -502,6 +505,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Fri Jan 16 2015 Leigh Scott - 1:346.35-1 +- Update to 346.35 + * Sun Jan 11 2015 Nicolas Chauvet - 1:343.36-2 - Move libnvidia-ml back into -cuda along with nvidia-debugdump From f25992297ff957e508189162a3350857bc868b03 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 21 Jan 2015 17:33:55 +0000 Subject: [PATCH 044/101] * Wed Jan 21 2015 Leigh Scott - 1:346.35-2 - clean up gtk from libs sub-package --- xorg-x11-drv-nvidia.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 2351a69..c56906f 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 346.35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -413,8 +413,8 @@ fi ||: %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} # It's time that nvidia-settings used gtk3 -%exclude %{_nvidia_libdir}/libnvidia-gtk2.so -%{_nvidia_libdir}/libnvidia-gtk3.so +%exclude %{_nvidia_libdir}/libnvidia-gtk2.so* +%{_nvidia_libdir}/libnvidia-gtk3.so* #/no_multilib %if 0%{?fedora} >= 21 %{_datadir}/X11/xorg.conf.d/nvidia.conf @@ -438,6 +438,7 @@ fi ||: %{_nvidia_libdir}/alternate-install-present %{_nvidia_libdir}/*.so.* %exclude %{_nvidia_libdir}/libcuda.so* +%exclude %{_nvidia_libdir}/libnvidia-gtk*.so* %exclude %{_nvidia_libdir}/libnvcuvid.so* %exclude %{_nvidia_libdir}/libnvidia-encode.so* %ifarch x86_64 i686 @@ -505,6 +506,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Wed Jan 21 2015 Leigh Scott - 1:346.35-2 +- clean up gtk from libs sub-package + * Fri Jan 16 2015 Leigh Scott - 1:346.35-1 - Update to 346.35 From 6b10566099f3961171e7b4946a7ef07adc5698b6 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 26 Jan 2015 10:46:43 +0000 Subject: [PATCH 045/101] Add cuda-driver-devel and %{_isa} virtual provides --- xorg-x11-drv-nvidia.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index c56906f..d215f45 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 346.35 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -88,6 +88,10 @@ Group: Development/Libraries Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} Requires: %{name}-cuda%{_isa} = %{?epoch}:%{version}-%{release} +#Don't put an epoch here +Provides: cuda-drivers-devel = %{version} +Provides: cuda-drivers-devel%{_isa} = %{version} + %description devel This package provides the development files of the %{name} package, such as OpenGL headers. @@ -103,6 +107,7 @@ Conflicts: xorg-x11-drv-nvidia-340xx-cuda #Don't put an epoch here Provides: cuda-drivers = %{version} +Provides: cuda-drivers%{_isa} = %{version} %description cuda This package provides the CUDA driver libraries. @@ -506,6 +511,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Mon Jan 26 2015 Nicolas Chauvet - 1:346.35-3 +- Add cuda-driver-devel and %%{_isa} virtual provides + * Wed Jan 21 2015 Leigh Scott - 1:346.35-2 - clean up gtk from libs sub-package From 9cf22a584f1d0129557b7294358005a4b5a08331 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sun, 15 Feb 2015 22:04:20 +0000 Subject: [PATCH 046/101] Fix package on armhfp --- xorg-x11-drv-nvidia.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d215f45..c8fd837 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 346.35 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -418,8 +418,12 @@ fi ||: %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} # It's time that nvidia-settings used gtk3 +%ifarch %{arm} +%{_nvidia_libdir}/libnvidia-gtk2.so* +%else %exclude %{_nvidia_libdir}/libnvidia-gtk2.so* %{_nvidia_libdir}/libnvidia-gtk3.so* +%endif #/no_multilib %if 0%{?fedora} >= 21 %{_datadir}/X11/xorg.conf.d/nvidia.conf @@ -511,6 +515,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Sun Feb 15 2015 Nicolas Chauvet - 1:346.35-4 +- Fix build for armhfp + * Mon Jan 26 2015 Nicolas Chauvet - 1:346.35-3 - Add cuda-driver-devel and %%{_isa} virtual provides From 79e59f7eef440547efa738b33efa02cf9448e281 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 24 Feb 2015 17:53:01 +0000 Subject: [PATCH 047/101] * Tue Feb 24 2015 Leigh Scott - 1:346.47-1 - Update to 343.47 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index d0a5436..b8ab51f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-346.35.run -NVIDIA-Linux-x86-346.35.run -NVIDIA-Linux-x86_64-346.35.run +NVIDIA-Linux-armv7l-gnueabihf-346.47.run +NVIDIA-Linux-x86-346.47.run +NVIDIA-Linux-x86_64-346.47.run diff --git a/sources b/sources index 23066bc..a58bc22 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -fff0937cd11b22b86e37fbdcfef8556f NVIDIA-Linux-armv7l-gnueabihf-346.35.run -d2b8f7f90ef5037f03f94519f9809511 NVIDIA-Linux-x86-346.35.run -f225dd17a6b325ba6aa98c6035c62d78 NVIDIA-Linux-x86_64-346.35.run +10f1bd71d061cadf5c716bdd03f4b5b2 NVIDIA-Linux-armv7l-gnueabihf-346.47.run +ae61b6c3c081383f991bcc64ee0844b1 NVIDIA-Linux-x86-346.47.run +3fd4affac0165058fcdbbc6f18d84e2d NVIDIA-Linux-x86_64-346.47.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index c8fd837..5d398d6 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 346.35 -Release: 4%{?dist} +Version: 346.47 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -515,6 +515,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Tue Feb 24 2015 Leigh Scott - 1:346.47-1 +- Update to 343.47 + * Sun Feb 15 2015 Nicolas Chauvet - 1:346.35-4 - Fix build for armhfp From 5d8cf6c83b9c70691313ea41a10542291ebce457 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 8 Apr 2015 06:30:56 +0000 Subject: [PATCH 048/101] * Wed Apr 08 2015 Leigh Scott - 1:346.59-1 - Update to 343.59 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b8ab51f..97c427a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-346.47.run -NVIDIA-Linux-x86-346.47.run -NVIDIA-Linux-x86_64-346.47.run +NVIDIA-Linux-armv7l-gnueabihf-346.59.run +NVIDIA-Linux-x86-346.59.run +NVIDIA-Linux-x86_64-346.59.run diff --git a/sources b/sources index a58bc22..fcfe867 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -10f1bd71d061cadf5c716bdd03f4b5b2 NVIDIA-Linux-armv7l-gnueabihf-346.47.run -ae61b6c3c081383f991bcc64ee0844b1 NVIDIA-Linux-x86-346.47.run -3fd4affac0165058fcdbbc6f18d84e2d NVIDIA-Linux-x86_64-346.47.run +ab738899ae9df323fffb244114589795 NVIDIA-Linux-armv7l-gnueabihf-346.59.run +565800c3d9bf347eb35a393f48a6b7f3 NVIDIA-Linux-x86-346.59.run +48af6c1e518bbfa204849003a1a44bc5 NVIDIA-Linux-x86_64-346.59.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 5d398d6..fd2e0f3 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 346.47 +Version: 346.59 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -515,6 +515,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Wed Apr 08 2015 Leigh Scott - 1:346.59-1 +- Update to 343.59 + * Tue Feb 24 2015 Leigh Scott - 1:346.47-1 - Update to 343.47 From dc3d2b7e39af97eb04ae1654a0471b53e0d61b32 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 20 May 2015 11:55:05 +0000 Subject: [PATCH 049/101] * Wed May 20 2015 Leigh Scott - 1:346.72-1 - Update to 343.72 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 97c427a..789a077 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-346.59.run -NVIDIA-Linux-x86-346.59.run -NVIDIA-Linux-x86_64-346.59.run +NVIDIA-Linux-armv7l-gnueabihf-346.72.run +NVIDIA-Linux-x86-346.72.run +NVIDIA-Linux-x86_64-346.72.run diff --git a/sources b/sources index fcfe867..a6d74bc 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ab738899ae9df323fffb244114589795 NVIDIA-Linux-armv7l-gnueabihf-346.59.run -565800c3d9bf347eb35a393f48a6b7f3 NVIDIA-Linux-x86-346.59.run -48af6c1e518bbfa204849003a1a44bc5 NVIDIA-Linux-x86_64-346.59.run +e54023782fa1b4155f2adb97bea91a76 NVIDIA-Linux-armv7l-gnueabihf-346.72.run +e295577d8effdc9873624912762e57ee NVIDIA-Linux-x86-346.72.run +4542dbad456bde9461143bdcf26965e4 NVIDIA-Linux-x86_64-346.72.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index fd2e0f3..d97d4b3 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 346.59 +Version: 346.72 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -515,6 +515,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Wed May 20 2015 Leigh Scott - 1:346.72-1 +- Update to 343.72 + * Wed Apr 08 2015 Leigh Scott - 1:346.59-1 - Update to 343.59 From df7a0aba0050e6ffde4e63d03b616be26a2077dc Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 16 Jun 2015 05:19:39 +0000 Subject: [PATCH 050/101] * Mon Jun 15 2015 Leigh Scott - 1:352.21-1 - Update to 352.21 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 789a077..b67c1d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-346.72.run -NVIDIA-Linux-x86-346.72.run -NVIDIA-Linux-x86_64-346.72.run +NVIDIA-Linux-armv7l-gnueabihf-352.21.run +NVIDIA-Linux-x86-352.21.run +NVIDIA-Linux-x86_64-352.21.run diff --git a/sources b/sources index a6d74bc..3988e76 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e54023782fa1b4155f2adb97bea91a76 NVIDIA-Linux-armv7l-gnueabihf-346.72.run -e295577d8effdc9873624912762e57ee NVIDIA-Linux-x86-346.72.run -4542dbad456bde9461143bdcf26965e4 NVIDIA-Linux-x86_64-346.72.run +764d542ace601ae909720ac30242c560 NVIDIA-Linux-armv7l-gnueabihf-352.21.run +c91760a04f658845722380f6c7fd4709 NVIDIA-Linux-x86-352.21.run +60bcf9f25c0736b17a48bf1e060cb271 NVIDIA-Linux-x86_64-352.21.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d97d4b3..a78d8a2 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 346.72 +Version: 352.21 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -515,6 +515,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Mon Jun 15 2015 Leigh Scott - 1:352.21-1 +- Update to 352.21 + * Wed May 20 2015 Leigh Scott - 1:346.72-1 - Update to 343.72 From bd2d9847d80c47ef0fe51eb69772d2de1595153b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 28 Jul 2015 22:04:12 +0000 Subject: [PATCH 051/101] * Tue Jul 28 2015 Leigh Scott - 1:352.30-1 - Update to 352.30 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b67c1d1..564fc1e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-352.21.run -NVIDIA-Linux-x86-352.21.run -NVIDIA-Linux-x86_64-352.21.run +NVIDIA-Linux-armv7l-gnueabihf-352.30.run +NVIDIA-Linux-x86-352.30.run +NVIDIA-Linux-x86_64-352.30.run diff --git a/sources b/sources index 3988e76..b189b4f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -764d542ace601ae909720ac30242c560 NVIDIA-Linux-armv7l-gnueabihf-352.21.run -c91760a04f658845722380f6c7fd4709 NVIDIA-Linux-x86-352.21.run -60bcf9f25c0736b17a48bf1e060cb271 NVIDIA-Linux-x86_64-352.21.run +ded04c78f6bee76bb9a86a7fbabe996c NVIDIA-Linux-armv7l-gnueabihf-352.30.run +7e59d84eafe2482b2f02df692b9168d5 NVIDIA-Linux-x86-352.30.run +c0575f929dd3b7735d586c1d862b0380 NVIDIA-Linux-x86_64-352.30.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index a78d8a2..87a2809 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 352.21 +Version: 352.30 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -515,6 +515,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Tue Jul 28 2015 Leigh Scott - 1:352.30-1 +- Update to 352.30 + * Mon Jun 15 2015 Leigh Scott - 1:352.21-1 - Update to 352.21 From 083700b4e406842f863b7e2c5ccf8d9f5be1faab Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 28 Aug 2015 20:57:23 +0000 Subject: [PATCH 052/101] * Fri Aug 28 2015 Leigh Scott - 1:352.41-1 - Update to 352.41 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 564fc1e..1b3414c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-352.30.run -NVIDIA-Linux-x86-352.30.run -NVIDIA-Linux-x86_64-352.30.run +NVIDIA-Linux-armv7l-gnueabihf-352.41.run +NVIDIA-Linux-x86-352.41.run +NVIDIA-Linux-x86_64-352.41.run diff --git a/sources b/sources index b189b4f..522858c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ded04c78f6bee76bb9a86a7fbabe996c NVIDIA-Linux-armv7l-gnueabihf-352.30.run -7e59d84eafe2482b2f02df692b9168d5 NVIDIA-Linux-x86-352.30.run -c0575f929dd3b7735d586c1d862b0380 NVIDIA-Linux-x86_64-352.30.run +4c29bc7a5e52d9a68b3581a39bd6e749 NVIDIA-Linux-armv7l-gnueabihf-352.41.run +3f9c9fed035fa845e3f6a1ea5f5732f7 NVIDIA-Linux-x86-352.41.run +d828258194ea4672e3935f96402410c2 NVIDIA-Linux-x86_64-352.41.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 87a2809..1d965a6 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 352.30 +Version: 352.41 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -515,6 +515,9 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %changelog +* Fri Aug 28 2015 Leigh Scott - 1:352.41-1 +- Update to 352.41 + * Tue Jul 28 2015 Leigh Scott - 1:352.30-1 - Update to 352.30 From ac95b5d2afec69ef88f20d0b63cabf787c86d8bc Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 2 Sep 2015 23:10:30 +0000 Subject: [PATCH 053/101] * Mon Aug 31 2015 Leigh Scott - 1:355.11-1 - Update to 355.11 --- .gitignore | 6 +++--- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 14 +++++++++++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 1b3414c..abccdbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-352.41.run -NVIDIA-Linux-x86-352.41.run -NVIDIA-Linux-x86_64-352.41.run +NVIDIA-Linux-armv7l-gnueabihf-355.11.run +NVIDIA-Linux-x86-355.11.run +NVIDIA-Linux-x86_64-355.11.run diff --git a/sources b/sources index 522858c..0c509e3 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -4c29bc7a5e52d9a68b3581a39bd6e749 NVIDIA-Linux-armv7l-gnueabihf-352.41.run -3f9c9fed035fa845e3f6a1ea5f5732f7 NVIDIA-Linux-x86-352.41.run -d828258194ea4672e3935f96402410c2 NVIDIA-Linux-x86_64-352.41.run +1a411939003e964d133d28ee746abace NVIDIA-Linux-armv7l-gnueabihf-355.11.run +16d143ccafe99328a2ca8e5a396fd4bc NVIDIA-Linux-x86-355.11.run +50b48e69dc8c3b4b9940f662e1c374be NVIDIA-Linux-x86_64-355.11.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 1d965a6..39fc6f5 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 352.41 +Version: 355.11 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -181,6 +181,14 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/ %endif +# install stuff the wildcard missed +install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/ +ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so +install -p -m 0755 libEGL_nvidia.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ +install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ +install -p -m 0755 libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ +ln -s libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenGL.so + %ifarch x86_64 i686 # OpenCL config install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/ @@ -513,8 +521,12 @@ fi ||: %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-fbc.so +%{_nvidia_libdir}/libOpenGL.so %changelog +* Mon Aug 31 2015 Leigh Scott - 1:355.11-1 +- Update to 355.11 + * Fri Aug 28 2015 Leigh Scott - 1:352.41-1 - Update to 352.41 From 72ae0ec64ace0a7a6abf77c6533d56ee54982cca Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 21 Nov 2015 11:14:05 +0000 Subject: [PATCH 054/101] Update to latest upstream --- .gitignore | 6 +++--- 00-ignoreabi.conf | 3 --- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 17 ++++++----------- 4 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 00-ignoreabi.conf diff --git a/.gitignore b/.gitignore index abccdbe..7c5991a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -NVIDIA-Linux-armv7l-gnueabihf-355.11.run -NVIDIA-Linux-x86-355.11.run -NVIDIA-Linux-x86_64-355.11.run +NVIDIA-Linux-armv7l-gnueabihf-358.16.run +NVIDIA-Linux-x86-358.16.run +NVIDIA-Linux-x86_64-358.16.run diff --git a/00-ignoreabi.conf b/00-ignoreabi.conf deleted file mode 100644 index c2071f1..0000000 --- a/00-ignoreabi.conf +++ /dev/null @@ -1,3 +0,0 @@ -Section "ServerFlags" - Option "IgnoreABI" "True" -EndSection diff --git a/sources b/sources index 0c509e3..a9652b8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -1a411939003e964d133d28ee746abace NVIDIA-Linux-armv7l-gnueabihf-355.11.run -16d143ccafe99328a2ca8e5a396fd4bc NVIDIA-Linux-x86-355.11.run -50b48e69dc8c3b4b9940f662e1c374be NVIDIA-Linux-x86_64-355.11.run +242eb8b93fd5777f17eae1e8df2b9444 NVIDIA-Linux-armv7l-gnueabihf-358.16.run +5dfe11ca13548ca4813b10f3223d6014 NVIDIA-Linux-x86-358.16.run +b766c62e2168cb9e125e5ae3bada4383 NVIDIA-Linux-x86_64-358.16.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 39fc6f5..8b2c24e 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 355.11 +Version: 358.16 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -22,7 +22,6 @@ Source3: nvidia-xorg.conf Source5: 00-avoid-glamor.conf Source6: blacklist-nouveau.conf Source7: alternate-install-present -Source8: 00-ignoreabi.conf Source9: nvidia-settings.desktop Source10: nvidia.conf @@ -248,8 +247,6 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d -# Comment Xorg abi override -#install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ @@ -356,11 +353,6 @@ fi || : %systemd_post nvidia-persistenced.service %endif -%if 0%{?fedora} < 21 -%posttrans - [ -f %{_sysconfdir}/X11/xorg.conf ] || \ - cp -p %{_sysconfdir}/X11/nvidia-xorg.conf %{_sysconfdir}/X11/xorg.conf || : -%endif %preun if [ "$1" -eq "0" ]; then @@ -412,8 +404,6 @@ fi ||: %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf -# Comment Xorg abi override -#config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop @@ -524,6 +514,11 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Sat Nov 21 2015 Nicolas Chauvet - 1:358.16-1 +- Update to 358.16 +- Remove posttrans for fedora < 21 +- Remove ignoreabi config file as it rarely works + * Mon Aug 31 2015 Leigh Scott - 1:355.11-1 - Update to 355.11 From 1194dbeabe341e42eef6e951065f2b7dcad28dc9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 27 Jan 2016 11:40:51 +0100 Subject: [PATCH 055/101] Fix GFXPAYLOAD on EFI --- xorg-x11-drv-nvidia.spec | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 8b2c24e..4b11609 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 358.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -328,7 +328,12 @@ if [ "$1" -eq "1" ]; then GFXPAYLOAD="vga=normal" else echo "GRUB_GFXPAYLOAD_LINUX=text" >> %{_sysconfdir}/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg + if [ -f /boot/grub2/grub.cfg ]; then + /sbin/grub2-mkconfig -o /boot/grub2/grub.cfg + fi + if [ -f /boot/efi/EFI/fedora/grub.cfg ]; then + /sbin/grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg + fi fi if [ -x /sbin/grubby ] ; then KERNELS=`/sbin/grubby --default-kernel` @@ -361,6 +366,12 @@ if [ "$1" -eq "0" ]; then ISGRUB1="--grub" else sed -i -e 's|GRUB_GFXPAYLOAD_LINUX=text||g' /etc/default/grub + if [ -f /boot/grub2/grub.cfg ]; then + /sbin/grub2-mkconfig -o /boot/grub2/grub.cfg + fi + if [ -f /boot/efi/EFI/fedora/grub.cfg ]; then + /sbin/grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg + fi fi if [ -x /sbin/grubby ] ; then DIST=`rpm -E %%{?dist}` @@ -514,6 +525,13 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Wed Jan 27 2016 Nicolas Chauvet - 1:358.16-2 +- Enforce GRUB_GFXPAYLOAD_LINUX=text even for EFI - prevent this message: + The NVIDIA Linux graphics driver requires the use of a text-mode VGA console + Use of other console drivers including, but not limited to, vesafb, may + result in corruption and stability problems, and is not supported. + To verify , check cat /proc/driver/nvidia/./warnings/fbdev + * Sat Nov 21 2015 Nicolas Chauvet - 1:358.16-1 - Update to 358.16 - Remove posttrans for fedora < 21 From 7c2bc9b9ad12ac0cda99f70fb1eb3f7ed8630320 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 22 Jun 2016 16:52:37 +0200 Subject: [PATCH 056/101] Update to 367.27 --- xorg-x11-drv-nvidia.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 4b11609..737de1a 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 358.16 -Release: 2%{?dist} +Version: 367.27 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -525,6 +525,9 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Wed Jun 22 2016 Nicolas Chauvet - 1:367.27-1 +- Update to 367.27 + * Wed Jan 27 2016 Nicolas Chauvet - 1:358.16-2 - Enforce GRUB_GFXPAYLOAD_LINUX=text even for EFI - prevent this message: The NVIDIA Linux graphics driver requires the use of a text-mode VGA console From 9e00d61ac94de3d0a849e6c407edcdf9f9b50665 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 1 Jul 2016 08:08:56 +0100 Subject: [PATCH 057/101] Update to 367.27 --- sources | 6 +++--- xorg-x11-drv-nvidia.spec | 18 +++++++++++++----- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/sources b/sources index a9652b8..3e3ffe6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -242eb8b93fd5777f17eae1e8df2b9444 NVIDIA-Linux-armv7l-gnueabihf-358.16.run -5dfe11ca13548ca4813b10f3223d6014 NVIDIA-Linux-x86-358.16.run -b766c62e2168cb9e125e5ae3bada4383 NVIDIA-Linux-x86_64-358.16.run +e0c9cd78dc0575073d10fd13fe895d67 NVIDIA-Linux-armv7l-gnueabihf-367.27.run +f32b9ab673acce56990f2b5acdc1e77f NVIDIA-Linux-x86-367.27.run +8f146c8270430af73c7b4333f1c46eb8 NVIDIA-Linux-x86_64-367.27.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 737de1a..337c54f 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -183,7 +183,7 @@ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ # install stuff the wildcard missed install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so -install -p -m 0755 libEGL_nvidia.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ +install -p -m 0755 libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ install -p -m 0755 libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenGL.so @@ -515,16 +515,24 @@ fi ||: %{_libdir}/vdpau/libvdpau_nvidia.so %{_nvidia_libdir}/libnvidia-ifr.so %{_nvidia_libdir}/libEGL.so -%{_nvidia_libdir}/libGLESv1_CM.so -%{_nvidia_libdir}/libGLESv2.so +%{_nvidia_libdir}/libEGL_nvidia.so +%{_nvidia_libdir}/libGLESv1_CM_nvidia.so +%{_nvidia_libdir}/libGLESv2_nvidia.so %{_nvidia_libdir}/libnvidia-eglcore.so +%{_nvidia_libdir}/libnvidia-egl-wayland.so +%{_nvidia_libdir}/libnvidia-fatbinaryloader.so +%{_nvidia_libdir}/libnvidia-fbc.so +%{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-glsi.so +%{_nvidia_libdir}/libnvidia-ptxjitcompiler.so %{_nvidia_libdir}/libGL.so -%{_nvidia_libdir}/libnvidia-glcore.so -%{_nvidia_libdir}/libnvidia-fbc.so +%{_nvidia_libdir}/libGLX_nvidia.so %{_nvidia_libdir}/libOpenGL.so %changelog +* Fri Jul 01 2016 Leigh Scott - 1:367.27-1 +- Update to 367.27 + * Wed Jun 22 2016 Nicolas Chauvet - 1:367.27-1 - Update to 367.27 From aba02dc050ae69b4e212ebc0e859f3864d6e33d5 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 16 Jul 2016 18:38:22 +0100 Subject: [PATCH 058/101] Add vulkan icd profile --- xorg-x11-drv-nvidia.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 337c54f..d0a8925 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 367.27 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -197,6 +197,10 @@ ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1 ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so %endif +# Vulkan config +install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/vulkan/icd.d/ +install -p -m 0644 nvidia_icd.json $RPM_BUILD_ROOT%{_sysconfdir}/vulkan/icd.d/ + #Vdpau install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/ install -p -m 0755 libvdpau*.so.%{version} $RPM_BUILD_ROOT%{_libdir}/vdpau @@ -411,6 +415,9 @@ fi ||: %doc nvidiapkg/README.txt %doc nvidiapkg/nvidia-application-profiles-%{version}-rc %doc nvidiapkg/html +%dir %{_sysconfdir}/vulkan +%dir %{_sysconfdir}/vulkan/icd.d +%config %{_sysconfdir}/vulkan/icd.d/nvidia_icd.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf @@ -530,6 +537,9 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Sat Jul 16 2016 Leigh Scott - 1:367.27-2 +- Add vulkan icd profile + * Fri Jul 01 2016 Leigh Scott - 1:367.27-1 - Update to 367.27 From a8a1ef26a52b63bd4b76feaa66c1cff4b01e4c46 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 16 Jul 2016 18:43:41 +0100 Subject: [PATCH 059/101] remove uneeded libvdpau excludes --- xorg-x11-drv-nvidia.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d0a8925..7ad5847 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -475,9 +475,7 @@ fi ||: %dir %{_nvidia_libdir}/tls %{_nvidia_libdir}/tls/*.so.* %endif -%exclude %{_libdir}/vdpau/libvdpau.* %{_libdir}/vdpau/libvdpau_nvidia.so.* -%exclude %{_libdir}/vdpau/libvdpau_trace.so* %files cuda %defattr(-,root,root,-) From 324940ef4ab1d7d9a57326e5e8c483248e32da08 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 16 Jul 2016 19:17:02 +0100 Subject: [PATCH 060/101] no vulkan on arm --- xorg-x11-drv-nvidia.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 7ad5847..4418095 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -195,11 +195,10 @@ install -p -m 0644 nvidia.icd $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/ install -p -m 0755 libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so.1 ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so -%endif - # Vulkan config install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/vulkan/icd.d/ install -p -m 0644 nvidia_icd.json $RPM_BUILD_ROOT%{_sysconfdir}/vulkan/icd.d/ +%endif #Vdpau install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/ @@ -415,9 +414,11 @@ fi ||: %doc nvidiapkg/README.txt %doc nvidiapkg/nvidia-application-profiles-%{version}-rc %doc nvidiapkg/html +%ifarch x86_64 i686 %dir %{_sysconfdir}/vulkan %dir %{_sysconfdir}/vulkan/icd.d %config %{_sysconfdir}/vulkan/icd.d/nvidia_icd.json +%else %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf From ed392b89f075fe133c9b74d2d4a5a927eba60721 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 16 Jul 2016 19:18:24 +0100 Subject: [PATCH 061/101] fix --- xorg-x11-drv-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 4418095..bf864fb 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -418,7 +418,7 @@ fi ||: %dir %{_sysconfdir}/vulkan %dir %{_sysconfdir}/vulkan/icd.d %config %{_sysconfdir}/vulkan/icd.d/nvidia_icd.json -%else +%endif %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf From 6719b37d52513f1fe6b60730613344ce39d4f901 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 17 Jul 2016 14:27:13 +0100 Subject: [PATCH 062/101] Update to 367.35 --- .gitignore | 3 +++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7c5991a..d2e4697 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ NVIDIA-Linux-armv7l-gnueabihf-358.16.run NVIDIA-Linux-x86-358.16.run NVIDIA-Linux-x86_64-358.16.run +/NVIDIA-Linux-armv7l-gnueabihf-367.35.run +/NVIDIA-Linux-x86-367.35.run +/NVIDIA-Linux-x86_64-367.35.run diff --git a/sources b/sources index 3e3ffe6..ce3c206 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -e0c9cd78dc0575073d10fd13fe895d67 NVIDIA-Linux-armv7l-gnueabihf-367.27.run -f32b9ab673acce56990f2b5acdc1e77f NVIDIA-Linux-x86-367.27.run -8f146c8270430af73c7b4333f1c46eb8 NVIDIA-Linux-x86_64-367.27.run +0ddfd2f9ce7c2c1f1949bf22569c4dd1 NVIDIA-Linux-armv7l-gnueabihf-367.35.run +42db6f6485c3c337c7c756380ec64b7a NVIDIA-Linux-x86-367.35.run +04c35b49507ced02f4e9dd08a1796c87 NVIDIA-Linux-x86_64-367.35.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index bf864fb..3ed899e 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 367.27 -Release: 2%{?dist} +Version: 367.35 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -536,6 +536,9 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Sun Jul 17 2016 Leigh Scott - 1:367.35-1 +- Update to 367.35 + * Sat Jul 16 2016 Leigh Scott - 1:367.27-2 - Add vulkan icd profile From 91ebfb59fbb6cab970c0ef4379459473e2f5ad6f Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 27 Jul 2016 10:54:32 +0100 Subject: [PATCH 063/101] small fix to libs install --- xorg-x11-drv-nvidia.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 3ed899e..714cbb4 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -183,7 +183,6 @@ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ # install stuff the wildcard missed install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so -install -p -m 0755 libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ install -p -m 0755 libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenGL.so From d0d08f1113f7c8e884beb01d73b94a26e6aa5d30 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 10 Aug 2016 18:13:17 +0100 Subject: [PATCH 064/101] Move setttings libs to libs sub-package rfbz#3998 --- xorg-x11-drv-nvidia.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 714cbb4..9ae0351 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 367.35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -433,13 +433,6 @@ fi ||: %{_nvidia_xorgdir}/*.so* %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} -# It's time that nvidia-settings used gtk3 -%ifarch %{arm} -%{_nvidia_libdir}/libnvidia-gtk2.so* -%else -%exclude %{_nvidia_libdir}/libnvidia-gtk2.so* -%{_nvidia_libdir}/libnvidia-gtk3.so* -%endif #/no_multilib %if 0%{?fedora} >= 21 %{_datadir}/X11/xorg.conf.d/nvidia.conf @@ -466,6 +459,13 @@ fi ||: %exclude %{_nvidia_libdir}/libnvidia-gtk*.so* %exclude %{_nvidia_libdir}/libnvcuvid.so* %exclude %{_nvidia_libdir}/libnvidia-encode.so* +# It's time that nvidia-settings used gtk3 +%ifarch %{arm} +%{_nvidia_libdir}/libnvidia-gtk2.so* +%else +%exclude %{_nvidia_libdir}/libnvidia-gtk2.so* +%{_nvidia_libdir}/libnvidia-gtk3.so* +%endif %ifarch x86_64 i686 %if 0%{?fedora} > 18 %exclude %{_nvidia_libdir}/libOpenCL.so.* @@ -535,6 +535,9 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Wed Aug 10 2016 Leigh Scott - 1:367.35-2 +- Move setttings libs to libs sub-package rfbz#3998 + * Sun Jul 17 2016 Leigh Scott - 1:367.35-1 - Update to 367.35 From ccbe8c47972272a033bfc6c540d3790eb225d886 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 10 Aug 2016 19:06:09 +0100 Subject: [PATCH 065/101] Revert "Move setttings libs to libs sub-package rfbz#3998" This reverts commit d0d08f1113f7c8e884beb01d73b94a26e6aa5d30. --- xorg-x11-drv-nvidia.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 9ae0351..714cbb4 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 367.35 -Release: 2%{?dist} +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -433,6 +433,13 @@ fi ||: %{_nvidia_xorgdir}/*.so* %{_libdir}/xorg/modules/drivers/nvidia_drv.so %{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} +# It's time that nvidia-settings used gtk3 +%ifarch %{arm} +%{_nvidia_libdir}/libnvidia-gtk2.so* +%else +%exclude %{_nvidia_libdir}/libnvidia-gtk2.so* +%{_nvidia_libdir}/libnvidia-gtk3.so* +%endif #/no_multilib %if 0%{?fedora} >= 21 %{_datadir}/X11/xorg.conf.d/nvidia.conf @@ -459,13 +466,6 @@ fi ||: %exclude %{_nvidia_libdir}/libnvidia-gtk*.so* %exclude %{_nvidia_libdir}/libnvcuvid.so* %exclude %{_nvidia_libdir}/libnvidia-encode.so* -# It's time that nvidia-settings used gtk3 -%ifarch %{arm} -%{_nvidia_libdir}/libnvidia-gtk2.so* -%else -%exclude %{_nvidia_libdir}/libnvidia-gtk2.so* -%{_nvidia_libdir}/libnvidia-gtk3.so* -%endif %ifarch x86_64 i686 %if 0%{?fedora} > 18 %exclude %{_nvidia_libdir}/libOpenCL.so.* @@ -535,9 +535,6 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog -* Wed Aug 10 2016 Leigh Scott - 1:367.35-2 -- Move setttings libs to libs sub-package rfbz#3998 - * Sun Jul 17 2016 Leigh Scott - 1:367.35-1 - Update to 367.35 From f029d666047901699776ca5609337881edb584f9 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 10 Aug 2016 19:08:32 +0100 Subject: [PATCH 066/101] Revert last commit --- xorg-x11-drv-nvidia.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 714cbb4..21cb850 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 367.35 -Release: 1%{?dist} +Release: 3%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -535,6 +535,12 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Wed Aug 10 2016 Leigh Scott - 1:367.35-3 +- Revert last commit + +* Wed Aug 10 2016 Leigh Scott - 1:367.35-2 +- Move setttings libs to libs sub-package rfbz#3998 + * Sun Jul 17 2016 Leigh Scott - 1:367.35-1 - Update to 367.35 From 1b6e42a199ff9e0e3fa12f1ec471cafd09e8c90d Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 10 Aug 2016 19:23:41 +0100 Subject: [PATCH 067/101] add ldconfig in %%post and %%postun for main package rfbz#3998 --- xorg-x11-drv-nvidia.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 21cb850..049d9fb 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -323,6 +323,7 @@ echo "-b %{_nvidia_libdir}" > %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf fi %post +/sbin/ldconfig if [ "$1" -eq "1" ]; then ISGRUB1="" if [[ -f /boot/grub/grub.conf && ! -f /boot/grub2/grub.cfg ]] ; then @@ -398,6 +399,8 @@ fi ||: %systemd_preun nvidia-persistenced.service %endif +%postun -p /sbin/ldconfig + %postun libs -p /sbin/ldconfig %postun cuda @@ -537,6 +540,7 @@ fi ||: %changelog * Wed Aug 10 2016 Leigh Scott - 1:367.35-3 - Revert last commit +- add ldconfig in %%post and %%postun for main package rfbz#3998 * Wed Aug 10 2016 Leigh Scott - 1:367.35-2 - Move setttings libs to libs sub-package rfbz#3998 From 41a0a92369bc4de97e972c0247d9d574d3812a97 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 17 Aug 2016 15:41:18 +0100 Subject: [PATCH 068/101] Fix duplicate lib --- xorg-x11-drv-nvidia.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 049d9fb..c833d7e 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -469,6 +469,7 @@ fi ||: %exclude %{_nvidia_libdir}/libnvidia-gtk*.so* %exclude %{_nvidia_libdir}/libnvcuvid.so* %exclude %{_nvidia_libdir}/libnvidia-encode.so* +%exclude %{_nvidia_libdir}/libnvidia-ml.so* %ifarch x86_64 i686 %if 0%{?fedora} > 18 %exclude %{_nvidia_libdir}/libOpenCL.so.* From 8e6736945186c6c8637719d742fa471d58da9007 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 17 Aug 2016 15:48:30 +0100 Subject: [PATCH 069/101] move some more cuda libs --- xorg-x11-drv-nvidia.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index c833d7e..ee37334 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -469,7 +469,9 @@ fi ||: %exclude %{_nvidia_libdir}/libnvidia-gtk*.so* %exclude %{_nvidia_libdir}/libnvcuvid.so* %exclude %{_nvidia_libdir}/libnvidia-encode.so* +%exclude %{_nvidia_libdir}/libnvidia-fatbinaryloader.so* %exclude %{_nvidia_libdir}/libnvidia-ml.so* +%exclude %{_nvidia_libdir}/libnvidia-ptxjitcompiler.so* %ifarch x86_64 i686 %if 0%{?fedora} > 18 %exclude %{_nvidia_libdir}/libOpenCL.so.* @@ -497,7 +499,9 @@ fi ||: %{_nvidia_libdir}/libcuda.so* %{_nvidia_libdir}/libnvcuvid.so* %{_nvidia_libdir}/libnvidia-encode.so* +%{_nvidia_libdir}/libnvidia-fatbinaryloader.so* %{_nvidia_libdir}/libnvidia-ml.so* +%{_nvidia_libdir}/libnvidia-ptxjitcompiler.so* %ifarch x86_64 i686 %dir %{_sysconfdir}/OpenCL %dir %{_sysconfdir}/OpenCL/vendors @@ -529,11 +533,9 @@ fi ||: %{_nvidia_libdir}/libGLESv2_nvidia.so %{_nvidia_libdir}/libnvidia-eglcore.so %{_nvidia_libdir}/libnvidia-egl-wayland.so -%{_nvidia_libdir}/libnvidia-fatbinaryloader.so %{_nvidia_libdir}/libnvidia-fbc.so %{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-glsi.so -%{_nvidia_libdir}/libnvidia-ptxjitcompiler.so %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libGLX_nvidia.so %{_nvidia_libdir}/libOpenGL.so From c3441e3800086362666065a990a0fd86d095e3c2 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 19 Aug 2016 11:10:18 +0100 Subject: [PATCH 070/101] Update to 370.23 beta --- .gitignore | 3 +++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d2e4697..6657b94 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-armv7l-gnueabihf-367.35.run /NVIDIA-Linux-x86-367.35.run /NVIDIA-Linux-x86_64-367.35.run +/NVIDIA-Linux-armv7l-gnueabihf-370.23.run +/NVIDIA-Linux-x86-370.23.run +/NVIDIA-Linux-x86_64-370.23.run diff --git a/sources b/sources index ce3c206..485115a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -0ddfd2f9ce7c2c1f1949bf22569c4dd1 NVIDIA-Linux-armv7l-gnueabihf-367.35.run -42db6f6485c3c337c7c756380ec64b7a NVIDIA-Linux-x86-367.35.run -04c35b49507ced02f4e9dd08a1796c87 NVIDIA-Linux-x86_64-367.35.run +a8b1b04e5947105f3273e129a1b65d0b NVIDIA-Linux-armv7l-gnueabihf-370.23.run +7b7466e23ae6ffa97106c9749aee2628 NVIDIA-Linux-x86-370.23.run +65b99201ca894ea9a878593fbb19f0a3 NVIDIA-Linux-x86_64-370.23.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index ee37334..df14cd7 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 367.35 -Release: 3%{?dist} +Version: 370.23 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -541,6 +541,9 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Fri Aug 19 2016 Leigh Scott - 1:370.23-1 +- Update to 370.23 beta + * Wed Aug 10 2016 Leigh Scott - 1:367.35-3 - Revert last commit - add ldconfig in %%post and %%postun for main package rfbz#3998 From fd754003155d0150eb393ddd80a9eadbb211f848 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 24 Aug 2016 06:50:39 +0100 Subject: [PATCH 071/101] Update to 367.44 --- .gitignore | 3 +++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d2e4697..3cbf3a0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-armv7l-gnueabihf-367.35.run /NVIDIA-Linux-x86-367.35.run /NVIDIA-Linux-x86_64-367.35.run +/NVIDIA-Linux-x86-367.44.run +/NVIDIA-Linux-x86_64-367.44.run +/NVIDIA-Linux-armv7l-gnueabihf-367.44.run diff --git a/sources b/sources index ce3c206..8871897 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -0ddfd2f9ce7c2c1f1949bf22569c4dd1 NVIDIA-Linux-armv7l-gnueabihf-367.35.run -42db6f6485c3c337c7c756380ec64b7a NVIDIA-Linux-x86-367.35.run -04c35b49507ced02f4e9dd08a1796c87 NVIDIA-Linux-x86_64-367.35.run +93ff8e1fe32939ca4fd6522b93825edc NVIDIA-Linux-x86-367.44.run +d34b42e64b25bf2a8d7b9a157723a3bd NVIDIA-Linux-x86_64-367.44.run +4ac2c479bf8387f143254d5fd37b65b0 NVIDIA-Linux-armv7l-gnueabihf-367.44.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index ee37334..aaf9fa3 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,8 +7,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 367.35 -Release: 3%{?dist} +Version: 367.44 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -541,6 +541,9 @@ fi ||: %{_nvidia_libdir}/libOpenGL.so %changelog +* Wed Aug 24 2016 Leigh Scott - 1:367.44-1 +- Update to 367.44 + * Wed Aug 10 2016 Leigh Scott - 1:367.35-3 - Revert last commit - add ldconfig in %%post and %%postun for main package rfbz#3998 From 78f133dff2109b4e5010988c9834803d1ac57942 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 9 Sep 2016 09:39:58 +0100 Subject: [PATCH 072/101] Update to 370.28 --- .gitignore | 3 +++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 21 ++++++++++++++++----- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 6657b94..c9a0fbf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-armv7l-gnueabihf-370.23.run /NVIDIA-Linux-x86-370.23.run /NVIDIA-Linux-x86_64-370.23.run +/NVIDIA-Linux-armv7l-gnueabihf-370.28.run +/NVIDIA-Linux-x86-370.28.run +/NVIDIA-Linux-x86_64-370.28.run diff --git a/sources b/sources index 485115a..d79d988 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -a8b1b04e5947105f3273e129a1b65d0b NVIDIA-Linux-armv7l-gnueabihf-370.23.run -7b7466e23ae6ffa97106c9749aee2628 NVIDIA-Linux-x86-370.23.run -65b99201ca894ea9a878593fbb19f0a3 NVIDIA-Linux-x86_64-370.23.run +6cbd700d92e702923a332bff9491592a NVIDIA-Linux-armv7l-gnueabihf-370.28.run +7d3e1c691cd53852f422a93169268178 NVIDIA-Linux-x86-370.28.run +95a6401db6576eaeea6ba4bc06fb61d2 NVIDIA-Linux-x86_64-370.28.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index df14cd7..75be761 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -7,7 +7,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 370.23 +Version: 370.28 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -124,6 +124,8 @@ Summary: Libraries for %{name} Group: User Interface/X Hardware Support Requires: %{name} = %{?epoch}:%{version}-%{release} Requires: libvdpau%{_isa} >= 0.5 +# GlVND +#Requires: libglvnd %description libs This package provides the shared libraries for %{name}. @@ -164,6 +166,7 @@ rm -f nvidia-installer* install -m 0755 -d $RPM_BUILD_ROOT%{_bindir} +# GLVND note: If kwizart doesn't add a ld.so.conf.d file to glvnd we will need to add it here # ld.so.conf.d file install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ echo "%{_nvidia_libdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf @@ -172,6 +175,9 @@ echo "%{_nvidia_libdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_ install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ +# GLVND +#rm libGL.so.%{version} + # Simple wildcard install of libs install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir} install -p -m 0755 lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ @@ -183,9 +189,9 @@ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ # install stuff the wildcard missed install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so -install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ -install -p -m 0755 libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ -ln -s libOpenGL.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenGL.so + +# GlVND +#ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0 %ifarch x86_64 i686 # OpenCL config @@ -536,11 +542,16 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-glsi.so +# GlVND note: remove libGL.so %{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libGLX_nvidia.so -%{_nvidia_libdir}/libOpenGL.so %changelog +* Fri Sep 09 2016 Leigh Scott - 1:370.28-1 +- Update to 370.28 +- Remove surplus glvnd libs (not used) +- Prepare for fedora glvnd package + * Fri Aug 19 2016 Leigh Scott - 1:370.23-1 - Update to 370.23 beta From 0890182399d3ba80992816fa11c64984e5f1f330 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 13 Sep 2016 16:53:07 +0100 Subject: [PATCH 073/101] glvnd lib needed for non-glvnd setup --- xorg-x11-drv-nvidia.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 75be761..2e4e5f6 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 370.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -189,9 +189,10 @@ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/ # install stuff the wildcard missed install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/ ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so +install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ # GlVND -#ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0 +ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0 %ifarch x86_64 i686 # OpenCL config @@ -547,6 +548,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Tue Sep 13 2016 Leigh Scott - 1:370.28-2 +- readd libGLdispatch.so.0 + * Fri Sep 09 2016 Leigh Scott - 1:370.28-1 - Update to 370.28 - Remove surplus glvnd libs (not used) From 12dec79cfb522110a67017f3fbb6d12b9a924dca Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:07:33 +0100 Subject: [PATCH 074/101] fix gitignore --- .gitignore | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitignore b/.gitignore index 856372a..c9a0fbf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,15 +4,9 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-armv7l-gnueabihf-367.35.run /NVIDIA-Linux-x86-367.35.run /NVIDIA-Linux-x86_64-367.35.run -<<<<<<< HEAD -/NVIDIA-Linux-x86-367.44.run -/NVIDIA-Linux-x86_64-367.44.run -/NVIDIA-Linux-armv7l-gnueabihf-367.44.run -======= /NVIDIA-Linux-armv7l-gnueabihf-370.23.run /NVIDIA-Linux-x86-370.23.run /NVIDIA-Linux-x86_64-370.23.run /NVIDIA-Linux-armv7l-gnueabihf-370.28.run /NVIDIA-Linux-x86-370.28.run /NVIDIA-Linux-x86_64-370.28.run ->>>>>>> master From 3af5c0c3bcecba34845ee39a635f7f2643a6f4ee Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:23:33 +0100 Subject: [PATCH 075/101] add xorg abi override --- xorg-x11-drv-nvidia.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 2e4e5f6..631267a 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 370.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -24,6 +24,7 @@ Source6: blacklist-nouveau.conf Source7: alternate-install-present Source9: nvidia-settings.desktop Source10: nvidia.conf +Source11: 00-ignoreabi.conf ExclusiveArch: i686 x86_64 armv7hl @@ -259,6 +260,8 @@ install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ +# Comment Xorg abi override +install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d # Desktop entry for nvidia-settings desktop-file-install --vendor "" \ @@ -432,6 +435,8 @@ fi ||: %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf +# Comment Xorg abi override +config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop @@ -548,6 +553,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Fri Sep 30 2016 Leigh Scott - 1:370.28-3 +- rebuilt + * Tue Sep 13 2016 Leigh Scott - 1:370.28-2 - readd libGLdispatch.so.0 From 007964011b554f249f9a87789836f5e72ea6b4ae Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:24:14 +0100 Subject: [PATCH 076/101] add xorg abi override --- 00-ignoreabi.conf | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 00-ignoreabi.conf diff --git a/00-ignoreabi.conf b/00-ignoreabi.conf new file mode 100644 index 0000000..f40110f --- /dev/null +++ b/00-ignoreabi.conf @@ -0,0 +1,75 @@ + + + +nonfree/xorg-x11-drv-nvidia-340xx.git - xorg-x11-drv-nvidia-340xx + + + + + + + + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/00-ignoreabi.conf
blob: c2071f15625d88a8d48ac5cf6b7a382e4dc7f11f (plain) + + +
1
+2
+3
+
Section "ServerFlags"
+    Option         "IgnoreABI" "True"
+EndSection
+
+
+
generated by cgit v0.12 at 2016-09-30 06:19:47 (GMT)
+
+ + From bed268e96e8463f94b53df930efc8aea72d1d429 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:25:19 +0100 Subject: [PATCH 077/101] fix source number --- xorg-x11-drv-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 631267a..58af34f 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -261,7 +261,7 @@ sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf. touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ # Comment Xorg abi override -install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d # Desktop entry for nvidia-settings desktop-file-install --vendor "" \ From 6cdb04108b96b6811b315326cd222dd1fb9a0ff3 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:26:50 +0100 Subject: [PATCH 078/101] fix override file --- 00-ignoreabi.conf | 75 ++--------------------------------------------- 1 file changed, 2 insertions(+), 73 deletions(-) diff --git a/00-ignoreabi.conf b/00-ignoreabi.conf index f40110f..103fd76 100644 --- a/00-ignoreabi.conf +++ b/00-ignoreabi.conf @@ -1,75 +1,4 @@ - - - -nonfree/xorg-x11-drv-nvidia-340xx.git - xorg-x11-drv-nvidia-340xx - - - - - - - - - - - - - -
- - - - -
-summaryrefslogtreecommitdiffstats
- - - -
-
-
path: root/00-ignoreabi.conf
blob: c2071f15625d88a8d48ac5cf6b7a382e4dc7f11f (plain) - - -
1
-2
-3
-
Section "ServerFlags"
+Section "ServerFlags"
     Option         "IgnoreABI" "True"
 EndSection
-
-
-
generated by cgit v0.12 at 2016-09-30 06:19:47 (GMT)
-
- - + From d11d96688af09dbbbce5b8685eac662722fdfa21 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:29:49 +0100 Subject: [PATCH 079/101] edit changelog --- xorg-x11-drv-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 58af34f..d1dc523 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -554,7 +554,7 @@ config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %changelog * Fri Sep 30 2016 Leigh Scott - 1:370.28-3 -- rebuilt +- add xorg abi override * Tue Sep 13 2016 Leigh Scott - 1:370.28-2 - readd libGLdispatch.so.0 From e02f136dee16a13be0112f9f939e0eda82ded389 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:42:43 +0100 Subject: [PATCH 080/101] fix missing % --- xorg-x11-drv-nvidia.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d1dc523..ae702ec 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -24,7 +24,7 @@ Source6: blacklist-nouveau.conf Source7: alternate-install-present Source9: nvidia-settings.desktop Source10: nvidia.conf -Source11: 00-ignoreabi.conf +Source11: 00-ignoreabi.conf ExclusiveArch: i686 x86_64 armv7hl @@ -436,7 +436,7 @@ fi ||: %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf # Comment Xorg abi override -config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf +%config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop From 6ecfbc0e43e7a6824bd70a41f02431312bab8ca2 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 11 Oct 2016 12:20:59 +0100 Subject: [PATCH 081/101] Switch to system libglvnd --- xorg-x11-drv-nvidia.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index ae702ec..df34614 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 370.28 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -125,8 +125,7 @@ Summary: Libraries for %{name} Group: User Interface/X Hardware Support Requires: %{name} = %{?epoch}:%{version}-%{release} Requires: libvdpau%{_isa} >= 0.5 -# GlVND -#Requires: libglvnd +Requires: libglvnd%{_isa} %description libs This package provides the shared libraries for %{name}. @@ -167,8 +166,6 @@ rm -f nvidia-installer* install -m 0755 -d $RPM_BUILD_ROOT%{_bindir} -# GLVND note: If kwizart doesn't add a ld.so.conf.d file to glvnd we will need to add it here -# ld.so.conf.d file install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ echo "%{_nvidia_libdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf @@ -177,7 +174,7 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ # GLVND -#rm libGL.so.%{version} +rm libGL.so.%{version} # Simple wildcard install of libs install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir} @@ -187,14 +184,14 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/ install -p -m 0755 tls/lib*.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/tls/ %endif -# install stuff the wildcard missed -install -p -m 0755 libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/ -ln -s libEGL.so.1 $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL.so -install -p -m 0755 libGLdispatch.so.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/ - # GlVND ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_indirect.so.0 +# Fix unowned lib links +ln -s libEGL_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libEGL_nvidia.so.0 +ln -s libGLESv2_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLESv2_nvidia.so.2 +ln -s libGLX_nvidia.so.%{version} $RPM_BUILD_ROOT%{_nvidia_libdir}/libGLX_nvidia.so.0 + %ifarch x86_64 i686 # OpenCL config install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/ @@ -539,7 +536,6 @@ fi ||: %endif %{_libdir}/vdpau/libvdpau_nvidia.so %{_nvidia_libdir}/libnvidia-ifr.so -%{_nvidia_libdir}/libEGL.so %{_nvidia_libdir}/libEGL_nvidia.so %{_nvidia_libdir}/libGLESv1_CM_nvidia.so %{_nvidia_libdir}/libGLESv2_nvidia.so @@ -548,11 +544,13 @@ fi ||: %{_nvidia_libdir}/libnvidia-fbc.so %{_nvidia_libdir}/libnvidia-glcore.so %{_nvidia_libdir}/libnvidia-glsi.so -# GlVND note: remove libGL.so -%{_nvidia_libdir}/libGL.so %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Tue Oct 11 2016 Leigh Scott - 1:370.28-4 +- Switch to system libglvnd +- Fix unowned file links + * Fri Sep 30 2016 Leigh Scott - 1:370.28-3 - add xorg abi override From 62bcab11aa97cbca8bb64d2ad4798f1ec586d570 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 12 Oct 2016 10:46:06 +0100 Subject: [PATCH 082/101] Add libglvnd path to ld.so.conf.d conf file --- xorg-x11-drv-nvidia.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index df34614..9934dc6 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -1,6 +1,7 @@ %global _nvidia_serie nvidia %global _nvidia_libdir %{_libdir}/%{_nvidia_serie} %global _nvidia_xorgdir %{_nvidia_libdir}/xorg +%global _glvnd_libdir %{_libdir}/libglvnd %global debug_package %{nil} %global __strip /bin/true @@ -8,7 +9,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 370.28 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -167,7 +168,7 @@ rm -f nvidia-installer* install -m 0755 -d $RPM_BUILD_ROOT%{_bindir} install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ -echo "%{_nvidia_libdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf +echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf #Blacklist nouveau (since F-11) install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ @@ -547,6 +548,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Wed Oct 12 2016 Leigh Scott - 1:370.28-5 +- Add libglvnd path to ld.so.conf.d conf file + * Tue Oct 11 2016 Leigh Scott - 1:370.28-4 - Switch to system libglvnd - Fix unowned file links From 99add756475ea8c798782e9ded1982ef16e02eed Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 15 Oct 2016 08:59:23 +0100 Subject: [PATCH 083/101] readd description --- xorg-x11-drv-nvidia.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 9934dc6..65c7eb9 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -167,6 +167,7 @@ rm -f nvidia-installer* install -m 0755 -d $RPM_BUILD_ROOT%{_bindir} +# ld.so.conf.d file install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf From 2e7b89b0f669688e16215ca83c532dba2af9e50c Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 22 Oct 2016 01:06:02 +0100 Subject: [PATCH 084/101] Update to 375.10 beta release --- .gitignore | 3 +++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 11 ++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index c9a0fbf..b18a86c 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-armv7l-gnueabihf-370.28.run /NVIDIA-Linux-x86-370.28.run /NVIDIA-Linux-x86_64-370.28.run +/NVIDIA-Linux-x86-375.10.run +/NVIDIA-Linux-x86_64-375.10.run +/NVIDIA-Linux-armv7l-gnueabihf-375.10.run diff --git a/sources b/sources index d79d988..ead69c6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -6cbd700d92e702923a332bff9491592a NVIDIA-Linux-armv7l-gnueabihf-370.28.run -7d3e1c691cd53852f422a93169268178 NVIDIA-Linux-x86-370.28.run -95a6401db6576eaeea6ba4bc06fb61d2 NVIDIA-Linux-x86_64-370.28.run +8414d40bd101272ce082e204a7d032b2 NVIDIA-Linux-x86-375.10.run +f3d5b040f3698181f25c484c5b7d0b31 NVIDIA-Linux-x86_64-375.10.run +3ec5d77c343b53364ea58e654ef37f0d NVIDIA-Linux-armv7l-gnueabihf-375.10.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 65c7eb9..7fa77ac 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,8 +8,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 370.28 -Release: 5%{?dist} +Version: 375.10 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -176,7 +176,8 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ # GLVND -rm libGL.so.%{version} +rm libGL.so* +rm libEGL.so* # Simple wildcard install of libs install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_libdir} @@ -549,6 +550,10 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Fri Oct 21 2016 Leigh Scott - 1:375.10-1 +- Update to 375.10 beta release +- Clean up more libglvnd provided libs + * Wed Oct 12 2016 Leigh Scott - 1:370.28-5 - Add libglvnd path to ld.so.conf.d conf file From 9e01feed4774740d7e0e5356865f82294b809120 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 24 Oct 2016 10:08:05 +0100 Subject: [PATCH 085/101] /etc/glvnd/egl_vendor.d/10_nvidia.json --- xorg-x11-drv-nvidia.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 7fa77ac..5b9241e 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -127,6 +127,9 @@ Group: User Interface/X Hardware Support Requires: %{name} = %{?epoch}:%{version}-%{release} Requires: libvdpau%{_isa} >= 0.5 Requires: libglvnd%{_isa} +%ifarch x86_64 i686 +Requires: vulkan-filesystem +%endif %description libs This package provides the shared libraries for %{name}. @@ -206,6 +209,9 @@ ln -s libOpenCL.so.1.0.0 $RPM_BUILD_ROOT%{_nvidia_libdir}/libOpenCL.so install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/vulkan/icd.d/ install -p -m 0644 nvidia_icd.json $RPM_BUILD_ROOT%{_sysconfdir}/vulkan/icd.d/ %endif +# EGL config +install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/glvnd/egl_vendor.d/ +install -p -m 0644 10_nvidia.json $RPM_BUILD_ROOT%{_sysconfdir}/glvnd/egl_vendor.d/ #Vdpau install -m 0755 -d $RPM_BUILD_ROOT%{_libdir}/vdpau/ @@ -427,10 +433,9 @@ fi ||: %doc nvidiapkg/nvidia-application-profiles-%{version}-rc %doc nvidiapkg/html %ifarch x86_64 i686 -%dir %{_sysconfdir}/vulkan -%dir %{_sysconfdir}/vulkan/icd.d %config %{_sysconfdir}/vulkan/icd.d/nvidia_icd.json %endif +%config %{_sysconfdir}/glvnd/egl_vendor.d/10_nvidia.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf From c8a9eb7bce5cba62ce23accb27142cab7ba62ebf Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Tue, 25 Oct 2016 00:51:08 +0100 Subject: [PATCH 086/101] Add glvnd/egl_vendor.d file --- xorg-x11-drv-nvidia.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 5b9241e..e895496 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -9,7 +9,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -555,6 +555,10 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Mon Oct 24 2016 Leigh Scott - 1:375.10-2 +- Add glvnd/egl_vendor.d file +- Add requires vulkan-filesystem + * Fri Oct 21 2016 Leigh Scott - 1:375.10-1 - Update to 375.10 beta release - Clean up more libglvnd provided libs From c329399bf268536ad56e21be094cef2c48cebfa6 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 18 Nov 2016 17:42:40 +0000 Subject: [PATCH 087/101] Update to 375.20 --- .gitignore | 3 +++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 11 +++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index b18a86c..10bd31d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-x86-375.10.run /NVIDIA-Linux-x86_64-375.10.run /NVIDIA-Linux-armv7l-gnueabihf-375.10.run +/NVIDIA-Linux-x86-375.20.run +/NVIDIA-Linux-x86_64-375.20.run +/NVIDIA-Linux-armv7l-gnueabihf-375.20.run diff --git a/sources b/sources index ead69c6..d9b2f55 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -8414d40bd101272ce082e204a7d032b2 NVIDIA-Linux-x86-375.10.run -f3d5b040f3698181f25c484c5b7d0b31 NVIDIA-Linux-x86_64-375.10.run -3ec5d77c343b53364ea58e654ef37f0d NVIDIA-Linux-armv7l-gnueabihf-375.10.run +b9bfa7f3f591418972e963b087ab91e3 NVIDIA-Linux-x86-375.20.run +874ec6d875f532ee9995082176cf9074 NVIDIA-Linux-x86_64-375.20.run +7ffb39f1faed7ff0a460b9b99847917f NVIDIA-Linux-armv7l-gnueabihf-375.20.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index e895496..808f579 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,8 +8,8 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 375.10 -Release: 2%{?dist} +Version: 375.20 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -267,7 +267,7 @@ sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf. touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ # Comment Xorg abi override -install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +#install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d # Desktop entry for nvidia-settings desktop-file-install --vendor "" \ @@ -441,7 +441,7 @@ fi ||: %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf # Comment Xorg abi override -%config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf +#%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop @@ -555,6 +555,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Fri Nov 18 2016 leigh scott - 1:375.20-1 +- Update to 375.20 release + * Mon Oct 24 2016 Leigh Scott - 1:375.10-2 - Add glvnd/egl_vendor.d file - Add requires vulkan-filesystem From c0605a9df8f4118299569a982d85529f7175e4ad Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 14 Dec 2016 19:00:15 +0000 Subject: [PATCH 088/101] Update to 375.26 release --- .gitignore | 3 +++ sources | 6 +++--- xorg-x11-drv-nvidia.spec | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 10bd31d..de89dd3 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ NVIDIA-Linux-x86_64-358.16.run /NVIDIA-Linux-x86-375.20.run /NVIDIA-Linux-x86_64-375.20.run /NVIDIA-Linux-armv7l-gnueabihf-375.20.run +/NVIDIA-Linux-armv7l-gnueabihf-375.26.run +/NVIDIA-Linux-x86-375.26.run +/NVIDIA-Linux-x86_64-375.26.run diff --git a/sources b/sources index d9b2f55..4d810e2 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -b9bfa7f3f591418972e963b087ab91e3 NVIDIA-Linux-x86-375.20.run -874ec6d875f532ee9995082176cf9074 NVIDIA-Linux-x86_64-375.20.run -7ffb39f1faed7ff0a460b9b99847917f NVIDIA-Linux-armv7l-gnueabihf-375.20.run +fd8940af2a501273f5819f1750918995 NVIDIA-Linux-armv7l-gnueabihf-375.26.run +b0706e88ad173f6b9c7bd2e5a838c163 NVIDIA-Linux-x86-375.26.run +d60819b2e377398c7296999ab5e7c1a4 NVIDIA-Linux-x86_64-375.26.run diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 808f579..cd97dd4 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 -Version: 375.20 +Version: 375.26 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -555,6 +555,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Wed Dec 14 2016 leigh scott - 1:375.26-1 +- Update to 375.26 release + * Fri Nov 18 2016 leigh scott - 1:375.20-1 - Update to 375.20 release From 20f9b84c0fadbe5a2acbab0aa6cd2d72d89ff940 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 18 Dec 2016 19:45:03 +0000 Subject: [PATCH 089/101] Change conf files for Prime support --- nvidia.conf | 3 +++ xorg-x11-drv-nvidia.spec | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nvidia.conf b/nvidia.conf index 9c5e953..19864d0 100644 --- a/nvidia.conf +++ b/nvidia.conf @@ -5,4 +5,7 @@ Section "OutputClass" Identifier "nvidia" MatchDriver "nvidia-drm" Driver "nvidia" + Option "AllowEmptyInitialConfiguration" + Option "PrimaryGPU" "yes" + ModulePath "/usr/lib64/nvidia/xorg" EndSection diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index cd97dd4..0c878ed 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -9,7 +9,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.26 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -18,7 +18,6 @@ URL: http://www.nvidia.com/ Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run Source4: ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux-armv7l-gnueabihf-%{version}.run -Source2: 99-nvidia.conf Source3: nvidia-xorg.conf Source5: 00-avoid-glamor.conf Source6: blacklist-nouveau.conf @@ -261,10 +260,7 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so #Install static driver dependant configuration files mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d -install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d -sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf -touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ # Comment Xorg abi override #install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d @@ -555,6 +551,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Sun Dec 18 2016 leigh scott - 1:375.26-2 +- Change conf files for Prime support + * Wed Dec 14 2016 leigh scott - 1:375.26-1 - Update to 375.26 release From ae4b9c7ad4d6d8f7bb20e68960f205f04b289044 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sun, 18 Dec 2016 19:46:25 +0000 Subject: [PATCH 090/101] remove file --- xorg-x11-drv-nvidia.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 0c878ed..7bb928f 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -434,7 +434,6 @@ fi ||: %config %{_sysconfdir}/glvnd/egl_vendor.d/10_nvidia.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf -%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf # Comment Xorg abi override #%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf From 7d312c4d2b5e94d82d657d1a1bc0df7bbd8813d5 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 19 Dec 2016 08:45:46 +0000 Subject: [PATCH 091/101] Fix nvidia.conf --- nvidia.conf | 2 +- xorg-x11-drv-nvidia.spec | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nvidia.conf b/nvidia.conf index 19864d0..9315780 100644 --- a/nvidia.conf +++ b/nvidia.conf @@ -7,5 +7,5 @@ Section "OutputClass" Driver "nvidia" Option "AllowEmptyInitialConfiguration" Option "PrimaryGPU" "yes" - ModulePath "/usr/lib64/nvidia/xorg" + ModulePath "@LIBDIR@/xorg/modules" EndSection diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 7bb928f..7acd541 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -9,7 +9,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.26 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -292,6 +292,8 @@ install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation} %if 0%{?fedora} >= 21 mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf +sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf +touch -r %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf %endif #Avoid prelink to mess with nvidia libs - rfbz#3258 @@ -550,6 +552,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Mon Dec 19 2016 leigh scott - 1:375.26-3 +- Fix nvidia.conf + * Sun Dec 18 2016 leigh scott - 1:375.26-2 - Change conf files for Prime support From c9c60e01018db6ce6033c87ccef7822a9b482189 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Mon, 19 Dec 2016 09:59:18 +0000 Subject: [PATCH 092/101] Add conditionals for f24 --- nvidia-old.conf | 8 ++++++++ xorg-x11-drv-nvidia.spec | 21 +++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 nvidia-old.conf diff --git a/nvidia-old.conf b/nvidia-old.conf new file mode 100644 index 0000000..9c5e953 --- /dev/null +++ b/nvidia-old.conf @@ -0,0 +1,8 @@ +#This file is provided by xorg-x11-drv-nvidia +#Do not edit + +Section "OutputClass" + Identifier "nvidia" + MatchDriver "nvidia-drm" + Driver "nvidia" +EndSection diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 7acd541..b008f57 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -9,7 +9,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.26 -Release: 3%{?dist} +Release: 4%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -18,10 +18,12 @@ URL: http://www.nvidia.com/ Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}.run Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}.run Source4: ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux-armv7l-gnueabihf-%{version}.run +Source2: 99-nvidia.conf Source3: nvidia-xorg.conf Source5: 00-avoid-glamor.conf Source6: blacklist-nouveau.conf Source7: alternate-install-present +Source8: nvidia-old.conf Source9: nvidia-settings.desktop Source10: nvidia.conf Source11: 00-ignoreabi.conf @@ -262,6 +264,11 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ +%if 0%{?fedora} <= 24 +install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf +touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf +%endif # Comment Xorg abi override #install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d @@ -289,12 +296,16 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/nvidia install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation} $RPM_BUILD_ROOT%{_datadir}/nvidia #Install the output class configuration file - xorg-server >= 1.16 -%if 0%{?fedora} >= 21 +%if 0%{?fedora} >= 25 mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf touch -r %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf %endif +%if 0%{?fedora} <= 24 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d +install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf +%endif #Avoid prelink to mess with nvidia libs - rfbz#3258 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d @@ -436,6 +447,9 @@ fi ||: %config %{_sysconfdir}/glvnd/egl_vendor.d/10_nvidia.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf +%if 0%{?fedora} <= 24 +%config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf +%endif %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf # Comment Xorg abi override #%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf @@ -552,6 +566,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Mon Dec 19 2016 leigh scott - 1:375.26-4 +- Add conditionals for f24 + * Mon Dec 19 2016 leigh scott - 1:375.26-3 - Fix nvidia.conf From 0807a51709b774b0226271e4f21d4dac790015a1 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 24 Dec 2016 09:34:44 +0000 Subject: [PATCH 093/101] Add xorg-x11-server-Xorg minimum version requires for F25 and greater --- xorg-x11-drv-nvidia.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index b008f57..0557b7c 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -9,7 +9,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.26 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -45,6 +45,9 @@ Requires: which Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version} Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} +%if 0%{?fedora} >= 25 +Requires: xorg-x11-server-Xorg%{_isa} >= 1.19.0-2 +%endif Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version} Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version} @@ -566,6 +569,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Sat Dec 24 2016 leigh scott - 1:375.26-5 +- Add xorg-x11-server-Xorg minimum version requires + * Mon Dec 19 2016 leigh scott - 1:375.26-4 - Add conditionals for f24 From 3f492e57477d853e143480eb953f84a677a5e357 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 24 Dec 2016 14:09:18 +0000 Subject: [PATCH 094/101] Fix error in nvidia.conf rfbz#4388 --- nvidia.conf | 10 +++++++++- xorg-x11-drv-nvidia.spec | 5 ++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/nvidia.conf b/nvidia.conf index 9315780..79a73d4 100644 --- a/nvidia.conf +++ b/nvidia.conf @@ -7,5 +7,13 @@ Section "OutputClass" Driver "nvidia" Option "AllowEmptyInitialConfiguration" Option "PrimaryGPU" "yes" - ModulePath "@LIBDIR@/xorg/modules" + ModulePath "@LIBDIR@/nvidia/xorg" +EndSection + +Section "OutputClass" + Identifier "intel" + MatchDriver "i915" + Driver "modesetting" + # Disable glamor as it causes crashes when combined with the nvidia driver's libEGL.so + Option "AccelMethod" "none" EndSection diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 0557b7c..b628594 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -9,7 +9,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.26 -Release: 5%{?dist} +Release: 6%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -569,6 +569,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Sat Dec 24 2016 leigh scott - 1:375.26-6 +- Fix error in nvidia.conf rfbz#4388 + * Sat Dec 24 2016 leigh scott - 1:375.26-5 - Add xorg-x11-server-Xorg minimum version requires From 836186edcd9084a912c7a7445e3f69bdc3328ea5 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 31 Dec 2016 15:31:43 +0000 Subject: [PATCH 095/101] Update nvidia.conf for latest Xorg changes --- nvidia.conf | 2 -- xorg-x11-drv-nvidia.spec | 9 ++++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/nvidia.conf b/nvidia.conf index 79a73d4..7481890 100644 --- a/nvidia.conf +++ b/nvidia.conf @@ -14,6 +14,4 @@ Section "OutputClass" Identifier "intel" MatchDriver "i915" Driver "modesetting" - # Disable glamor as it causes crashes when combined with the nvidia driver's libEGL.so - Option "AccelMethod" "none" EndSection diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index b628594..3e64e16 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -3,13 +3,13 @@ %global _nvidia_xorgdir %{_nvidia_libdir}/xorg %global _glvnd_libdir %{_libdir}/libglvnd -%global debug_package %{nil} +#%global debug_package %{nil} %global __strip /bin/true Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.26 -Release: 6%{?dist} +Release: 7%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -46,7 +46,7 @@ Requires: which Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version} Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} %if 0%{?fedora} >= 25 -Requires: xorg-x11-server-Xorg%{_isa} >= 1.19.0-2 +Requires: xorg-x11-server-Xorg%{_isa} >= 1.19.0-3 %endif Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version} @@ -569,6 +569,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Sat Dec 31 2016 leigh scott - 1:375.26-7 +- Update nvidia.conf for latest Xorg changes + * Sat Dec 24 2016 leigh scott - 1:375.26-6 - Fix error in nvidia.conf rfbz#4388 From ad8a614c1fe46853fe4755ec9cb3aeedd0afcfbe Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Sat, 31 Dec 2016 15:33:08 +0000 Subject: [PATCH 096/101] revert leftover from some testing --- xorg-x11-drv-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 3e64e16..a0cf9ee 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -3,7 +3,7 @@ %global _nvidia_xorgdir %{_nvidia_libdir}/xorg %global _glvnd_libdir %{_libdir}/libglvnd -#%global debug_package %{nil} +%global debug_package %{nil} %global __strip /bin/true Name: xorg-x11-drv-nvidia From 19ec459cc7bebef0cf878cc8b5ab80c44966414d Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 18 Jan 2017 10:17:12 +0000 Subject: [PATCH 097/101] Changes for mesa glvnd --- parse-readme.py | 61 ++++++++++++++++++++++++ xorg-x11-drv-nvidia.metainfo.xml | 36 ++++++++++++++ xorg-x11-drv-nvidia.spec | 81 +++++++++++++++++++++----------- 3 files changed, 150 insertions(+), 28 deletions(-) create mode 100755 parse-readme.py create mode 100644 xorg-x11-drv-nvidia.metainfo.xml diff --git a/parse-readme.py b/parse-readme.py new file mode 100755 index 0000000..3da92a6 --- /dev/null +++ b/parse-readme.py @@ -0,0 +1,61 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# Copyright (C) 2016 Richard Hughes +# Licensed under the GNU General Public License Version or later + +from __future__ import print_function +import sys + +def main(): + if len(sys.argv) != 3: + print("usage: %s README.txt \"header to match\"" % sys.argv[0]) + return 1 + + # open file + f = open(sys.argv[1]) + in_section = False + in_table = False + pids = [] + for line in f.readlines(): + + # find the right data table + if line.find(sys.argv[2]) != -1: + in_section = True + continue + if not in_section: + continue + + # remove Windows and Linux line endings + line = line.replace('\r', '') + line = line.replace('\n', '') + + # end of section + if len(line) > 0 and not line.startswith(' '): + in_section = False + in_table = False + continue + + # empty line + if len(line) == 0: + continue + + # skip the header + if line.startswith(' ---'): + in_table = True + continue + if not in_table: + continue + + # get name + pid = int(line[42:46], 16) + if not pid in pids: + pids.append(pid) + + # output + for pid in pids: + vid = 0x10de + print("pci:v%08Xd%08Xsv*sd*bc*sc*i*" % (vid, pid)) + +if __name__ == "__main__": + main() diff --git a/xorg-x11-drv-nvidia.metainfo.xml b/xorg-x11-drv-nvidia.metainfo.xml new file mode 100644 index 0000000..519aa6a --- /dev/null +++ b/xorg-x11-drv-nvidia.metainfo.xml @@ -0,0 +1,36 @@ + + + + xorg-x11-drv-nvidia + NVIDIA Linux Graphics Driver + Accelerated Linux Graphics Driver + +

+ The NVIDIA Accelerated Linux Graphics Driver brings accelerated 2D + functionality and high-performance OpenGL support to Linux with the + use of NVIDIA graphics processing units. +

+

+ These drivers provide optimized hardware acceleration for OpenGL and X + applications and support nearly all recent NVIDIA GPU products. + The NVIDIA graphics driver uses a Unified Driver Architecture: the single + graphics driver supports all modern NVIDIA GPUs. +

+ + + http://www.nvidia.com/ + CC0-1.0 + LicenseRef-proprietary:NVIDIA + NVIDIA Corporation + + NVIDIA + driver + GeForce + CUDA + Quadro + Vulkan + OpenGL + + https://bugzilla.rpmfusion.org + xorg-x11-drv-nvidia@rpmfusion.org + diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index a0cf9ee..99fde08 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -1,7 +1,6 @@ %global _nvidia_serie nvidia -%global _nvidia_libdir %{_libdir}/%{_nvidia_serie} -%global _nvidia_xorgdir %{_nvidia_libdir}/xorg -%global _glvnd_libdir %{_libdir}/libglvnd +%global _nvidia_libdir %{_libdir} +%global _nvidia_xorgdir %{_libdir}/%{_nvidia_serie}/xorg %global debug_package %{nil} %global __strip /bin/true @@ -9,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.26 -Release: 7%{?dist} +Release: 8%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -27,26 +26,35 @@ Source8: nvidia-old.conf Source9: nvidia-settings.desktop Source10: nvidia.conf Source11: 00-ignoreabi.conf +Source12: xorg-x11-drv-nvidia.metainfo.xml +Source13: parse-readme.py ExclusiveArch: i686 x86_64 armv7hl -BuildRequires: desktop-file-utils +BuildRequires: desktop-file-utils %if 0%{?rhel} > 6 || 0%{?fedora} >= 15 -Buildrequires: systemd -Requires(post): systemd -Requires(preun): systemd +Buildrequires: systemd +Requires(post): systemd +Requires(preun): systemd Requires(postun): systemd %endif +%if 0%{?fedora} >= 25 +# AppStream metadata generation +BuildRequires: libappstream-glib%{?_isa} >= 0.6.3 +%endif Requires(post): ldconfig Requires(postun): ldconfig Requires(post): grubby -Requires: which +Requires: which Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version} -Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release} %if 0%{?fedora} >= 25 -Requires: xorg-x11-server-Xorg%{_isa} >= 1.19.0-3 +Requires: xorg-x11-server-Xorg%{?_isa} >= 1.19.0-3 +Requires: mesa-libEGL%{?_isa} >= 13.0.3-3 +Requires: mesa-libGL%{?_isa} >= 13.0.3-3 +Requires: mesa-libGLES%{?_isa} >= 13.0.3-3 %endif Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version} @@ -90,12 +98,12 @@ http://rpmfusion.org/Howto/nVidia %package devel Summary: Development files for %{name} Group: Development/Libraries -Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release} -Requires: %{name}-cuda%{_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release} +Requires: %{name}-cuda%{?_isa} = %{?epoch}:%{version}-%{release} #Don't put an epoch here Provides: cuda-drivers-devel = %{version} -Provides: cuda-drivers-devel%{_isa} = %{version} +Provides: cuda-drivers-devel%{?_isa} = %{version} %description devel This package provides the development files of the %{name} package, @@ -112,7 +120,7 @@ Conflicts: xorg-x11-drv-nvidia-340xx-cuda #Don't put an epoch here Provides: cuda-drivers = %{version} -Provides: cuda-drivers%{_isa} = %{version} +Provides: cuda-drivers%{?_isa} = %{version} %description cuda This package provides the CUDA driver libraries. @@ -129,8 +137,14 @@ which is generated during the build of main package. Summary: Libraries for %{name} Group: User Interface/X Hardware Support Requires: %{name} = %{?epoch}:%{version}-%{release} -Requires: libvdpau%{_isa} >= 0.5 -Requires: libglvnd%{_isa} +Requires: libvdpau%{?_isa} >= 0.5 +Requires: libglvnd%{?_isa} >= 0.2 +%if 0%{?fedora} >= 25 +Requires: libglvnd-egl%{?_isa} >= 0.2 +Requires: libglvnd-gles%{?_isa} >= 0.2 +Requires: libglvnd-glx%{?_isa} >= 0.2 +Requires: libglvnd-opengl%{?_isa} >= 0.2 +%endif %ifarch x86_64 i686 Requires: vulkan-filesystem %endif @@ -174,10 +188,6 @@ rm -f nvidia-installer* install -m 0755 -d $RPM_BUILD_ROOT%{_bindir} -# ld.so.conf.d file -install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ -echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf - #Blacklist nouveau (since F-11) install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ @@ -265,7 +275,9 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so #Install static driver dependant configuration files mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +%if 0%{?fedora} <= 24 install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +%endif install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ %if 0%{?fedora} <= 24 install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d @@ -287,10 +299,6 @@ desktop-file-install --vendor "" \ #Workaround for self made xorg.conf using a Files section. ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} -#Workaround for cuda availability - rfbz#2916 -ln -fs %{_nvidia_libdir}/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1 -ln -fs %{_nvidia_libdir}/libcuda.so $RPM_BUILD_ROOT%{_libdir}/libcuda.so - #Alternate-install-present is checked by the nvidia .run install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir} @@ -337,6 +345,17 @@ tar Jcf $RPM_BUILD_ROOT%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version} #Add autostart file for nvidia-settings to load user config install -D -p -m 0644 %{SOURCE9} $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nvidia-settings.desktop +%if 0%{?fedora} >= 25 +# install AppData and add modalias provides +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata/ +install -pm 0644 %{SOURCE12} %{buildroot}%{_datadir}/appdata/ +fn=$RPM_BUILD_ROOT%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml +%{SOURCE13} README.txt "NVIDIA GEFORCE GPUS" | xargs appstream-util add-provide ${fn} modalias +%{SOURCE13} README.txt "NVIDIA QUADRO GPUS" | xargs appstream-util add-provide ${fn} modalias +%{SOURCE13} README.txt "NVIDIA NVS GPUS" | xargs appstream-util add-provide ${fn} modalias +%{SOURCE13} README.txt "NVIDIA TESLA GPUS" | xargs appstream-util add-provide ${fn} modalias +%endif + %pre if [ "$1" -eq "1" ]; then @@ -452,8 +471,8 @@ fi ||: %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf %if 0%{?fedora} <= 24 %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf -%endif %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf +%endif # Comment Xorg abi override #%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf @@ -478,6 +497,9 @@ fi ||: %if 0%{?fedora} >= 21 %{_datadir}/X11/xorg.conf.d/nvidia.conf %endif +%if 0%{?fedora} >= 25 +%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml +%endif %dir %{_datadir}/nvidia %{_datadir}/nvidia/nvidia-application-profiles-%{version}-* %{_datadir}/applications/*nvidia-settings.desktop @@ -492,7 +514,6 @@ fi ||: %files libs %defattr(-,root,root,-) %dir %{_nvidia_libdir} -%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf %ghost %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf %{_nvidia_libdir}/alternate-install-present %{_nvidia_libdir}/*.so.* @@ -526,7 +547,6 @@ fi ||: %{_bindir}/nvidia-persistenced #nvidia-modprobe is setuid root to allow users to load the module in %attr(4755, root, root) %{_bindir}/nvidia-modprobe -%{_libdir}/libcuda.so* %{_nvidia_libdir}/libcuda.so* %{_nvidia_libdir}/libnvcuvid.so* %{_nvidia_libdir}/libnvidia-encode.so* @@ -569,6 +589,11 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Tue Jan 17 2017 Leigh Scott - 1:375.26-8 +- Changes for mesa glvnd +- Move nvidia libs to lib directoy and remove ldconfig config file +- Add appdata info + * Sat Dec 31 2016 leigh scott - 1:375.26-7 - Update nvidia.conf for latest Xorg changes From 3cfcb554b7d06d97f13a5caa73a513964115db97 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 18 Jan 2017 10:37:43 +0000 Subject: [PATCH 098/101] add missing python2 buildrequires --- xorg-x11-drv-nvidia.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 99fde08..d91f686 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -40,6 +40,7 @@ Requires(postun): systemd %endif %if 0%{?fedora} >= 25 # AppStream metadata generation +BuildRequires: python2 BuildRequires: libappstream-glib%{?_isa} >= 0.6.3 %endif From a0ba7b9a0a81424d4e525efdf2d5fbdf499cf943 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 18 Jan 2017 10:40:51 +0000 Subject: [PATCH 099/101] add python version to shebang --- parse-readme.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parse-readme.py b/parse-readme.py index 3da92a6..b2fa2ba 100755 --- a/parse-readme.py +++ b/parse-readme.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # -*- coding: utf-8 -*- # # Copyright (C) 2016 Richard Hughes From c20013da72c353377d190cf2385ee887eaff8faf Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 18 Jan 2017 12:24:18 +0000 Subject: [PATCH 100/101] Add conditions for f24 and el7 --- xorg-x11-drv-nvidia.spec | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index d91f686..76bea97 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -1,6 +1,12 @@ %global _nvidia_serie nvidia +%if 0%{?fedora} >= 25 %global _nvidia_libdir %{_libdir} %global _nvidia_xorgdir %{_libdir}/%{_nvidia_serie}/xorg +%else +%global _nvidia_libdir %{_libdir}/%{_nvidia_serie} +%global _nvidia_xorgdir %{_nvidia_libdir}/xorg +%global _glvnd_libdir %{_libdir}/libglvnd +%endif %global debug_package %{nil} %global __strip /bin/true @@ -8,7 +14,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 375.26 -Release: 8%{?dist} +Release: 9%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -189,6 +195,12 @@ rm -f nvidia-installer* install -m 0755 -d $RPM_BUILD_ROOT%{_bindir} +%if 0%{?rhel} > 6 || 0%{?fedora} <= 24 +# ld.so.conf.d file +install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/ +echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf +%endif + #Blacklist nouveau (since F-11) install -m 0755 -d $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/ @@ -276,7 +288,7 @@ rm $RPM_BUILD_ROOT%{_nvidia_libdir}/libnvidia-{cfg,tls}.so #Install static driver dependant configuration files mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d -%if 0%{?fedora} <= 24 +%if 0%{?rhel} > 6 || 0%{?fedora} <= 24 install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d %endif install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ @@ -300,6 +312,12 @@ desktop-file-install --vendor "" \ #Workaround for self made xorg.conf using a Files section. ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version} +%if 0%{?rhel} > 6 || 0%{?fedora} <= 24 +#Workaround for cuda availability - rfbz#2916 +ln -fs %{_nvidia_libdir}/libcuda.so.1 $RPM_BUILD_ROOT%{_libdir}/libcuda.so.1 +ln -fs %{_nvidia_libdir}/libcuda.so $RPM_BUILD_ROOT%{_libdir}/libcuda.so +%endif + #Alternate-install-present is checked by the nvidia .run install -p -m 0644 %{SOURCE7} $RPM_BUILD_ROOT%{_nvidia_libdir} @@ -470,7 +488,7 @@ fi ||: %config %{_sysconfdir}/glvnd/egl_vendor.d/10_nvidia.json %dir %{_sysconfdir}/nvidia %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf -%if 0%{?fedora} <= 24 +%if 0%{?rhel} > 6 || 0%{?fedora} <= 24 %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf %endif @@ -515,6 +533,9 @@ fi ||: %files libs %defattr(-,root,root,-) %dir %{_nvidia_libdir} +%if 0%{?rhel} > 6 || 0%{?fedora} <= 24 +%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf +%endif %ghost %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf %{_nvidia_libdir}/alternate-install-present %{_nvidia_libdir}/*.so.* @@ -548,6 +569,9 @@ fi ||: %{_bindir}/nvidia-persistenced #nvidia-modprobe is setuid root to allow users to load the module in %attr(4755, root, root) %{_bindir}/nvidia-modprobe +%if 0%{?rhel} > 6 || 0%{?fedora} <= 24 +%{_libdir}/libcuda.so* +%endif %{_nvidia_libdir}/libcuda.so* %{_nvidia_libdir}/libnvcuvid.so* %{_nvidia_libdir}/libnvidia-encode.so* @@ -590,6 +614,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Wed Jan 18 2017 Leigh Scott - 1:375.26-9 +- Add conditions for f24 and el7 + * Tue Jan 17 2017 Leigh Scott - 1:375.26-8 - Changes for mesa glvnd - Move nvidia libs to lib directoy and remove ldconfig config file From 75e76f98063392596cdc2a7277ab57970cf940d7 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Wed, 18 Jan 2017 12:53:18 +0000 Subject: [PATCH 101/101] Fix missing el7 conditional --- xorg-x11-drv-nvidia.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 76bea97..1856bf4 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -513,7 +513,7 @@ fi ||: %{_nvidia_libdir}/libnvidia-gtk3.so* %endif #/no_multilib -%if 0%{?fedora} >= 21 +%if 0%{?rhel} > 6 || 0%{?fedora} >= 21 %{_datadir}/X11/xorg.conf.d/nvidia.conf %endif %if 0%{?fedora} >= 25