[xorg-x11-drv-nvidia/el7] Avoid xorg dir symlink
by Nicolas Chauvet
commit 3f37ff0e26a3909380a6761116c1a493055fac8e
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 16 09:49:22 2017 +0100
Avoid xorg dir symlink
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 daa63d5..6f7885b 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -327,8 +327,10 @@ desktop-file-install --vendor "" \
%endif
nvidia-settings.desktop
+%if 0%{?rhel} < 8 || 0%{?fedora} <= 24
#Workaround for self made xorg.conf using a Files section.
ln -fs ../../%{_nvidia_serie}/xorg $RPM_BUILD_ROOT%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
+%endif
%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
#Workaround for cuda availability - rfbz#2916
@@ -526,7 +528,9 @@ fi ||:
%dir %{_nvidia_xorgdir}
%{_nvidia_xorgdir}/*.so*
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%if 0%{?rhel} < 8 || 0%{?fedora} <= 24
%{_libdir}/xorg/modules/%{_nvidia_serie}-%{version}
+%endif
# It's time that nvidia-settings used gtk3
%ifarch %{arm}
%{_nvidia_libdir}/libnvidia-gtk2.so*
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Drop GFXPAYLOAD and video=vesa:off
by Nicolas Chauvet
commit b5122eece58a92b2477778515413fb85f798d9c7
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 16 09:39:14 2017 +0100
Drop GFXPAYLOAD and video=vesa:off
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 4af2864..daa63d5 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -414,7 +414,7 @@ if [ "$1" -eq "1" ]; then
ISGRUB1="--grub"
GFXPAYLOAD="vga=normal"
else
- echo "GRUB_GFXPAYLOAD_LINUX=text" >> %{_sysconfdir}/default/grub
+ #echo "GRUB_GFXPAYLOAD_LINUX=text" >> %{_sysconfdir}/default/grub
if [ -f /boot/grub2/grub.cfg ]; then
/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg
fi
@@ -430,7 +430,7 @@ if [ "$1" -eq "1" ]; then
for kernel in ${KERNELS} ; do
/sbin/grubby $ISGRUB1 \
--update-kernel=${kernel} \
- --args="nouveau.modeset=0 rd.driver.blacklist=nouveau video=vesa:off $GFXPAYLOAD" \
+ --args="nouveau.modeset=0 rd.driver.blacklist=nouveau $GFXPAYLOAD" \
&>/dev/null
done
fi
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Implement cuda-libs (for steam)
by Nicolas Chauvet
commit 623c4306204384d8f12d19bbe4a33285cce2a8d0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Feb 16 09:36:44 2017 +0100
Implement cuda-libs (for steam)
xorg-x11-drv-nvidia.spec | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 109f819..4af2864 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -105,7 +105,8 @@ 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}
+Requires: %{name}-cuda = %{?epoch}:%{version}-%{release}
+Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
#Don't put an epoch here
Provides: cuda-drivers-devel = %{version}-100
@@ -116,9 +117,10 @@ This package provides the development files of the %{name} package,
such as OpenGL headers.
%package cuda
-Summary: CUDA libraries for %{name}
+Summary: CUDA driver for %{name}
Group: Development/Libraries
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
+Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Provides: nvidia-modprobe = %{version}-%{release}
Provides: nvidia-persistenced = %{version}-%{release}
@@ -129,6 +131,14 @@ Provides: cuda-drivers = %{version}-100
Provides: cuda-drivers%{?_isa} = %{version}-100
%description cuda
+This package provides the CUDA driver.
+
+%package cuda-libs
+Summary: CUDA libraries for %{name}
+Group: Development/Libraries
+Requires: %{name}-cuda = %{?epoch}:%{version}-%{release}
+
+%description cuda-libs
This package provides the CUDA driver libraries.
%package kmodsrc
@@ -153,10 +163,13 @@ Requires: libglvnd-opengl%{?_isa} >= 0.2
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGLES%{?_isa} >= 13.0.3-3
+# Boolean dependencies are now yet allowed in fedora, only for testing
+%if 0%{?fedora} >= 26
%ifarch x86_64
Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
%endif
%endif
+%endif
%ifarch x86_64 i686
Requires: vulkan-filesystem
%endif
@@ -432,6 +445,8 @@ fi || :
%systemd_post nvidia-persistenced.service
%endif
+%post cuda-libs -p /sbin/ldconfig
+
%preun
if [ "$1" -eq "0" ]; then
@@ -480,6 +495,8 @@ fi ||:
%systemd_postun_with_restart nvidia-persistenced.service
%endif
+%postun cuda-libs -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
%doc nvidiapkg/LICENSE
@@ -580,9 +597,6 @@ fi ||:
%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
%{_libdir}/libcuda.so*
%endif
-%{_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*
@@ -598,6 +612,11 @@ fi ||:
%{_mandir}/man1/nvidia-persistenced.1.*
%{_mandir}/man1/nvidia-modprobe.1.*
+%files cuda-libs
+%{_nvidia_libdir}/libcuda.so*
+%{_nvidia_libdir}/libnvcuvid.so*
+%{_nvidia_libdir}/libnvidia-encode.so*
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/nvidia/
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Update to 375.39 release
by Nicolas Chauvet
commit 7d16c6e911eab3fd26dec3c97727617c8f3d0f5a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Feb 14 17:28:10 2017 +0000
Update to 375.39 release
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 7 +++++--
3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index de89dd3..02d10c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@ NVIDIA-Linux-x86_64-358.16.run
/NVIDIA-Linux-armv7l-gnueabihf-375.26.run
/NVIDIA-Linux-x86-375.26.run
/NVIDIA-Linux-x86_64-375.26.run
+/NVIDIA-Linux-armv7l-gnueabihf-375.39.run
+/NVIDIA-Linux-x86-375.39.run
+/NVIDIA-Linux-x86_64-375.39.run
diff --git a/sources b/sources
index 4d810e2..e71d817 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-fd8940af2a501273f5819f1750918995 NVIDIA-Linux-armv7l-gnueabihf-375.26.run
-b0706e88ad173f6b9c7bd2e5a838c163 NVIDIA-Linux-x86-375.26.run
-d60819b2e377398c7296999ab5e7c1a4 NVIDIA-Linux-x86_64-375.26.run
+4bfc45553ffa1a33f6abf3a297b3f26a NVIDIA-Linux-armv7l-gnueabihf-375.39.run
+9247d5eb9df58bb7755c9060ef5d103d NVIDIA-Linux-x86-375.39.run
+35b32baba21089dfe5d960ae89d98cde NVIDIA-Linux-x86_64-375.39.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index b9842cc..109f819 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -13,8 +13,8 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
-Version: 375.26
-Release: 11%{?dist}
+Version: 375.39
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -626,6 +626,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Tue Feb 14 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.39-1
+- Update to 375.39 release
+
* Thu Jan 19 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-11
- Fix file conflict with filesystem
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Bump cuda-drivers release to 100
by Nicolas Chauvet
commit a80b617b84dcd8931914778bfcdf2d78830648db
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 10 11:50:49 2017 +0100
Bump cuda-drivers release to 100
xorg-x11-drv-nvidia.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index f33a23b..b9842cc 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -108,8 +108,8 @@ 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 = %{version}-100
+Provides: cuda-drivers-devel%{?_isa} = %{version}-100
%description devel
This package provides the development files of the %{name} package,
@@ -125,8 +125,8 @@ Provides: nvidia-persistenced = %{version}-%{release}
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 = %{version}-100
+Provides: cuda-drivers%{?_isa} = %{version}-100
%description cuda
This package provides the CUDA driver libraries.
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Enable boolean dependency to fix 32bit installation when needed - rfbz#1665
by Nicolas Chauvet
commit 0ba17e1ae2b9db87f6ad0f38a414d21f2d3960b6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 7 14:22:37 2017 +0100
Enable boolean dependency to fix 32bit installation when needed - rfbz#1665
xorg-x11-drv-nvidia.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index b98e69e..f33a23b 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -153,6 +153,9 @@ Requires: libglvnd-opengl%{?_isa} >= 0.2
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGLES%{?_isa} >= 13.0.3-3
+%ifarch x86_64
+Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
+%endif
%endif
%ifarch x86_64 i686
Requires: vulkan-filesystem
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Move mesa-*gl* requires to -libs
by Nicolas Chauvet
commit 94e9cb1fbcf42a86733a78fc46d378c25c985cb5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Feb 7 14:08:03 2017 +0100
Move mesa-*gl* requires to -libs
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 1e014cd..b98e69e 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -61,9 +61,6 @@ Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
# filesystem is needed as we don't own %%{_libdir} or %%{_libdir}/tls
Requires: filesystem
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}
@@ -153,6 +150,9 @@ Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
+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
%ifarch x86_64 i686
Requires: vulkan-filesystem
6 years, 10 months
[xorg-x11-drv-nvidia/el7] Fix file conflict with filesystem
by Nicolas Chauvet
commit 6621ceeb5a1f0208eb9262da9adffe14e2be2333
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 19 11:08:02 2017 +0000
Fix file conflict with filesystem
xorg-x11-drv-nvidia.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 3c28723..1e014cd 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -14,7 +14,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -58,6 +58,8 @@ Requires: which
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
%if 0%{?fedora} >= 25
+# filesystem is needed as we don't own %%{_libdir} or %%{_libdir}/tls
+Requires: filesystem
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
@@ -532,9 +534,10 @@ 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
+%dir %{_nvidia_libdir}
+%dir %{_nvidia_libdir}/tls
%endif
%ghost %{_sysconfdir}/prelink.conf.d/nvidia-%{_lib}.conf
%{_nvidia_libdir}/alternate-install-present
@@ -555,7 +558,6 @@ fi ||:
%endif
%exclude %{_nvidia_libdir}/libnvidia-compiler.so*
%exclude %{_nvidia_libdir}/libnvidia-opencl.so*
-%dir %{_nvidia_libdir}/tls
%{_nvidia_libdir}/tls/*.so.*
%endif
%{_libdir}/vdpau/libvdpau_nvidia.so.*
@@ -621,6 +623,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* Thu Jan 19 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-11
+- Fix file conflict with filesystem
+
* Wed Jan 18 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-10
- Add conditions for el7 as there is no wayland
6 years, 10 months
