[xorg-x11-drv-nvidia] remove dead source files
by Leigh Scott
commit 414c5856da03718967bab53e9ff04b3b386ecc82
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 29 16:54:07 2018 +0100
remove dead source files
00-avoid-glamor.conf | 6 ------
99-nvidia.conf | 7 -------
blacklist-nouveau.conf | 4 ----
3 files changed, 17 deletions(-)
5 years, 7 months
[xorg-x11-drv-nvidia] fix vulkan requires and edit changelog
by Leigh Scott
commit e390ccd303335f56cdbcea911e10156074d239e9
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 29 15:25:18 2018 +0100
fix vulkan requires and edit changelog
xorg-x11-drv-nvidia.spec | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index f73ff3c..c2e0259 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -10,7 +10,7 @@
%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
+%if 0%{?rhel}
%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau nvidia-drm.modeset=1
%else #fedora
%global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1
@@ -23,7 +23,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 396.54
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -156,13 +156,13 @@ 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
-%if 0%{?fedora}
+%if 0%{?rhel}
+Requires: vulkan-filesystem
+%else
Requires: vulkan-loader
%ifarch x86_64
# Boolean dependencies are only fedora
Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
-%else
-Requires: vulkan-filesystem
%endif
%endif
@@ -481,6 +481,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Wed Aug 29 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:396.54-3
+- Rebase for RHEL-7.6 beta
+
* Wed Aug 22 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:396.54-2
- Add epoch to for nvidia-persistenced requires
5 years, 7 months
[xorg-x11-drv-nvidia] Enable modeset on epel
by Leigh Scott
commit 71447e6cac1506511d63f045039fe92127c963e3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 29 13:55:51 2018 +0100
Enable modeset on epel
xorg-x11-drv-nvidia.spec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 02dd0e2..f73ff3c 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -11,7 +11,7 @@
%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
+%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau nvidia-drm.modeset=1
%else #fedora
%global _dracutopts rd.driver.blacklist=nouveau modprobe.blacklist=nouveau nvidia-drm.modeset=1
%endif
@@ -340,11 +340,9 @@ if [ "$1" -eq "1" ]; then
sed -i -e 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="%{_dracutopts} /g' /etc/default/grub
# Until mutter enable egl stream support, we need to disable gdm wayland
# https://bugzilla.redhat.com/1462052
-%if 0%{?fedora}
if [ -f %{_sysconfdir}/gdm/custom.conf ] ; then
sed -i -e 's/#WaylandEnable=.*/WaylandEnable=false/' %{_sysconfdir}/gdm/custom.conf
fi
-%endif
fi || :
%triggerun -- xorg-x11-drv-nvidia < 3:384.59-5
5 years, 7 months
[xorg-x11-drv-nvidia] remove epel6 support for install and files sections
by Leigh Scott
commit fa7c4e8c1d69dabc9aa2c10e488839be4909ff55
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 29 13:41:23 2018 +0100
remove epel6 support for install and files sections
xorg-x11-drv-nvidia.spec | 72 ++----------------------------------------------
1 file changed, 3 insertions(+), 69 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index afaae4d..02dd0e2 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -29,10 +29,6 @@ Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
Source0: https://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-...
-
-Source2: 99-nvidia.conf
-Source3: 00-avoid-glamor.conf
-Source4: blacklist-nouveau.conf
Source5: alternate-install-present
Source6: nvidia.conf
Source7: 60-nvidia.rules
@@ -221,16 +217,6 @@ cp -af \
libnvidia-opencl.so.%{version} \
%{buildroot}%{_libdir}/
-%if 0%{?rhel} && 0%{?rhel} < 8
-mkdir -p %{buildroot}%{_nvidia_libdir}
-cp -a \
- libEGL.so.%{version} \
- libGL.so.%{version} \
- libGLdispatch.so.0 \
- %{buildroot}%{_nvidia_libdir}/
-ldconfig -vn %{buildroot}%{_nvidia_libdir}/
-%endif
-
# Use ldconfig for libraries with a mismatching SONAME/filename
ldconfig -vn %{buildroot}%{_libdir}/
@@ -243,14 +229,6 @@ 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
-# GlVND
-%if 0%{?rhel} && 0%{?rhel} < 8
-ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir}/libGLX_indirect.so.0
-
-# ld.so.conf.d file
-install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-echo -e "%{_nvidia_libdir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
-%endif
%ifarch i686
popd
%endif
@@ -259,11 +237,6 @@ popd
sed -i -e 's|__NV_VK_ICD__|libGLX_nvidia.so.0|' nvidia_icd.json.template
install -m 0755 -d %{buildroot}%{_datadir}/vulkan/icd.d/
install -p -m 0644 nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
-%if 0%{?rhel}
-# back to non-glvnd version for vulkan
-sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
-touch -r nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
-%endif
# Install headers
install -m 0755 -d %{buildroot}%{_includedir}/nvidia/GL/
@@ -286,9 +259,6 @@ install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_
# Blacklist nouveau, autoload nvidia-uvm module after nvidia module
mkdir -p %{buildroot}%{_modprobe_d}
install -p -m 0644 %{SOURCE11} %{buildroot}%{_modprobe_d}
-%if 0%{?rhel} && 0%{?rhel} < 8
-install -p -m 0644 %{SOURCE4} %{buildroot}%{_modprobe_d}
-%endif
# UDev rules for nvidia
install -m 0755 -d %{buildroot}%{_udevrulesdir}
@@ -322,17 +292,10 @@ install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation}
#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 || 0%{?rhel} >= 7
install -pm 0644 %{SOURCE6} %{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 %{SOURCE6} %{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 %{SOURCE2} %{buildroot}%{_datadir}/X11/xorg.conf.d
-install -pm 0644 %{SOURCE3} %{buildroot}%{_datadir}/X11/xorg.conf.d
-sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
-touch -r %{SOURCE2} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-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
@@ -359,11 +322,9 @@ install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
%endif
# Install nvidia-fallback
-%if 0%{?rhel} > 6 || 0%{?fedora}
mkdir -p %{buildroot}%{_unitdir}
install -p -m 0644 %{SOURCE13} %{buildroot}%{_udevrulesdir}
install -p -m 0644 %{SOURCE14} %{buildroot}%{_unitdir}
-%endif
%pre
@@ -430,30 +391,14 @@ 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} >= 25
+%if 0%{?fedora}
%{_datadir}/appdata/%{name}.metainfo.xml
%{_datadir}/pixmaps/%{name}.png
-%{_dracut_conf_d}/99-nvidia-dracut.conf
-%else
-# Owns the directory since libglvnd is optional here
-%dir %{_datadir}/glvnd
-%dir %{_datadir}/glvnd/egl_vendor.d
-# RHEL6 uses /etc
-%if 0%{?rhel} == 6
-%config(noreplace) %{_modprobe_d}/blacklist-nouveau.conf
-%config(noreplace) %{_dracut_conf_d}/99-nvidia-dracut.conf
-%{_datadir}/X11/xorg.conf.d/00-avoid-glamor.conf
-%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
-%else
-%{_modprobe_d}/blacklist-nouveau.conf
-%{_dracut_conf_d}/99-nvidia-dracut.conf
-%endif
%endif
+%{_dracut_conf_d}/99-nvidia-dracut.conf
%{_bindir}/nvidia-bug-report.sh
# Xorg libs that do not need to be multilib
%dir %{_nvidia_xorgdir}
@@ -475,14 +420,6 @@ fi ||:
%endif
%files libs
-%if 0%{?rhel} && 0%{?rhel} < 8
-%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
-%{_nvidia_libdir}/libEGL.so.1
-%{_nvidia_libdir}/libEGL.so.%{version}
-%{_nvidia_libdir}/libGL.so.1
-%{_nvidia_libdir}/libGL.so.%{version}
-%{_nvidia_libdir}/libGLdispatch.so.0
-%endif
%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
%{_libdir}/libEGL_nvidia.so.0
%{_libdir}/libEGL_nvidia.so.%{version}
@@ -490,9 +427,6 @@ fi ||:
%{_libdir}/libGLESv1_CM_nvidia.so.%{version}
%{_libdir}/libGLESv2_nvidia.so.2
%{_libdir}/libGLESv2_nvidia.so.%{version}
-%if 0%{?rhel}
-%{_libdir}/libGLX_indirect.so.0
-%endif
%{_libdir}/libGLX_nvidia.so.0
%{_libdir}/libGLX_nvidia.so.%{version}
%ifarch x86_64
5 years, 7 months
[xorg-x11-drv-nvidia] remove epel6 support for package requires
by Leigh Scott
commit f1894ad9efb8d296a4d1855b3f1e759d66c2f4c5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 29 13:26:08 2018 +0100
remove epel6 support for package requires
xorg-x11-drv-nvidia.spec | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 01014c4..afaae4d 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -46,21 +46,16 @@ Source14: nvidia-fallback.service
ExclusiveArch: x86_64 i686
-%if 0%{?rhel} > 6 || 0%{?fedora}
Buildrequires: systemd
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
-%endif
-%if 0%{?fedora} >= 25
+# Xorg with PrimaryGPU
+Requires: Xorg >= 1.19.0-3
+%if 0%{?fedora}
# 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
@@ -84,17 +79,9 @@ 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.*)$
%global __requires_exclude ^(lib.*GL.*\\.so.*)$
-%else
-%{?filter_setup:
-%filter_from_provides /^lib.*GL.*\.so/d;
-%filter_from_requires /^lib.*GL.*\.so/d;
-%filter_setup
-}
-%endif
%description
This package provides the most recent NVIDIA display driver which allows for
@@ -165,7 +152,6 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
Requires: libvdpau%{?_isa} >= 0.5
-%if 0%{?fedora} >= 25
Requires: libglvnd-egl%{?_isa} >= 0.2
Requires: libglvnd-gles%{?_isa} >= 0.2
Requires: libglvnd-glx%{?_isa} >= 0.2
@@ -174,12 +160,15 @@ 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
+%if 0%{?fedora}
+Requires: vulkan-loader
%ifarch x86_64
# Boolean dependencies are only fedora
Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
+%else
+Requires: vulkan-filesystem
%endif
%endif
-Requires: vulkan-loader
%description libs
This package provides the shared libraries for %{name}.
5 years, 7 months
[xorg-x11-drv-nvidia] remove epel6 support for dracut
by Leigh Scott
commit 2b82668ff4734bd6cd77685734d49beaae32cf90
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 29 13:13:16 2018 +0100
remove epel6 support for dracut
xorg-x11-drv-nvidia.spec | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 0f9eb25..01014c4 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.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
+%if 0%{?rhel} >= 7
%global _dracutopts nouveau.modeset=0 rd.driver.blacklist=nouveau
%else #fedora
-%if 0%{?fedora} >= 27
%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
%endif
%global debug_package %{nil}
@@ -401,9 +387,7 @@ fi
%post
if [ "$1" -eq "1" ]; then
%{_grubby} --remove-args='nomodeset' --args='%{_dracutopts}' &>/dev/null
-%if 0%{?fedora} || 0%{?rhel} >= 7
sed -i -e 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="%{_dracutopts} /g' /etc/default/grub
-%endif
# Until mutter enable egl stream support, we need to disable gdm wayland
# https://bugzilla.redhat.com/1462052
%if 0%{?fedora}
@@ -413,7 +397,6 @@ if [ "$1" -eq "1" ]; then
%endif
fi || :
-%if 0%{?fedora} || 0%{?rhel} >= 7
%triggerun -- xorg-x11-drv-nvidia < 3:384.59-5
if [ -f %{_sysconfdir}/default/grub ] ; then
sed -i -e '/GRUB_GFXPAYLOAD_LINUX=text/d' %{_sysconfdir}/default/grub
@@ -431,7 +414,6 @@ if [ -f %{_sysconfdir}/default/grub ] ; then
fi
fi
%{_grubby} --args='%{_dracutopts}' &>/dev/null || :
-%endif
%ldconfig_scriptlets libs
%ldconfig_scriptlets cuda-libs
@@ -439,9 +421,7 @@ fi
%preun
if [ "$1" -eq "0" ]; then
%{_grubby} --remove-args='%{_dracutopts}' &>/dev/null
-%if 0%{?fedora} || 0%{?rhel} >= 7
sed -i -e 's/%{_dracutopts} //g' /etc/default/grub
-%endif
# 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
fi ||:
5 years, 7 months
[stella/f29] (3 commits) ...BR gcc-c++
by Sérgio M. Basto
Summary of changes:
10616f4... Update to 5.1.3 (*)
26cde66... Fix build (*)
a5138b1... BR gcc-c++ (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 7 months
[stella] BR gcc-c++
by Sérgio M. Basto
commit a5138b17139d403d9ba8d0aeb718f9377ce3e725
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Aug 29 02:12:01 2018 +0100
BR gcc-c++
stella.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/stella.spec b/stella.spec
index 38b2402..b81af38 100644
--- a/stella.spec
+++ b/stella.spec
@@ -11,6 +11,7 @@ Source0: https://github.com/stella-emu/%{name}/releases/download/%{versio
#ExcludeArch: %{power64}
+BuildRequires: gcc-c++
BuildRequires: libpng-devel zlib-devel bison SDL2-devel
BuildRequires: desktop-file-utils
Requires: hicolor-icon-theme
@@ -82,6 +83,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Wed Aug 29 2018 Sérgio Basto <sergio(a)serjux.com> - 5.1.3-1
- Update to 5.1.3
+- BR gcc-c++
* Sun Aug 19 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 5.1.1-3
- Rebuilt for Fedora 29 Mass Rebuild binutils issue
5 years, 7 months
