[xorg-x11-drv-nvidia-390xx] Initial import (BZ#5030).
by Richard Shaw
commit 69a6251397a1461578bb2d96c5a6b90acd909432
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Wed Oct 3 10:56:58 2018 -0500
Initial import (BZ#5030).
.gitignore | 3 +
00-avoid-glamor.conf | 6 +
10-nvidia.rules | 4 +
60-nvidia-uvm.rules | 2 +
60-nvidia.rules | 3 +
99-nvidia-dracut.conf | 3 +
99-nvidia.conf | 7 +
alternate-install-present | 7 +
blacklist-nouveau.conf | 4 +
nvidia-fallback.service | 17 +
nvidia-uvm.conf | 11 +
nvidia.conf | 13 +
parse-readme.py | 61 +++
sources | 3 +
xorg-x11-drv-nvidia-390xx.metainfo.xml | 37 ++
xorg-x11-drv-nvidia-390xx.spec | 821 +++++++++++++++++++++++++++++++++
16 files changed, 1002 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..afd8e46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,3 @@
+/NVIDIA-Linux-armv7l-gnueabihf-390.87.run
+/NVIDIA-Linux-x86-390.87.run
+/NVIDIA-Linux-x86_64-390.87.run
diff --git a/00-avoid-glamor.conf b/00-avoid-glamor.conf
new file mode 100644
index 0000000..387f50f
--- /dev/null
+++ b/00-avoid-glamor.conf
@@ -0,0 +1,6 @@
+#This file is provided by xorg-x11-drv-nvidia-390xx
+#Do not edit
+
+Section "Module"
+Disable "glamoregl"
+EndSection
diff --git a/10-nvidia.rules b/10-nvidia.rules
new file mode 100644
index 0000000..5b43445
--- /dev/null
+++ b/10-nvidia.rules
@@ -0,0 +1,4 @@
+# RPM Fusion nvidia udev rules
+
+SUBSYSTEM=="pci", ATTRS{vendor}=="0x12d2", ATTRS{class}=="0x030000", TAG+="systemd", ENV{SYSTEMD_WANTS}="nvidia-fallback.service"
+SUBSYSTEM=="pci", ATTRS{vendor}=="0x10de", ATTRS{class}=="0x030[02]00", TAG+="systemd", ENV{SYSTEMD_WANTS}="nvidia-fallback.service"
diff --git a/60-nvidia-uvm.rules b/60-nvidia-uvm.rules
new file mode 100644
index 0000000..8f42f89
--- /dev/null
+++ b/60-nvidia-uvm.rules
@@ -0,0 +1,2 @@
+KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'"
+KERNEL=="nvidia_uvm", RUN+="/usr/bin/bash -c '/usr/bin/mknod -m 666 /dev/nvidia-uvm-tools c $(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'"
diff --git a/60-nvidia.rules b/60-nvidia.rules
new file mode 100644
index 0000000..429e532
--- /dev/null
+++ b/60-nvidia.rules
@@ -0,0 +1,3 @@
+KERNEL=="nvidia", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidiactl c 195 255'"
+KERNEL=="nvidia", RUN+="/usr/bin/bash -c 'for i in $(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do /usr/bin/mknod -Z -m 666 /dev/nvidia${i} c 195 ${i}; done'"
+KERNEL=="nvidia_modeset", RUN+="/usr/bin/bash -c '/usr/bin/mknod -Z -m 666 /dev/nvidia-modeset c 195 254'"
diff --git a/99-nvidia-dracut.conf b/99-nvidia-dracut.conf
new file mode 100644
index 0000000..e5b4fdb
--- /dev/null
+++ b/99-nvidia-dracut.conf
@@ -0,0 +1,3 @@
+# Omit the nvidia driver from the ramdisk, to avoid needing to regenerate
+# the ramdisk on updates.
+omit_drivers+=" nvidia nvidia-drm nvidia-modeset nvidia-uvm "
diff --git a/99-nvidia.conf b/99-nvidia.conf
new file mode 100644
index 0000000..b05303f
--- /dev/null
+++ b/99-nvidia.conf
@@ -0,0 +1,7 @@
+#This file is provided by xorg-x11-drv-nvidia-390xx
+#Do not edit
+
+Section "Files"
+ ModulePath "@LIBDIR@/nvidia-390xx/xorg"
+ ModulePath "@LIBDIR@/xorg/modules"
+EndSection
diff --git a/alternate-install-present b/alternate-install-present
new file mode 100644
index 0000000..d72cb6a
--- /dev/null
+++ b/alternate-install-present
@@ -0,0 +1,7 @@
+This file is provided by RPM Fusion project
+Please look for documentation at http://rpmfusion.org/Howto/NVIDIA
+
+To uninstall the package, use the following command:
+
+$ sudo yum remove xorg-x11-drv-nvidia-390xx\* kmod-nvidia-390xx\*
+
diff --git a/blacklist-nouveau.conf b/blacklist-nouveau.conf
new file mode 100644
index 0000000..66f22ab
--- /dev/null
+++ b/blacklist-nouveau.conf
@@ -0,0 +1,4 @@
+# RPM Fusion blacklist for nouveau driver - you need to run as root:
+# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
+# if nouveau is loaded despite this file.
+blacklist nouveau
diff --git a/nvidia-fallback.service b/nvidia-fallback.service
new file mode 100644
index 0000000..38a598c
--- /dev/null
+++ b/nvidia-fallback.service
@@ -0,0 +1,17 @@
+[Unit]
+Description=Fallback to nouveau as nvidia did not load
+After=akmods.service
+Before=display-manager.service
+ConditionKernelCommandLine=rd.driver.blacklist=nouveau
+ConditionPathExists=!/sys/module/nvidia
+
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=-/sbin/modprobe nouveau
+ExecStartPost=-/bin/plymouth message --text="NVIDIA kernel module missing. Falling back to nouveau"
+
+
+[Install]
+WantedBy=graphical.target
diff --git a/nvidia-uvm.conf b/nvidia-uvm.conf
new file mode 100644
index 0000000..9dd2b43
--- /dev/null
+++ b/nvidia-uvm.conf
@@ -0,0 +1,11 @@
+# Make a soft dependency for nvidia-uvm as adding the module loading to
+# /usr/lib/modules-load.d/nvidia-uvm.conf for systemd consumption, makes the
+# configuration file to be added to the initrd but not the module, throwing an
+# error on plymouth about not being able to find the module.
+# Ref: /usr/lib/dracut/modules.d/00systemd/module-setup.sh
+
+# Even adding the module is not the correct thing, as we don't want it to be
+# included in the initrd, so use this configuration file to specify the
+# dependency.
+
+softdep nvidia post: nvidia-uvm
diff --git a/nvidia.conf b/nvidia.conf
new file mode 100644
index 0000000..965a7b4
--- /dev/null
+++ b/nvidia.conf
@@ -0,0 +1,13 @@
+#This file is provided by xorg-x11-drv-nvidia
+#Do not edit
+
+Section "OutputClass"
+ Identifier "nvidia"
+ MatchDriver "nvidia-drm"
+ Driver "nvidia"
+ Option "AllowEmptyInitialConfiguration"
+ Option "PrimaryGPU" "yes"
+ Option "SLI" "Auto"
+ Option "BaseMosaic" "on"
+ ModulePath "@LIBDIR@/nvidia-390xx/xorg"
+EndSection
diff --git a/parse-readme.py b/parse-readme.py
new file mode 100755
index 0000000..b2fa2ba
--- /dev/null
+++ b/parse-readme.py
@@ -0,0 +1,61 @@
+#!/usr/bin/python2
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2016 Richard Hughes <richard(a)hughsie.com>
+# 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/sources b/sources
index e69de29..34216ea 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,3 @@
+4a31ba7d32f475504c5d7a8d2f138ecf NVIDIA-Linux-armv7l-gnueabihf-390.87.run
+c21fd1e9048d3cf12552a9e9035df3cf NVIDIA-Linux-x86-390.87.run
+35c36552e252a18297d6e1b976ef247c NVIDIA-Linux-x86_64-390.87.run
diff --git a/xorg-x11-drv-nvidia-390xx.metainfo.xml b/xorg-x11-drv-nvidia-390xx.metainfo.xml
new file mode 100644
index 0000000..a7d01f0
--- /dev/null
+++ b/xorg-x11-drv-nvidia-390xx.metainfo.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2016 Richard Hughes <richard(a)hughsie.com> -->
+<component type="driver">
+ <id>xorg-x11-drv-nvidia-390xx</id>
+ <name>NVIDIA Linux Graphics Driver</name>
+ <summary>Accelerated Linux Graphics Driver</summary>
+ <description>
+ <p>
+ 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.
+ </p>
+ <p>
+ 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.
+ </p>
+ </description>
+ <translation/>
+ <url type="homepage">http://www.nvidia.com/</url>
+ <icon type="local" width="128" height="128">/usr/share/pixmaps/xorg-x11-drv-nvidia.png</icon>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license>LicenseRef-proprietary:NVIDIA</project_license>
+ <developer_name>NVIDIA Corporation</developer_name>
+ <keywords>
+ <keyword>NVIDIA</keyword>
+ <keyword>driver</keyword>
+ <keyword>GeForce</keyword>
+ <keyword>CUDA</keyword>
+ <keyword>Quadro</keyword>
+ <keyword>Vulkan</keyword>
+ <keyword>OpenGL</keyword>
+ </keywords>
+ <url type="bugtracker">https://bugzilla.rpmfusion.org</url>
+ <update_contact>xorg-x11-drv-nvidia-390xx-owner(a)rpmfusion.org</update_contact>
+</component>
diff --git a/xorg-x11-drv-nvidia-390xx.spec b/xorg-x11-drv-nvidia-390xx.spec
new file mode 100644
index 0000000..1676b34
--- /dev/null
+++ b/xorg-x11-drv-nvidia-390xx.spec
@@ -0,0 +1,821 @@
+%global _nvidia_serie nvidia-390xx
+%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
+%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
+%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}
+%global __strip /bin/true
+
+
+Name: xorg-x11-drv-nvidia-390xx
+Epoch: 3
+Version: 390.87
+Release: 1%{?dist}
+Summary: NVIDIA's 390xx series 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/%{version}/NVIDIA-Linux-x86...
+Source1: https://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-...
+Source2: https://download.nvidia.com/XFree86/Linux-32bit-ARM/%{version}/NVIDIA-Lin...
+
+Source4: 99-nvidia.conf
+Source5: 00-avoid-glamor.conf
+Source6: blacklist-nouveau.conf
+Source7: alternate-install-present
+Source10: nvidia.conf
+Source11: 60-nvidia.rules
+Source12: xorg-x11-drv-nvidia-390xx.metainfo.xml
+Source13: parse-readme.py
+Source14: 60-nvidia-uvm.rules
+Source15: nvidia-uvm.conf
+Source16: 99-nvidia-dracut.conf
+Source20: 10-nvidia.rules
+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}
+# 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
+Requires(postun): ldconfig
+Requires(post): grubby
+Requires: which
+#Requires: nvidia-settings%{?_isa} = %{version}
+#if 0%{?fedora}
+#Suggests: nvidia-xconfig%{?_isa} = %{version}
+#else
+#Requires: nvidia-xconfig%{?_isa} = %{version}
+#endif
+
+Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
+Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+
+Obsoletes: xorg-x11-drv-nvidia < %{?epoch}:%{version}
+Provides: xorg-x11-drv-nvidia = %{?epoch}:%{version}
+Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version}
+Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version}
+Conflicts: xorg-x11-drv-nvidia-304xx
+Conflicts: xorg-x11-drv-nvidia-340xx
+
+%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 legacy NVIDIA display driver which allows
+for hardware accelerated rendering with the following NVIDIA chipsets:
+- GeForce 600(M)
+- GeForce 700(M) series
+
+For the full product support list, please consult the release notes
+http://download.nvidia.com/XFree86/Linux-x86/%{version}/README/index.html
+
+Please use the following documentation:
+http://rpmfusion.org/Howto/NVIDIA
+
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+
+#Don't put an epoch here
+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,
+such as OpenGL headers.
+
+%package cuda
+Summary: CUDA driver for %{name}
+Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
+Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
+Requires: nvidia-persistenced%{?_isa} = %{version}
+%if 0%{?fedora}
+#Suggests: nvidia-modprobe%{?_isa} = %{version}
+# Boolean dependencies are only fedora
+%ifarch x86_64
+Requires: (%{name}-cuda-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
+%endif
+#else
+#Requires: nvidia-modprobe%{?_isa} = %{version}
+%endif
+Requires: ocl-icd%{?_isa}
+Requires: opencl-filesystem
+
+Conflicts: xorg-x11-drv-nvidia-340xx-cuda
+
+#Don't put an epoch here
+Provides: cuda-drivers = %{version}-100
+Provides: cuda-drivers%{?_isa} = %{version}-100
+Provides: nvidia-driver = %{version}-100
+Provides: nvidia-driver%{?_isa} = %{version}-100
+
+%description cuda
+This package provides the CUDA driver.
+
+%package cuda-libs
+Summary: CUDA libraries for %{name}
+
+%description cuda-libs
+This package provides the CUDA driver libraries.
+
+%package kmodsrc
+Summary: %{name} kernel module source code
+
+%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}
+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
+Requires: libglvnd-opengl%{?_isa} >= 0.2
+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
+# Boolean dependencies are only fedora
+%ifarch x86_64
+Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
+%endif
+%endif
+%ifarch x86_64 i686
+Requires: vulkan-filesystem
+%endif
+
+%description libs
+This package provides the shared libraries for %{name}.
+
+
+%prep
+%setup -q -c -T
+#Only extract the needed arch
+%ifarch %{ix86}
+sh %{SOURCE0} \
+%endif
+%ifarch x86_64
+sh %{SOURCE1} \
+%endif
+%ifarch armv7hl
+sh %{SOURCE2} \
+%endif
+ --extract-only --target nvidiapkg-%{_target_cpu}
+ln -s nvidiapkg-%{_target_cpu} nvidiapkg
+
+
+%build
+# Nothing to build
+echo "Nothing to build"
+
+
+%install
+cd nvidiapkg
+
+# Install only required libraries
+mkdir -p %{buildroot}%{_libdir}
+cp -a \
+ libcuda.so.%{version} \
+ libEGL_nvidia.so.%{version} \
+ libGLESv1_CM_nvidia.so.%{version} \
+ libGLESv2_nvidia.so.%{version} \
+ libGLX_nvidia.so.%{version} \
+ libnvcuvid.so.%{version} \
+ libnvidia-cfg.so.%{version} \
+ libnvidia-eglcore.so.%{version} \
+ libnvidia-encode.so.%{version} \
+ libnvidia-fatbinaryloader.so.%{version} \
+ libnvidia-fbc.so.%{version} \
+ libnvidia-glcore.so.%{version} \
+ libnvidia-glsi.so.%{version} \
+ libnvidia-ifr.so.%{version} \
+ libnvidia-ml.so.%{version} \
+ libnvidia-ptxjitcompiler.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 the correct TLS implementation for x86_64/i686, already ok on ARM
+# OpenCL is only available on x86_64/i686.
+%ifarch x86_64 i686
+cp -af \
+ tls/libnvidia-tls.so* \
+ libnvidia-compiler.so.%{version} \
+ libnvidia-opencl.so.%{version} \
+ %{buildroot}%{_libdir}/
+%else
+cp -af libnvidia-tls.so* %{buildroot}%{_libdir}/
+%endif
+
+# Use ldconfig for libraries with a mismatching SONAME/filename
+ldconfig -vn %{buildroot}%{_libdir}/
+
+# Libraries you can link against
+for lib in libcuda libnvcuvid libnvidia-encode; do
+ ln -sf $lib.so.%{version} %{buildroot}%{_libdir}/$lib.so
+done
+
+# Vdpau driver
+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
+
+# X DDX driver and GLX extension
+install -p -D -m 0755 libglx.so.%{version} %{buildroot}%{_nvidia_xorgdir}/libglx.so.%{version}
+ln -sf libglx.so.%{version} %{buildroot}%{_nvidia_xorgdir}/libglx.so
+install -D -p -m 0755 nvidia_drv.so %{buildroot}%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+
+%ifarch x86_64 i686
+# OpenCL config
+install -m 0755 -d %{buildroot}%{_sysconfdir}/OpenCL/vendors/
+install -p -m 0644 nvidia.icd %{buildroot}%{_sysconfdir}/OpenCL/vendors/
+# Vulkan config
+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
+%endif
+
+# EGL config for libglvnd
+install -m 0755 -d %{buildroot}%{_datadir}/glvnd/egl_vendor.d/
+install -p -m 0644 10_nvidia.json %{buildroot}%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
+
+# Blacklist nouveau, autoload nvidia-uvm module after nvidia module
+mkdir -p %{buildroot}%{_modprobe_d}
+install -p -m 0644 %{SOURCE15} %{buildroot}%{_modprobe_d}
+%if 0%{?rhel} && 0%{?rhel} < 8
+install -p -m 0644 %{SOURCE6} %{buildroot}%{_modprobe_d}
+%endif
+
+# UDev rules for nvidia
+install -m 0755 -d %{buildroot}%{_udevrulesdir}
+install -p -m 0644 %{SOURCE11} %{buildroot}%{_udevrulesdir}
+
+# UDev rules for nvidia-uvm
+install -p -m 0644 %{SOURCE14} %{buildroot}%{_udevrulesdir}
+
+# dracut.conf.d file, nvidia modules must never be in the initrd
+install -p -m 0755 -d %{buildroot}%{_dracut_conf_d}/
+install -p -m 0644 %{SOURCE16} %{buildroot}%{_dracut_conf_d}/
+
+# Install binaries
+install -m 0755 -d %{buildroot}%{_bindir}
+install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server} \
+ %{buildroot}%{_bindir}
+
+# Install headers
+install -m 0755 -d %{buildroot}%{_includedir}/nvidia/GL/
+install -p -m 0644 {gl.h,glext.h,glx.h,glxext.h} %{buildroot}%{_includedir}/nvidia/GL/
+
+# Install man pages
+install -m 0755 -d %{buildroot}%{_mandir}/man1/
+install -p -m 0644 nvidia-{cuda-mps-control,smi}.1.gz \
+ %{buildroot}%{_mandir}/man1/
+
+#Alternate-install-present is checked by the nvidia .run
+mkdir -p %{buildroot}%{_alternate_dir}
+install -p -m 0644 %{SOURCE7} %{buildroot}%{_alternate_dir}
+
+#install the NVIDIA supplied application profiles
+mkdir -p %{buildroot}%{_datadir}/nvidia
+install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation} %{buildroot}%{_datadir}/nvidia
+
+#Install the Xorg configuration files
+mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
+mkdir -p %{buildroot}%{_datadir}/X11/xorg.conf.d
+%if 0%{?fedora} || 0%{?rhel} >= 8
+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
+install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
+touch -r %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d/99-nvidia.conf
+# 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
+#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
+
+#Create the default nvidia config directory
+mkdir -p %{buildroot}%{_sysconfdir}/nvidia
+
+#Install the nvidia kernel modules sources archive
+mkdir -p %{buildroot}%{_datadir}/nvidia-390xx-kmod-%{version}
+tar Jcf %{buildroot}%{_datadir}/nvidia-390xx-kmod-%{version}/nvidia-390xx-kmod-%{version}-%{_target_cpu}.tar.xz kernel
+
+%if 0%{?fedora}
+# install AppData and add modalias provides
+mkdir -p %{buildroot}%{_metainfodir}
+install -pm 0644 %{SOURCE12} %{buildroot}%{_metainfodir}/
+fn=%{buildroot}%{_metainfodir}/xorg-x11-drv-nvidia-390xx.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
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+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 %{SOURCE20} %{buildroot}%{_udevrulesdir}
+install -p -m 0644 %{SOURCE21} %{buildroot}%{_unitdir}
+%endif
+
+
+%pre
+if [ "$1" -eq "1" ]; then
+ if [ -x %{_bindir}/nvidia-uninstall ]; then
+ %{_bindir}/nvidia-uninstall -s && rm -f %{_bindir}/nvidia-uninstall &>/dev/null || :
+ fi
+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}
+ if [ -f %{_sysconfdir}/gdm/custom.conf ] ; then
+ sed -i -e 's/#WaylandEnable=.*/WaylandEnable=false/' %{_sysconfdir}/gdm/custom.conf
+ fi
+%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
+ . %{_sysconfdir}/default/grub
+ if [ -z "${GRUB_CMDLINE_LINUX+x}" ]; then
+ echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub
+ else
+ for i in %{_dracutopts} ; do
+ _has_string=$(echo ${GRUB_CMDLINE_LINUX} | fgrep -c $i)
+ if [ x"$_has_string" = x0 ] ; then
+ GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} ${i}"
+ fi
+ done
+ sed -i -e "s|^GRUB_CMDLINE_LINUX=.*|GRUB_CMDLINE_LINUX=\"${GRUB_CMDLINE_LINUX}\"|g" %{_sysconfdir}/default/grub
+ fi
+fi
+%{_grubby} --args='%{_dracutopts}' &>/dev/null || :
+%endif
+
+%ldconfig_scriptlets libs
+%ldconfig_scriptlets cuda-libs
+
+%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 ||:
+
+
+%files
+%license nvidiapkg/LICENSE
+%doc nvidiapkg/NVIDIA_Changelog
+%doc nvidiapkg/README.txt
+%doc nvidiapkg/nvidia-application-profiles-%{version}-rc
+%doc nvidiapkg/html
+%dir %{_alternate_dir}
+%{_alternate_dir}/alternate-install-present
+%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
+%dir %{_sysconfdir}/nvidia
+%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
+%{_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}
+%{_metainfodir}/%{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
+%{_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}
+%{_nvidia_xorgdir}/libglx.so
+%{_nvidia_xorgdir}/libglx.so.%{version}
+%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+#/no_multilib
+%dir %{_datadir}/nvidia
+%{_datadir}/nvidia/nvidia-application-profiles-%{version}-*
+
+%files kmodsrc
+%dir %{_datadir}/nvidia-390xx-kmod-%{version}
+%{_datadir}/nvidia-390xx-kmod-%{version}/nvidia-390xx-kmod-%{version}-%{_target_cpu}.tar.xz
+
+%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
+%ifarch x86_64 i686
+%{_datadir}/vulkan/icd.d/nvidia_icd.%{_target_cpu}.json
+%endif
+%dir %{_nvidia_libdir}
+%{_libdir}/libEGL_nvidia.so.0
+%{_libdir}/libEGL_nvidia.so.%{version}
+%{_libdir}/libGLESv1_CM_nvidia.so.1
+%{_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}
+%{_libdir}/libnvidia-cfg.so.1
+%{_libdir}/libnvidia-cfg.so.%{version}
+%{_libdir}/libnvidia-eglcore.so.%{version}
+%{_libdir}/libnvidia-fbc.so.1
+%{_libdir}/libnvidia-fbc.so.%{version}
+%{_libdir}/libnvidia-glcore.so.%{version}
+%{_libdir}/libnvidia-glsi.so.%{version}
+%{_libdir}/libnvidia-ifr.so.1
+%{_libdir}/libnvidia-ifr.so.%{version}
+%{_libdir}/libnvidia-tls.so.%{version}
+%{_libdir}/vdpau/libvdpau_nvidia.so.1
+%{_libdir}/vdpau/libvdpau_nvidia.so.%{version}
+
+%files cuda
+%license nvidiapkg/LICENSE
+%{_bindir}/nvidia-debugdump
+%{_bindir}/nvidia-smi
+%{_bindir}/nvidia-cuda-mps-control
+%{_bindir}/nvidia-cuda-mps-server
+%ifarch x86_64 i686
+%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
+%endif
+%{_mandir}/man1/nvidia-smi.*
+%{_mandir}/man1/nvidia-cuda-mps-control.1.*
+%{_modprobe_d}/nvidia-uvm.conf
+%{_udevrulesdir}/60-nvidia-uvm.rules
+
+%files cuda-libs
+%{_libdir}/libcuda.so
+%{_libdir}/libcuda.so.1
+%{_libdir}/libcuda.so.%{version}
+%{_libdir}/libnvcuvid.so.1
+%{_libdir}/libnvcuvid.so.%{version}
+%{_libdir}/libnvidia-encode.so.1
+%{_libdir}/libnvidia-encode.so.%{version}
+%{_libdir}/libnvidia-fatbinaryloader.so.%{version}
+%{_libdir}/libnvidia-ml.so.1
+%{_libdir}/libnvidia-ml.so.%{version}
+%{_libdir}/libnvidia-ptxjitcompiler.so.1
+%{_libdir}/libnvidia-ptxjitcompiler.so.%{version}
+%ifarch x86_64 i686
+%{_libdir}/libnvidia-compiler.so.%{version}
+%{_libdir}/libnvidia-opencl.so.1
+%{_libdir}/libnvidia-opencl.so.%{version}
+%endif
+
+%files devel
+%{_includedir}/nvidia/
+%{_libdir}/libnvcuvid.so
+%{_libdir}/libnvidia-encode.so
+
+%changelog
+* Sun Sep 23 2018 Richard Shaw <hobbes1069(a)gmail.com> - 3:390.87-1
+- Update to 390.87.
+
+* Tue Jun 05 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3:390.67-1
+- Update to 390.67
+- Improvements for el
+- Fork to 390xx
+
+* Wed May 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.59-1
+- Update to 390.59 release
+
+* Mon Apr 09 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3:390.48-2
+- Add icon to be used by appdata
+- Add cuda-libs(x86-32) if libGL(x86-32) is present
+- Remove any desktop file from the driver
+
+* Wed Mar 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.48-1
+- Update to 390.48 release
+
+* Mon Mar 19 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3:390.42-2
+- Disable since we rely on OutputClass here
+- Use PrimaryGPU feature since Xorg >= 1.19
+- Use ldconfig_scriptlets macro
+- Disable uneeded ldconfig call from main
+- Disable wayland if gdm is available - See rhbz#1462052
+- Fixup removed f24 support
+- Fixup urls
+
+* Tue Mar 13 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.42-1
+- Update to 390.42 release
+
+* Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 3:390.25-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Feb 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.25-4
+- mesa-libGL provides libGLX_indirect.so.0 on fedora
+
+* Thu Feb 15 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.25-3
+- Bump epoch to prevent cuda repo from replacing -kmodsrc
+
+* Fri Feb 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:390.25-2
+- Fix omitting drivers from the initrd.
+
+* Mon Jan 29 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:390.25-1
+- Update to 390.25 release
+
+* Wed Jan 10 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 2:390.12-1
+- Update to 390.12 beta
+
+* Sat Dec 16 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:387.34-2
+- Add plymouth advertising for nvidia-fallback.service
+
+* Sun Nov 26 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.34-1
+- Update to 387.34 release
+
+* Sun Nov 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.22-3
+- Remove nomodeset from cmdline during install
+
+* Tue Oct 31 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.22-2
+- Remove the prebuilt tools and use rpm packages instead
+
+* Mon Oct 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.22-1
+- Update to 387.22 release
+
+* Wed Oct 04 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:387.12-1
+- Update to 387.12 beta
+
+* Thu Sep 21 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.90-1
+- Update to 384.90 release
+
+* Thu Aug 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.59-5
+- Enable modeset by default for F27+
+- Ensure the correct selinux context it set
+
+* Wed Aug 16 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.59-4
+- Use kernel option instead to set modeset for DRM module
+
+* Tue Aug 15 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.59-3
+- Add udev rules so nvidia nodes are created under EGLDevice/wayland
+- Enable modeset for DRM
+
+* Fri Aug 04 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:384.59-2
+- Add nvidia-fallback support
+
+* Tue Jul 25 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.59-1
+- Update to 384.59 release
+
+* Mon Jul 24 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.82-1
+- Update to 375.82 release
+- Fix non-glvnd build
+
+* Mon Jul 10 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-9
+- Fixup for non-glvnd vulkan loader
+
+* Wed Jul 05 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-8
+- Make libglvnd optional on rhel
+- Use boolean dependency on fedora 25 also
+
+* Tue Jun 13 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-7
+- Use | instead of / for sed GRUB_CMDLINE_LINUX
+
+* Fri Jun 02 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-6
+- Remove GRUB_GFXPAYLOAD_LINUX from default/grub
+
+* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-5
+- Update the triggerin to insert the new cmdline
+- Avoid the nvidia modules to get added to the initramfs - patch by hansg
+
+* Tue May 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-3
+- Revert 10_nvidia.json rename
+
+* 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
+
+* 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.
+
+* 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.
+- Add kernel parameters to default grub file on Fedora/RHEL 7+.
+- Bring default RHEL 6 X.org configuration on par with Fedora/RHEL 7+ and make
+ sure it is installed by default.
+- Install RHEL 6 X.org configuration template only on RHEL 6, make sure it does
+ not end in .conf to avoid confusion.
+- Package only required symlinks for libraries.
+- Add only the libraries that program can link to in the devel subpackage.
+- Make CUDA subpackages multilib compliant (no more CUDA i686 binaries on
+ x86_64).
+- Do not require main packages for libraries subpackages, this makes possible to
+ build things that link to Nvidia drivers using only libraries and not pulling
+ all the graphic driver components.
+- Fix files listed twice during build.
+- Install non conflicting libraries in standard locations, remove all redundant
+ directory overrides for the various distributions. This also removes the link
+ libGLX_indirect.so.0.
+- Explicitly list all libraries included in the packages, avoid too many
+ if/exclude directives.
+- Various fixups from Nicolas Chauvet:
+ * buildroot
+ * glvnd vulkan to use _datadir
+ * Use nvidia_libdir for alternate install file
+ * arm and opencl
+
+* Fri Apr 07 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:381.09-1
+- Update to 381.09 beta
+
+* Tue Mar 14 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:378.13-2
+- Link libGLX_indirect.so.0 to libGLX_mesa.so.0
+
+* Fri Mar 03 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:378.13-1
+- Update to 378.13 release
+
+* Thu Mar 02 2017 Simone Caronni <negativo17(a)gmail.com> - 1:375.39-7
+- Use gtk 2 nvidia-settings library only on RHEL 6 and Fedora ARM.
+
+* Thu Mar 02 2017 Simone Caronni <negativo17(a)gmail.com> - 1:375.39-6
+- Require source built libnvidia-egl-wayland library.
+
+* Thu Mar 02 2017 Simone Caronni <negativo17(a)gmail.com> - 1:375.39-5
+- Use only newer ELF TLS implementation, supported since kernel 2.3.99 (pre RHEL
+ 4).
+
+* Thu Mar 02 2017 Simone Caronni <negativo17(a)gmail.com> - 1:375.39-4
+- Remove OpenCL loader, RPM filters and ownership of loader configuration.
+- Require OpenCL filesystem and loader library.
+
+* Thu Mar 02 2017 Simone Caronni <negativo17(a)gmail.com> - 1:375.39-3
+- Replace SUID nvidia-modprobe binary with configuration. Make sure the
+ nvidia-uvm module is loaded when the CUDA subpackage is installed and that
+ dracut does not try to pull in the module in the initrd.
+- Remove leftovers from old distributions.
+- Remove prelink configuration.
+- Make sure the license is installed both with the base driver package and with
+ the CUDA package.
+- Make sure the package also builds and install on RHEL 6.
+- Enable SLI and BaseMosaic by default on Fedora 25+.
+- Trim changelog (<2015).
+
+* Thu Feb 16 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 1:375.39-2
+- Avoid xorg dir symlink on fedora 25+
+- Drop GFXPAYLOAD and video=vesa:off
+- Implement cuda-libs (for steam)
+
+* 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
+
+* Wed Jan 18 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-10
+- Add conditions for el7 as there is no wayland
+
+* Wed Jan 18 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:375.26-9
+- Add conditions for f24 and el7
+
+* Tue Jan 17 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 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 <leigh123linux(a)googlemail.com> - 1:375.26-7
+- Update nvidia.conf for latest Xorg changes
+
+* Sat Dec 24 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-6
+- Fix error in nvidia.conf rfbz#4388
+
+* Sat Dec 24 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-5
+- Add xorg-x11-server-Xorg minimum version requires
+
+* Mon Dec 19 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-4
+- Add conditionals for f24
+
+* Mon Dec 19 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-3
+- Fix nvidia.conf
+
+* Sun Dec 18 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-2
+- Change conf files for Prime support
+
+* Wed Dec 14 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.26-1
+- Update to 375.26 release
+
+* Fri Nov 18 2016 leigh scott <leigh123linux(a)googlemail.com> - 1:375.20-1
+- Update to 375.20 release
+
6 years, 1 month
[vlc/f29] Update snapshot
by Nicolas Chauvet
Summary of changes:
3a82244... Update snapshot (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[vlc] Update snapshot
by Nicolas Chauvet
commit 3a82244f5fb29cbc632f62e3d2df9bf6f4057b25
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Oct 3 14:54:50 2018 +0200
Update snapshot
sources | 2 +-
vlc.spec | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index 1cf2410..ba10e70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48bc1ebf01f0968e48caf853d9271373 vlc-3.0.5-20180921-0223.tar.xz
+e8ff8fb5d93293dc6c5d947ddd6235a9 vlc-3.0.5-20181003-0222.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 2033a22..731b859 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,6 +1,6 @@
-%global vlc_date 20180921
+%global vlc_date 20181003
#global vlc_rc -rc9
-%global vlc_tag -%{?vlc_date}-0223
+%global vlc_tag -%{?vlc_date}-0222
%if 0%{?vlc_tag:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
@@ -43,7 +43,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.5
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_tag:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -580,6 +580,9 @@ fi || :
%changelog
+* Wed Oct 03 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.5-2
+- Update to 20181003 snapshot
+
* Fri Sep 21 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.5-1
- Update to 3.0.5 snapshot from today
- Enable aom support
6 years, 1 month
[mpv/f28] (3 commits) ...Add BuildRequires: libshaderc-devel
by Leigh Scott
Summary of changes:
c47cd15... remove ffmpeg version check patch and clean up (*)
3cd4e85... Add BuildRequires: gcc (*)
4f43d89... Add BuildRequires: libshaderc-devel (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[mpv] Add BuildRequires: libshaderc-devel
by Leigh Scott
commit 4f43d8990e752d9fdc184db235657ca560da0a88
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Oct 2 18:02:06 2018 +0100
Add BuildRequires: libshaderc-devel
mpv.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/mpv.spec b/mpv.spec
index 26e32e8..a81bfd9 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
Version: 0.29.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://%{name}.io/
@@ -46,6 +46,7 @@ BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(lua-5.1)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(rubberband)
+BuildRequires: libshaderc-devel
BuildRequires: pkgconfig(smbclient)
BuildRequires: pkgconfig(uchardet) >= 0.0.5
BuildRequires: pkgconfig(vdpau)
@@ -151,6 +152,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Tue Oct 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.29.0-3
+- Add BuildRequires: libshaderc-devel
+
* Thu Aug 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.29.0-2
- Add BuildRequires: gcc
6 years, 1 month
[shotcut/f28] Update to 18.10.01
by Martin Gansser
Summary of changes:
64e6c2e... Update to 18.10.01 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[shotcut/f29] Update to 18.10.01
by Martin Gansser
Summary of changes:
64e6c2e... Update to 18.10.01 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[shotcut] Update to 18.10.01
by Martin Gansser
commit 64e6c2e34e2cda93f0befd272ae631177cd449f9
Author: Martin Gansser <mgansser(a)online.de>
Date: Tue Oct 2 15:19:04 2018 +0200
Update to 18.10.01
.gitignore | 1 +
mlt_path.patch | 11 ---------
shotcut-noupdatecheck.patch | 58 +++++++++++++++++++++------------------------
shotcut.spec | 9 ++++---
sources | 2 +-
5 files changed, 35 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83e0837..51d6cf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/shotcut-18.08.11.tar.gz
/shotcut-18.08.14.tar.gz
/shotcut-18.09.16.tar.gz
+/shotcut-18.10.01.tar.gz
diff --git a/shotcut-noupdatecheck.patch b/shotcut-noupdatecheck.patch
index ece9d01..98c6d25 100644
--- a/shotcut-noupdatecheck.patch
+++ b/shotcut-noupdatecheck.patch
@@ -1,39 +1,35 @@
-Index: src/mainwindow.cpp
-===================================================================
---- src/mainwindow.cpp.orig 2018-08-07 12:45:29.676332067 +0200
-+++ src/mainwindow.cpp 2018-08-07 12:49:38.808610634 +0200
-@@ -2650,9 +2650,9 @@
-
- void MainWindow::showUpgradePrompt()
- {
-- QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
-- connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
-- showStatusMessage(action, 15 /* seconds */);
-+ //QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
-+ //connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
-+ //showStatusMessage(action, 15 /* seconds */);
+--- src/mainwindow.cpp.orig 2018-10-02 13:48:27.170388091 +0200
++++ src/mainwindow.cpp 2018-10-02 13:49:59.172328038 +0200
+@@ -2790,9 +2790,9 @@
+ showStatusMessage("Checking for upgrade...");
+ m_network.get(QNetworkRequest(QUrl("http://check.shotcut.org/version.json")));
+ } else {
+- QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
+- connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
+- showStatusMessage(action, 15 /* seconds */);
++ //QAction* action = new QAction(tr("Click here to check for a new version of Shotcut."), 0);
++ //connect(action, SIGNAL(triggered(bool)), SLOT(on_actionUpgrade_triggered()));
++ //showStatusMessage(action, 15 /* seconds */);
+ }
}
- void MainWindow::on_actionRealtime_triggered(bool checked)
-@@ -3204,7 +3204,7 @@
+@@ -3375,7 +3375,7 @@
m_upgradeUrl = json.object().value("url").toString();
- showStatusMessage(action, 10 /* seconds */);
+ showStatusMessage(action, 15 /* seconds */);
} else {
- showStatusMessage(tr("You are running the latest version of Shotcut."));
-+ showStatusMessage(tr("Use dnf for updates."));
++ showStatusMessage(tr("Use dnf for updates."));
}
reply->deleteLater();
return;
-Index: src/src.pro
-===================================================================
---- src/src.pro.orig 2018-08-07 12:50:08.762042822 +0200
-+++ src/src.pro 2018-08-07 12:52:31.858330244 +0200
-@@ -294,7 +294,7 @@
- LIBS += -lCuteLogger
-
- isEmpty(SHOTCUT_VERSION) {
-- !win32:SHOTCUT_VERSION = $$system(date "+%y.%m.%d")
-+ !win32:SHOTCUT_VERSION = $$_VSTRING
- win32:SHOTCUT_VERSION = adhoc
- }
- DEFINES += SHOTCUT_VERSION=\\\"$$SHOTCUT_VERSION\\\"
+--- src/src.pro.orig 2018-10-02 13:52:58.638721580 +0200
++++ src/src.pro 2018-10-02 13:53:27.064761829 +0200
+@@ -300,7 +300,7 @@
+ LIBS += -lCuteLogger
+
+ isEmpty(SHOTCUT_VERSION) {
+- !win32:SHOTCUT_VERSION = $$system(date "+%y.%m.%d")
++ !win32:SHOTCUT_VERSION = $$_VSTRING
+ win32:SHOTCUT_VERSION = adhoc
+ }
+ DEFINES += SHOTCUT_VERSION=\\\"$$SHOTCUT_VERSION\\\"
diff --git a/shotcut.spec b/shotcut.spec
index df4badf..27aa72a 100644
--- a/shotcut.spec
+++ b/shotcut.spec
@@ -3,8 +3,8 @@
%define _vstring %(echo %{version} |tr -d ".")
Name: shotcut
-Version: 18.09.16
-Release: 1%{dist}
+Version: 18.10.01
+Release: 0.1.beta1%{dist}
Summary: A free, open source, cross-platform video editor
# The entire source code is GPLv3+ except mvcp/ which is LGPLv2+
License: GPLv3+ and LGPLv2+
@@ -13,7 +13,7 @@ Source0: https://github.com/mltframework/shotcut/archive/v%{version}.tar.
# https://forum.shotcut.org/t/appdata-xml-file-for-gnome-software-center/2742
Source1: %{name}.appdata.xml
# Melt patch /usr/bin/mlt-melt
-Patch0: mlt_path.patch
+####Patch0: mlt_path.patch
# shotcut-noupdatecheck.patch -- Disable automatic update check
Patch1: shotcut-noupdatecheck.patch
@@ -181,6 +181,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/org.%{na
%doc doc
%changelog
+* Tue Oct 02 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.10.01-1
+- Update to 18.10.01
+
* Tue Oct 02 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.09.16-1
- Update to 18.09.16
diff --git a/sources b/sources
index e6abf10..445cad5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86985903021db929984fd02f08cc4a9b shotcut-18.09.16.tar.gz
+55d33327179ab3531663223cfb45d961 shotcut-18.10.01.tar.gz
6 years, 1 month
[zoneminder/f27] fix merge conflict
by Andrew Bauer
commit a627b2cf4db83f17ebc227ccad2f5faa3c882e16
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Tue Oct 2 08:12:43 2018 -0500
fix merge conflict
sources | 4 ----
1 file changed, 4 deletions(-)
---
diff --git a/sources b/sources
index ee30735..56949e4 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,3 @@
9ac5569ffaf82e4339d97af7fbe0d392 cakephp-enum-behavior-1.0-zm.tar.gz
86ae07e6ee1cd06ee6f608a85a5da808 crud-3.1.0-zm.tar.gz
-<<<<<<< HEAD
-020459b357f66987700a8ab63fd7aeea zoneminder-1.32.0.tar.gz
-=======
7c2a358a1a22b13f0bd5e346eab4b84a zoneminder-1.32.1.tar.gz
->>>>>>> master
6 years, 1 month
