[xorg-x11-drv-nvidia/el7] Add epoch for triggerin
by Nicolas Chauvet
commit 2244806008e3e565e9c211f63daba90b62640a92
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri May 12 17:21:30 2017 +0200
Add epoch for triggerin
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 cfcf984..7617d1d 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -31,7 +31,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -393,7 +393,7 @@ if [ "$1" -eq "1" ]; then
fi || :
%if 0%{?fedora} || 0%{?rhel} >= 7
-%triggerin -- xorg-x11-drv-nvidia < 381.09-5
+%triggerin -- xorg-x11-drv-nvidia < 2:375.66-1
%{_grubby} --args='%{_dracutopts}' &>/dev/null || :
%endif
@@ -570,6 +570,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Fri May 12 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-2
+- Add epoch for triggerin
+
* Fri May 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-1
- Update to 375.66 release
7 years, 4 months
[xorg-x11-drv-nvidia/el7] Update to 375.66 release
by Nicolas Chauvet
commit f6ac3668c886651dc4242bb25a021e1b76e4b9b0
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri May 5 23:54:04 2017 +0100
Update to 375.66 release
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 9 ++++++---
3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d86284..d78c0fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ NVIDIA-Linux-x86_64-358.16.run
/NVIDIA-Linux-x86-381.09.run
/NVIDIA-Linux-x86_64-381.09.run
/NVIDIA-Linux-armv7l-gnueabihf-381.09.run
+/NVIDIA-Linux-armv7l-gnueabihf-375.66.run
+/NVIDIA-Linux-x86-375.66.run
+/NVIDIA-Linux-x86_64-375.66.run
diff --git a/sources b/sources
index 17deac2..d20c4a9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-aa16257e2ab1c28724479165afc187cc NVIDIA-Linux-x86-381.09.run
-0a306b62fbf080943fd0559e12a7ddeb NVIDIA-Linux-x86_64-381.09.run
-01a30db744e0792ba8dd28202b37820e NVIDIA-Linux-armv7l-gnueabihf-381.09.run
+d8f8bee37b237f76c533eb0c4dae9bbc NVIDIA-Linux-armv7l-gnueabihf-375.66.run
+47dddb796fe39497cf6ae374591f6eb9 NVIDIA-Linux-x86-375.66.run
+9cf2c0a342a088211f25c5d8137097e6 NVIDIA-Linux-x86_64-375.66.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 2315350..cfcf984 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -29,9 +29,9 @@
Name: xorg-x11-drv-nvidia
-Epoch: 1
-Version: 381.09
-Release: 5%{?dist}
+Epoch: 2
+Version: 375.66
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -570,6 +570,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Fri May 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-1
+- Update to 375.66 release
+
* Wed Apr 26 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 1:381.09-5
- Use modprobe.blacklist cmdline instead of blacklist file on fedora.
- Use triggerin to install the new cmdline
7 years, 4 months
[xorg-x11-drv-nvidia/el7] typo
by Nicolas Chauvet
commit b9d1d65fdc1afae7b804c2fb7ad33c8533593cb0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 27 08:48:51 2017 +0200
typo
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 f778446..2315350 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -274,7 +274,7 @@ install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/
%endif
# EGL config
install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
-install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/90_nvidia_json
+install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/90_nvidia.json
# ld.so.conf.d file
%if ! 0%{?fedora} >= 25
7 years, 4 months
[xorg-x11-drv-nvidia/el7] Bump nvidia egl_vendor file to 90
by Nicolas Chauvet
commit a7a82211d028b01ec5d4b128a6bedd2a329e0b70
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Apr 26 19:43:16 2017 +0200
Bump nvidia egl_vendor file to 90
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 7632dcf..f778446 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -274,7 +274,7 @@ install -p -m 0644 nvidia_icd.json %{buildroot}%{_datadir}/vulkan/icd.d/
%endif
# EGL config
install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
-install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
+install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/90_nvidia_json
# ld.so.conf.d file
%if ! 0%{?fedora} >= 25
@@ -448,7 +448,7 @@ fi ||:
%ifarch x86_64 i686
%{_datadir}/vulkan/icd.d/nvidia_icd.json
%endif
-%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
+%{_datadir}/glvnd/egl_vendor.d/90_nvidia.json
%dir %{_sysconfdir}/nvidia
%ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
%ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
7 years, 4 months
[xorg-x11-drv-nvidia/el7] Fixup symlink
by Nicolas Chauvet
commit 630df23e709ff35ecf6c6bff2cb4b5828fe1f858
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Apr 26 19:41:22 2017 +0200
Fixup symlink
xorg-x11-drv-nvidia.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 025e6ac..7632dcf 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -253,7 +253,8 @@ ln -sf libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir}/vdpau/libvdpau_nvidi
# GlVND
%if 0%{?fedora} >= 25
-ln -s libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
+# We keep the same symlink than mesa-libGL to avoid conflict
+ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
%else
ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
%endif
7 years, 4 months
[xorg-x11-drv-nvidia/el7] Update changelog
by Nicolas Chauvet
commit 819fecdd460bae04150193694295f25bb4508d32
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Apr 26 18:42:10 2017 +0200
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 934e51b..025e6ac 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -31,7 +31,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 381.09
-Release: 3%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -569,6 +569,13 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Wed Apr 26 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 1:381.09-5
+- Use modprobe.blacklist cmdline instead of blacklist file on fedora.
+- Use triggerin to install the new cmdline
+- Re-org Xorg config files installation
+- Switch to http instead of ftp for download URL
+- Point libGLX_indirect to Mesa on f25+ or to nvidia
+
* Mon Apr 10 2017 Simone Caronni <negativo17(a)gmail.com> - 1:381.09-3
- Also use split libglvnd packages for Fedora 24 and RHEL 6/7.
7 years, 4 months
[xorg-x11-drv-nvidia/el7] Add triggerin to update to the new cmdline with grubby
by Nicolas Chauvet
commit 7bc225fc5666bd1a821d1a7dcd4e94dcd6f91f28
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Apr 26 17:41:41 2017 +0200
Add triggerin to update to the new cmdline with grubby
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 f4375bc..934e51b 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -391,6 +391,10 @@ if [ "$1" -eq "1" ]; then
%endif
fi || :
+%if 0%{?fedora} || 0%{?rhel} >= 7
+%triggerin -- xorg-x11-drv-nvidia < 381.09-5
+%{_grubby} --args='%{_dracutopts}' &>/dev/null || :
+%endif
%post libs -p /sbin/ldconfig
7 years, 4 months
[xorg-x11-drv-nvidia/el7] Rework
by Nicolas Chauvet
commit b7bd4f990efca194f3f0bb02d4133571f623e393
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Apr 26 12:30:54 2017 +0200
Rework
xorg-x11-drv-nvidia.spec | 122 +++++++++++++++++++++--------------------------
1 file changed, 55 insertions(+), 67 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index ea8fd92..f4375bc 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -5,10 +5,7 @@
# https://github.com/NVIDIA/nvidia-installer/blob/master/misc.c#L2443
# https://github.com/NVIDIA/nvidia-installer/blob/master/misc.c#L2556-L2558
%global _alternate_dir %{_prefix}/lib/nvidia
-
-%if 0%{?rhel} || 0%{?fedora} == 24
%global _glvnd_libdir %{_libdir}/libglvnd
-%endif
%if 0%{?rhel} == 6
%global _modprobe_d %{_sysconfdir}/modprobe.d/
@@ -17,15 +14,20 @@
%global _modprobe_d %{_sysconfdir}/modprobe.d/
%global _dracutopts nouveau.modeset=0 rdblacklist=nouveau
%global _grubby /sbin/grubby --grub --update-kernel=ALL
-%else
+%else #rhel > 6 or fedora
%global _modprobe_d %{_prefix}/lib/modprobe.d/
-%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau
%global _grubby %{_sbindir}/grubby --update-kernel=ALL
+%if 0%{?rhel} == 7
+%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau
+%else #fedora
+%global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau
+%endif
%endif
%global debug_package %{nil}
%global __strip /bin/true
+
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 381.09
@@ -34,18 +36,17 @@ Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
-Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
-Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source4: ftp://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linux...
-Source2: 99-nvidia.conf
+Source0: http://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-...
+Source1: http://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x...
+Source2: http://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Linu...
+
Source3: xorg.conf.nvidia
+Source4: 99-nvidia.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
Source12: xorg-x11-drv-nvidia.metainfo.xml
Source13: parse-readme.py
Source14: 60-nvidia-uvm.rules
@@ -64,6 +65,11 @@ Requires(postun): systemd
# AppStream metadata generation
BuildRequires: python2
BuildRequires: libappstream-glib >= 0.6.3
+# Xorg with PrimaryGPU
+Requires: Xorg >= 1.19.0-3
+%else
+# Xorg with OutputClass
+Requires: Xorg >= 1.16.0-1
%endif
Requires(post): ldconfig
@@ -73,11 +79,6 @@ 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}
-Requires: filesystem
-Requires: xorg-x11-server-Xorg%{?_isa} >= 1.19.0-3
-%endif
Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version}
Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version}
@@ -190,7 +191,7 @@ sh %{SOURCE0} \
sh %{SOURCE1} \
%endif
%ifarch armv7hl
-sh %{SOURCE4} \
+sh %{SOURCE2} \
%endif
--extract-only --target nvidiapkg-%{_target_cpu}
ln -s nvidiapkg-%{_target_cpu} nvidiapkg
@@ -250,9 +251,11 @@ done
install -D -p -m 0755 libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir}/vdpau/libvdpau_nvidia.so.%{version}
ln -sf libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir}/vdpau/libvdpau_nvidia.so.1
-%if 0%{?rhel} == 7 || 0%{?rhel} == 6 || 0%{?fedora} == 24
# GlVND
-ln -s %{_libdir}/libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
+%if 0%{?fedora} >= 25
+ln -s libGLX_mesa.so.0 %{buildroot}%{_libdir}/libGLX_indirect.so.0
+%else
+ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
%endif
# X DDX driver and GLX extension
@@ -273,14 +276,17 @@ install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
# ld.so.conf.d file
-%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
+%if ! 0%{?fedora} >= 25
install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
echo -e "%{_glvnd_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
# Blacklist nouveau, autoload nvidia-uvm module after nvidia module
-install -m 0755 -d %{buildroot}%{_modprobe_d}/
-install -p -m 0644 %{SOURCE6} %{SOURCE15} %{buildroot}%{_modprobe_d}/
+mkdir -p %{buildroot}%{_modprobe_d}
+install -p -m 0644 %{SOURCE15} %{buildroot}%{_modprobe_d}
+%if ! 0%{?fedora} >= 25
+install -p -m 0644 %{SOURCE6} %{buildroot}%{_modprobe_d}
+%endif
# UDev rules for nvidia-uvm
install -m 0755 -d %{buildroot}%{_udevrulesdir}
@@ -304,22 +310,6 @@ install -p -m 0644 nvidia-{cuda-mps-control,persistenced,settings,smi,xconfig}.1
mkdir -p %{buildroot}%{_datadir}/pixmaps
install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps
-#Install static driver dependant configuration files
-mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
-%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
-install -pm 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
-%endif
-%if 0%{?rhel} == 6
-install -pm 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/X11/xorg.conf.nvidia
-%endif
-%if 0%{?fedora} <= 24
-install -pm 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
-sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
-touch -r %{SOURCE2} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
-%endif
-# Comment Xorg abi override
-#install -pm 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
-
# Fix desktop file and validate
sed -i -e 's|__UTILS_PATH__/||g' -e 's|__PIXMAP_PATH__/||g' nvidia-settings.desktop
sed -i -e 's|nvidia-settings.png|nvidia-settings|g' nvidia-settings.desktop
@@ -335,17 +325,23 @@ install -p -m 0644 %{SOURCE7} %{buildroot}%{_alternate_dir}
mkdir -p %{buildroot}%{_datadir}/nvidia
install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation} %{buildroot}%{_datadir}/nvidia
-#Install the output class configuration file - xorg-server >= 1.16
-%if 0%{?fedora} >= 25
+#Install the Xorg configuration files
+mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
mkdir -p %{buildroot}%{_datadir}/X11/xorg.conf.d
+%if 0%{?fedora} >= 25
install -pm 0644 %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
touch -r %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
+%else
+install -pm 0644 nvidia-drm-outputclass.conf %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
+install -pm 0644 %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+touch -r %{SOURCE4} %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%endif
-%if 0%{?rhel} == 7 || 0%{?fedora} == 24
-mkdir -p %{buildroot}%{_datadir}/X11/xorg.conf.d
-install -pm 0644 %{SOURCE8} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
-%endif
+#Ghost Xorg nvidia.conf files
+touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
+touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
#Install the initscript
tar jxf nvidia-persistenced-init.tar.bz2
@@ -360,9 +356,6 @@ sed -i -e "s/__USER__/root/" %{buildroot}%{_unitdir}/nvidia-persistenced.service
#Create the default nvidia config directory
mkdir -p %{buildroot}%{_sysconfdir}/nvidia
-#Ghost Xorg nvidia.conf file
-touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
-
#Install the nvidia kernel modules sources archive
mkdir -p %{buildroot}%{_datadir}/nvidia-kmod-%{version}
tar Jcf %{buildroot}%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz kernel
@@ -419,10 +412,8 @@ if [ "$1" -eq "0" ]; then
%if 0%{?fedora} || 0%{?rhel} >= 7
sed -i -e 's/%{_dracutopts} //g' /etc/default/grub
%endif
-%if 0%{?rhel} == 6
# Backup and disable previously used xorg.conf
[ -f %{_sysconfdir}/X11/xorg.conf ] && mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.nvidia_uninstalled &>/dev/null
-%endif
fi ||:
%if 0%{?rhel} > 6 || 0%{?fedora}
@@ -454,16 +445,21 @@ fi ||:
%endif
%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
%dir %{_sysconfdir}/nvidia
-%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
-%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
-# Comment Xorg abi override
-#%%config %%{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf
-%config(noreplace) %{_modprobe_d}/blacklist-nouveau.conf
+%ghost %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf
+%ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
+%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
+%if 0%{?fedora} >= 25
+%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
+%{_datadir}/X11/xorg.conf.d/nvidia.conf
+%else
+%{_datadir}/X11/xorg.conf.d/00-avoid-glamor.conf
+%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
+# RHEL6 uses /etc
%if 0%{?rhel} == 6
-%config(noreplace) %{_sysconfdir}/X11/xorg.conf.nvidia
+%config(noreplace) %{_modprobe_d}/blacklist-nouveau.conf
+%else
+%{_modprobe_d}/blacklist-nouveau.conf
+%endif
%endif
%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
%{_bindir}/nvidia-bug-report.sh
@@ -487,12 +483,6 @@ fi ||:
%endif
%endif
#/no_multilib
-%if 0%{?rhel} > 6 || 0%{?fedora}
-%{_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
@@ -505,7 +495,7 @@ fi ||:
%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz
%files libs
-%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
+%if 0%{?rhel} || 0%{?fedora} == 24
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%dir %{_libdir}
%endif
@@ -516,9 +506,7 @@ fi ||:
%{_libdir}/libGLESv1_CM_nvidia.so.%{version}
%{_libdir}/libGLESv2_nvidia.so.2
%{_libdir}/libGLESv2_nvidia.so.%{version}
-%if 0%{?rhel} == 7 || 0%{?rhel} == 6 || 0%{?fedora} == 24
%{_libdir}/libGLX_indirect.so.0
-%endif
%{_libdir}/libGLX_nvidia.so.0
%{_libdir}/libGLX_nvidia.so.%{version}
%{_libdir}/libnvidia-cfg.so.1
7 years, 4 months
[xorg-x11-drv-nvidia/el7] Hardcode installation of the alternate-install-present file where nvidia-installer expects it. Also,
by Nicolas Chauvet
commit 417d70bb39dc91ca615f7e15927fff74b28fb13c
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Apr 10 13:52:32 2017 +0200
Hardcode installation of the alternate-install-present file where nvidia-installer expects it. Also, include it in the main package and not the library subpackage.
xorg-x11-drv-nvidia.spec | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index edc8b75..ea8fd92 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -1,6 +1,10 @@
%global _nvidia_serie nvidia
%global _nvidia_libdir %{_libdir}/%{_nvidia_serie}
%global _nvidia_xorgdir %{_nvidia_libdir}/xorg
+# Unfortunately this is always hardcoded regardless of architecture:
+# https://github.com/NVIDIA/nvidia-installer/blob/master/misc.c#L2443
+# https://github.com/NVIDIA/nvidia-installer/blob/master/misc.c#L2556-L2558
+%global _alternate_dir %{_prefix}/lib/nvidia
%if 0%{?rhel} || 0%{?fedora} == 24
%global _glvnd_libdir %{_libdir}/libglvnd
@@ -324,7 +328,8 @@ desktop-file-install --vendor "" \
nvidia-settings.desktop
#Alternate-install-present is checked by the nvidia .run
-install -p -m 0644 %{SOURCE7} %{buildroot}%{_nvidia_libdir}
+mkdir -p %{buildroot}%{_alternate_dir}
+install -p -m 0644 %{SOURCE7} %{buildroot}%{_alternate_dir}
#install the NVIDIA supplied application profiles
mkdir -p %{buildroot}%{_datadir}/nvidia
@@ -442,6 +447,8 @@ fi ||:
%doc nvidiapkg/README.txt
%doc nvidiapkg/nvidia-application-profiles-%{version}-rc
%doc nvidiapkg/html
+%dir %{_alternate_dir}
+%{_alternate_dir}/alternate-install-present
%ifarch x86_64 i686
%{_datadir}/vulkan/icd.d/nvidia_icd.json
%endif
@@ -503,7 +510,6 @@ fi ||:
%dir %{_libdir}
%endif
%dir %{_nvidia_libdir}
-%{_nvidia_libdir}/alternate-install-present
%{_libdir}/libEGL_nvidia.so.0
%{_libdir}/libEGL_nvidia.so.%{version}
%{_libdir}/libGLESv1_CM_nvidia.so.1
7 years, 4 months
[xorg-x11-drv-nvidia/el7] Also use split libglvnd packages for Fedora 24 and RHEL 6/7
by Nicolas Chauvet
commit cf8ee393cb477256c273d2e1e20d7b40d860c55c
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Apr 10 10:23:46 2017 +0200
Also use split libglvnd packages for Fedora 24 and RHEL 6/7
xorg-x11-drv-nvidia.spec | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index f0ec728..edc8b75 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -25,7 +25,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 381.09
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -152,13 +152,12 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
-Requires: libglvnd%{?_isa} >= 0.2
-%if 0%{?fedora} >= 25
-Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
Requires: libglvnd-opengl%{?_isa} >= 0.2
+%if 0%{?fedora} >= 25
+Requires: egl-wayland%{?_isa} >= 1.0.0
Requires: mesa-libEGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGL%{?_isa} >= 13.0.3-3
Requires: mesa-libGLES%{?_isa} >= 13.0.3-3
@@ -572,6 +571,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Mon Apr 10 2017 Simone Caronni <negativo17(a)gmail.com> - 1:381.09-3
+- Also use split libglvnd packages for Fedora 24 and RHEL 6/7.
+
* Mon Apr 10 2017 Simone Caronni <negativo17(a)gmail.com> - 1:381.09-2
- Simplify GRUB installation for Grub 1 (RHEL 6) and Grub 2 (RHEL 7+/Fedora), do
not use obsolete kernel parameters.
7 years, 4 months