[nvidia-settings-390xx] Update to 390.154
by Leigh Scott
commit 00e0749ad7cfe17f31a5ece29ee4cf15f4448089
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 28 17:24:53 2022 +0100
Update to 390.154
.gitignore | 1 +
nvidia-settings-390xx.spec | 17 +++++++----------
sources | 2 +-
3 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5f6c021..a61b0a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
/nvidia-settings-390.144.tar.bz2
/nvidia-settings-390.147.tar.bz2
/nvidia-settings-390.151.tar.bz2
+/nvidia-settings-390.154.tar.bz2
diff --git a/nvidia-settings-390xx.spec b/nvidia-settings-390xx.spec
index a52d234..699bc40 100644
--- a/nvidia-settings-390xx.spec
+++ b/nvidia-settings-390xx.spec
@@ -1,6 +1,6 @@
Name: nvidia-settings-390xx
-Version: 390.151
-Release: 2%{?dist}
+Version: 390.154
+Release: 1%{?dist}
Summary: Configure the NVIDIA 390xx series graphics driver
License: GPLv2+
@@ -10,7 +10,7 @@ Source1: nvidia-settings-user.desktop
Source2: nvidia-settings-390xx.appdata.xml
Patch0: https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d...
-ExclusiveArch: i686 x86_64 armv7hl
+ExclusiveArch: x86_64 armv7hl
Conflicts: nvidia-settings
@@ -19,10 +19,8 @@ BuildRequires: gcc
BuildRequires: hostname
BuildRequires: gtk2-devel
-%if 0%{?fedora} || 0%{?rhel} > 6
BuildRequires: gtk3-devel
BuildRequires: libappstream-glib
-%endif
BuildRequires: libXxf86vm-devel
BuildRequires: libXext-devel
BuildRequires: libXrandr-devel
@@ -116,19 +114,18 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%doc doc/*.txt
%config %{_sysconfdir}/xdg/autostart/nvidia-settings-user.desktop
%{_bindir}/nvidia-settings
-%{_libdir}/libnvidia-gtk?.so.*
-%if 0%{?fedora} || 0%{?rhel} > 6
+%{_libdir}/libnvidia-gtk3.so.*
%exclude %{_libdir}/libnvidia-gtk2.so.*
-%endif
%{_datadir}/pixmaps/nvidia-settings.png
%{_datadir}/applications/nvidia-settings-390xx.desktop
-%if 0%{?fedora}
%{_metainfodir}/nvidia-settings-390xx.appdata.xml
-%endif
%{_mandir}/man1/nvidia-settings.1.*
%changelog
+* Sun Aug 28 2022 Leigh Scott <leigh123linux(a)gmail.com> - 390.154-1
+- Update to 390.154
+
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 390.151-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
diff --git a/sources b/sources
index c22f741..6fda4ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (nvidia-settings-390.151.tar.bz2) = 00db210471402173c44007760a47905e52a04158ffb0ee09142ad53b2fa4f091e70825191151e2d80ddec2fdbcd722fe922a52efbcfd2c5a2b896e542f0cbbda
+SHA512 (nvidia-settings-390.154.tar.bz2) = 95321bffb6e6af7971ee0705a73ee3388cdb84dfd32e799d63c5b36e5c3ddd45de4091349d35c6af279a9aa6fea30b0ec0cb19b940e5b356768c580d8488d2df
1 year, 8 months
[nvidia-390xx-kmod] Update to 390.154 release
by Leigh Scott
commit fb1c77eb22f0bbdee8671f50ab73b87b3b77a75e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 28 16:42:36 2022 +0100
Update to 390.154 release
nvidia-390xx-kmod.spec | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index 86e4c8a..9327963 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -16,9 +16,9 @@
Name: nvidia-390xx-kmod
Epoch: 3
-Version: 390.151
+Version: 390.154
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -41,9 +41,9 @@ Patch12: do-div-cast.patch
#Patch15: https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/ker...
#Patch16: nvidia-470xx-fix-linux-5.17.patch
# http://git.pld-linux.org/gitweb.cgi?p=packages/xorg-driver-video-nvidia-l...
-Patch17: kernel-5.18.patch
+#Patch17: kernel-5.18.patch
# http://git.pld-linux.org/gitweb.cgi?p=packages/xorg-driver-video-nvidia-l...
-Patch18: kernel-5.18-uvm.patch
+#Patch18: kernel-5.18-uvm.patch
# build system updates
Patch30: use-kbuild-compiler.patch
@@ -93,9 +93,9 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
#patch14 -p2 -b 14 -d kernel
#patch15 -p2 -b 15 -d kernel
#patch16 -p2 -b 15 -d kernel
-%patch17 -p2 -b 17 -d kernel
+#%patch17 -p2 -b 17 -d kernel
%ifnarch armv7hl
-%patch18 -p2 -b 18 -d kernel
+#%patch18 -p2 -b 18 -d kernel
%endif
%patch30 -p1 -b 30 -d kernel
@@ -134,6 +134,9 @@ done
%changelog
+* Sun Aug 28 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:390.154-1
+- Update to 390.154 release
+
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3:390.151-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
1 year, 8 months
[xorg-x11-drv-nvidia-390xx] Update to 390.154 release
by Leigh Scott
commit f77b1120c7d3f4b70ce9ca2604c8e0da4d669448
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 28 16:39:16 2022 +0100
Update to 390.154 release
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia-390xx.spec | 7 +++++--
3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2c843f3..fa44e73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@
/NVIDIA-Linux-armv7l-gnueabihf-390.151.run
/NVIDIA-Linux-x86-390.151.run
/NVIDIA-Linux-x86_64-390.151.run
+/NVIDIA-Linux-x86-390.154.run
+/NVIDIA-Linux-x86_64-390.154.run
+/NVIDIA-Linux-armv7l-gnueabihf-390.154.run
diff --git a/sources b/sources
index 4cd052b..ffa9bfb 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (NVIDIA-Linux-armv7l-gnueabihf-390.151.run) = 688ea357a81ab40eb7b4112964fdd52f623b9f22ed9096d0908f2e75e19931fe23fb4017dd9feebce53a5a9bb32058137651ec50cd9bd6db0e0b487365d18355
-SHA512 (NVIDIA-Linux-x86-390.151.run) = 4e60a5886a8d25b86efed62c01a4ad3aae43c515c8be18ada3f3a20b47c9c6e1d4ca5f268b00932d52ef4330d84c4324e574e6847fef871ddfaa9a0e9dc9751b
-SHA512 (NVIDIA-Linux-x86_64-390.151.run) = aad962e4132c8ab031b5f72e47fbd4b5c49824bc175f13fd2c6fb3e539d41ff9829835ce4928bbfa56aba2ffa43fbe3d8049e9246e29b19abcea0ac89bdae5d4
+SHA512 (NVIDIA-Linux-x86-390.154.run) = 5064ae135d099a4b8b81cf4d29f0cc0dcbcd93f13cadb0378f5e20eefad47522bdab42c9130f22ac8a22a4bef22365321cb35dc53b0ba35374e2bedd44e5a5c2
+SHA512 (NVIDIA-Linux-x86_64-390.154.run) = cab7de6db783089c1e385da0296c43d2cbbe266bac2bc177044e279224a6ef9c76495b46c4b7056eb5a82b21932a2002e0c12f7659b446a2586f9df30a69a9a3
+SHA512 (NVIDIA-Linux-armv7l-gnueabihf-390.154.run) = 461ff785a16a82d20d4709f8191c9bb37a71fff79936666ee4101ca40f330aecd8b49263fdd315ea3a92b60b855642dbd6ba7b33446d28c53705d634f0409676
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
index a585221..e2d1e5c 100644
--- a/xorg-x11-drv-nvidia-390xx.spec
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -22,8 +22,8 @@
Name: xorg-x11-drv-nvidia-390xx
Epoch: 3
-Version: 390.151
-Release: 2%{?dist}
+Version: 390.154
+Release: 1%{?dist}
Summary: NVIDIA's 390xx series proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -559,6 +559,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Sun Aug 28 2022 Leigh Scott <leigh123linux(a)gmail.com> - 3:390.154-1
+- Update to 390.154 release
+
* Mon Aug 08 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 3:390.151-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
1 year, 8 months
[xorg-x11-drv-nvidia-390xx] Clean up obsolete condiditionals
by Leigh Scott
commit 71304189b9e5806ee0925a8cec83eb8217a67431
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Aug 28 16:21:18 2022 +0100
Clean up obsolete condiditionals
xorg-x11-drv-nvidia-390xx.spec | 31 +++----------------------------
1 file changed, 3 insertions(+), 28 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
index d7f503b..a585221 100644
--- a/xorg-x11-drv-nvidia-390xx.spec
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -7,27 +7,13 @@
%global _alternate_dir %{_prefix}/lib/nvidia
%global _glvnd_libdir %{_libdir}/libglvnd
-%if 0%{?rhel} == 6
-%global _modprobe_d %{_sysconfdir}/modprobe.d/
-# RHEL 6 does not have _udevrulesdir defined
-%global _udevrulesdir %{_prefix}/lib/udev/rules.d/
-%global _modprobe_d %{_sysconfdir}/modprobe.d/
-%global _dracutopts nouveau.modeset=0 rdblacklist=nouveau
-%global _dracut_conf_d %{_sysconfdir}/dracut.conf.d
-%global _grubby /sbin/grubby --grub --update-kernel=ALL
-%else #rhel > 6 or fedora
%global _dracut_conf_d %{_prefix}/lib/dracut/dracut.conf.d
%global _modprobe_d %{_prefix}/lib/modprobe.d/
%global _grubby %{_sbindir}/grubby --update-kernel=ALL
-%if 0%{?rhel} == 7
-%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau
-%else #fedora
-%if 0%{?fedora} >= 27
+%if 0%{?fedora} || 0%{?rhel} > 7
%global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1
%else
-%global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau
-%endif
-%endif
+%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau
%endif
%global debug_package %{nil}
@@ -62,12 +48,11 @@ Source21: nvidia-fallback.service
ExclusiveArch: i686 x86_64 armv7hl
-%if 0%{?rhel} > 6 || 0%{?fedora}
Buildrequires: systemd
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
-%endif
+
%if 0%{?fedora} || 0%{?rhel} > 7
# AppStream metadata generation
BuildRequires: python3
@@ -393,11 +378,9 @@ fn=%{buildroot}%{_metainfodir}/xorg-x11-drv-nvidia-390xx.metainfo.xml
%endif
# Install nvidia-fallback
-%if 0%{?rhel} > 6 || 0%{?fedora}
mkdir -p %{buildroot}%{_unitdir}
install -p -m 0644 %{SOURCE20} %{buildroot}%{_udevrulesdir}
install -p -m 0644 %{SOURCE21} %{buildroot}%{_unitdir}
-%endif
%pre
@@ -470,11 +453,9 @@ fi ||:
%ghost %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
%{_datadir}/X11/xorg.conf.d/nvidia.conf
-%if 0%{?rhel} > 6 || 0%{?fedora}
%{_udevrulesdir}/10-nvidia.rules
%{_udevrulesdir}/60-nvidia.rules
%{_unitdir}/nvidia-fallback.service
-%endif
%if 0%{?fedora} || 0%{?rhel} > 7
%{_metainfodir}/%{name}.metainfo.xml
%{_datadir}/pixmaps/%{name}.png
@@ -485,15 +466,9 @@ fi ||:
%dir %{_datadir}/glvnd/egl_vendor.d
%{_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) %{_modprobe_d}/blacklist-nouveau.conf
-%config(noreplace) %{_dracut_conf_d}/99-nvidia-dracut.conf
-%else
%{_modprobe_d}/blacklist-nouveau.conf
%{_dracut_conf_d}/99-nvidia-dracut.conf
%endif
-%endif
%{_bindir}/nvidia-bug-report.sh
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
1 year, 8 months