[nvidia-kmod] Drop other arch
by Leigh Scott
commit 60bb4dac081684052ca79a552eb6f59eae6388c8
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri May 4 12:29:21 2018 +0100
Drop other arch
nv-linux-arm.patch | 13 -------------
nv-linux-arm2.patch | 12 ------------
nvidia-kmod.spec | 6 +-----
3 files changed, 1 insertion(+), 30 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 36b18d5..927009b 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -17,11 +17,9 @@ License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
-Patch0: nv-linux-arm.patch
-Patch1: nv-linux-arm2.patch
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i686 x86_64 armv7hl
+ExclusiveArch: x86_64
# get the needed BuildRequires (in parts depending on what we build for)
%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-kmodsrc >= %{epoch}:%{version}
@@ -42,8 +40,6 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
-%patch0 -p1
-%patch1 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
5 years, 11 months
[nvidia-kmod] Update to 396.24 release
by Leigh Scott
commit 8254920cdb7635f3e8b4200326848d02182fd5d5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri May 4 12:22:34 2018 +0100
Update to 396.24 release
kernel_4.16.patch | 21 ---------------------
nvidia-kmod.spec | 7 ++++---
2 files changed, 4 insertions(+), 24 deletions(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 4c7c341..36b18d5 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Epoch: 3
-Version: 390.48
+Version: 396.24
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -19,7 +19,6 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
-Patch2: kernel_4.16.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
@@ -45,7 +44,6 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# patch loop
%patch0 -p1
%patch1 -p1
-%patch2 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -73,6 +71,9 @@ done
%changelog
+* Fri May 04 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:396.24-1
+- Update to 396.24 release
+
* Thu Mar 29 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:390.48-1
- Update to 390.48 release
5 years, 11 months
[xorg-x11-drv-nvidia] upload source
by Leigh Scott
commit c60a6594345db75f33a836e1f8976871dbf42f83
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri May 4 12:06:59 2018 +0100
upload source
sources | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/sources b/sources
index 1a32504..5e22472 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-0306547cbb08d6f3d00fa6dc2424c397 NVIDIA-Linux-armv7l-gnueabihf-390.48.run
-754bbdc3eb6f3873cca49ae807964c0e NVIDIA-Linux-x86-390.48.run
-3f7eafdb17a991b52cdfceb33e82ab75 NVIDIA-Linux-x86_64-390.48.run
+7b5c4735a5b7ad3a9d166ca85cc88e17 NVIDIA-Linux-x86_64-396.24.run
5 years, 11 months
[xorg-x11-drv-nvidia] rebase to 396xx pt2
by Leigh Scott
commit 58881a78a10e4729620a97415000de3f8af7adbc
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri May 4 12:01:32 2018 +0100
rebase to 396xx pt2
xorg-x11-drv-nvidia.spec | 138 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 136 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 98d5076..624b2b2 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -1,4 +1,5 @@
%global _nvidia_serie nvidia
+%global _libdir32 %{_prefix}/lib
%global _nvidia_libdir %{_libdir}/%{_nvidia_serie}
%global _nvidia_xorgdir %{_nvidia_libdir}/xorg
# Unfortunately this is always hardcoded regardless of architecture:
@@ -58,7 +59,7 @@ Source12: 99-nvidia-dracut.conf
Source13: 10-nvidia.rules
Source14: nvidia-fallback.service
-ExclusiveArch: x86_64
+ExclusiveArch: x86_64 i686
%if 0%{?rhel} > 6 || 0%{?fedora}
Buildrequires: systemd
@@ -186,15 +187,16 @@ 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
+%ifarch x86_64
# Boolean dependencies are only fedora
Requires: (%{name}-libs(x86-32) = %{?epoch}:%{version}-%{release} if libGL(x86-32))
%endif
+%endif
Requires: vulkan-filesystem
%description libs
This package provides the shared libraries for %{name}.
-
%prep
%setup -q -c -T
sh %{SOURCE0} \
@@ -210,6 +212,7 @@ echo "Nothing to build"
%install
cd nvidiapkg
+%ifarch x86_64
# Install only required libraries
mkdir -p %{buildroot}%{_libdir}
cp -a \
@@ -247,7 +250,74 @@ cp -a \
%{buildroot}%{_nvidia_libdir}/
ldconfig -vn %{buildroot}%{_nvidia_libdir}/
%endif
+%endif
+
+%ifarch i686
+# Install the 32bit libraries
+mkdir -p %{buildroot}%{_libdir32} %{buildroot}%{_alternate_dir}
+pushd 32
+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-eglcore.so.%{version} \
+ libnvidia-encode.so.%{version} \
+ libnvidia-fatbinaryloader.so.%{version} \
+ libnvidia-fbc.so.%{version} \
+ libnvidia-glcore.so.%{version} \
+ libnvidia-glsi.so.%{version} \
+ libnvidia-glvkspirv.so.%{version} \
+ libnvidia-ifr.so.%{version} \
+ libnvidia-ml.so.%{version} \
+ libnvidia-ptxjitcompiler.so.%{version} \
+ %{buildroot}%{_libdir32}/
+
+cp -af \
+ tls/libnvidia-tls.so* \
+ libnvidia-compiler.so.%{version} \
+ libnvidia-opencl.so.%{version} \
+ %{buildroot}%{_libdir32}/
+
+%if 0%{?rhel} && 0%{?rhel} < 8
+mkdir -p %{buildroot}%{_alternate_dir}
+cp -a \
+ libEGL.so.%{version} \
+ libGL.so.%{version} \
+ libGLdispatch.so.0 \
+ %{buildroot}%{_alternate_dir}/
+ldconfig -vn %{buildroot}%{_alternate_dir}/
+%endif
+# Use ldconfig for libraries with a mismatching SONAME/filename
+ldconfig -vn %{buildroot}%{_libdir32}/
+# Libraries you can link against
+ln -sf libcuda.so.%{version} %{buildroot}%{_libdir32}/libcuda.so
+# Vdpau driver
+install -D -p -m 0755 libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir32}/vdpau/libvdpau_nvidia.so.%{version}
+ln -sf libvdpau_nvidia.so.%{version} %{buildroot}%{_libdir32}/vdpau/libvdpau_nvidia.so.1
+# GlVND
+%if 0%{?rhel} && 0%{?rhel} < 8
+ln -s libGLX_nvidia.so.%{version} %{buildroot}%{_libdir32}/libGLX_indirect.so.0
+# ld.so.conf.d file
+install -m 0755 -d %{buildroot}%{_sysconfdir}/ld.so.conf.d/
+echo -e "%{_alternate_dir} \n" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/nvidia-lib.conf
+%endif
+# 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.i686.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.i686.json
+touch -r ../nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.i686.json
+%endif
+popd
+# End of 32bit libs
+%endif
+%ifarch x86_64
# Use ldconfig for libraries with a mismatching SONAME/filename
ldconfig -vn %{buildroot}%{_libdir}/
@@ -520,7 +590,47 @@ fi ||:
%{_libdir}/libnvidia-tls.so.%{version}
%{_libdir}/vdpau/libvdpau_nvidia.so.1
%{_libdir}/vdpau/libvdpau_nvidia.so.%{version}
+%endif
+%ifarch i686
+%ldconfig_scriptlets libs
+
+%files libs
+%if 0%{?rhel} && 0%{?rhel} < 8
+%config %{_sysconfdir}/ld.so.conf.d/nvidia-lib.conf
+%{_alternate_dir}/libEGL.so.1
+%{_alternate_dir}/libEGL.so.%{version}
+%{_alternate_dir}/libGL.so.1
+%{_alternate_dir}/libGL.so.%{version}
+%{_alternate_dir}/libGLdispatch.so.0
+%endif
+%{_datadir}/vulkan/icd.d/nvidia_icd.i686.json
+%dir %{_alternate_dir}
+%{_libdir32}/libEGL_nvidia.so.0
+%{_libdir32}/libEGL_nvidia.so.%{version}
+%{_libdir32}/libGLESv1_CM_nvidia.so.1
+%{_libdir32}/libGLESv1_CM_nvidia.so.%{version}
+%{_libdir32}/libGLESv2_nvidia.so.2
+%{_libdir32}/libGLESv2_nvidia.so.%{version}
+%if 0%{?rhel}
+%{_libdir32}/libGLX_indirect.so.0
+%endif
+%{_libdir32}/libGLX_nvidia.so.0
+%{_libdir32}/libGLX_nvidia.so.%{version}
+%{_libdir32}/libnvidia-eglcore.so.%{version}
+%{_libdir32}/libnvidia-fbc.so.1
+%{_libdir32}/libnvidia-fbc.so.%{version}
+%{_libdir32}/libnvidia-glcore.so.%{version}
+%{_libdir32}/libnvidia-glsi.so.%{version}
+%{_libdir32}/libnvidia-glvkspirv.so.%{version}
+%{_libdir32}/libnvidia-ifr.so.1
+%{_libdir32}/libnvidia-ifr.so.%{version}
+%{_libdir32}/libnvidia-tls.so.%{version}
+%{_libdir32}/vdpau/libvdpau_nvidia.so.1
+%{_libdir32}/vdpau/libvdpau_nvidia.so.%{version}
+%endif
+
+%ifarch x86_64
%files cuda
%license nvidiapkg/LICENSE
%{_bindir}/nvidia-debugdump
@@ -549,11 +659,35 @@ fi ||:
%{_libdir}/libnvidia-compiler.so.%{version}
%{_libdir}/libnvidia-opencl.so.1
%{_libdir}/libnvidia-opencl.so.%{version}
+%endif
+
+%ifarch i686
+%ldconfig_scriptlets cuda-libs
+%files cuda-libs
+%{_libdir32}/libcuda.so
+%{_libdir32}/libcuda.so.1
+%{_libdir32}/libcuda.so.%{version}
+%{_libdir32}/libnvcuvid.so.1
+%{_libdir32}/libnvcuvid.so.%{version}
+%{_libdir32}/libnvidia-encode.so.1
+%{_libdir32}/libnvidia-encode.so.%{version}
+%{_libdir32}/libnvidia-fatbinaryloader.so.%{version}
+%{_libdir32}/libnvidia-ml.so.1
+%{_libdir32}/libnvidia-ml.so.%{version}
+%{_libdir32}/libnvidia-ptxjitcompiler.so.1
+%{_libdir32}/libnvidia-ptxjitcompiler.so.%{version}
+%{_libdir32}/libnvidia-compiler.so.%{version}
+%{_libdir32}/libnvidia-opencl.so.1
+%{_libdir32}/libnvidia-opencl.so.%{version}
+%endif
+
+%ifarch x86_64
%files devel
%{_includedir}/nvidia/
%{_libdir}/libnvcuvid.so
%{_libdir}/libnvidia-encode.so
+%endif
%changelog
* Fri May 04 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:396.24-1
5 years, 11 months
[xorg-x11-drv-nvidia] clean up and add new lib
by Leigh Scott
commit 367a40b58736a79b66ac4118cc36dcab971814de
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri May 4 09:49:04 2018 +0100
clean up and add new lib
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 1eb4e20..98d5076 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -48,10 +48,10 @@ Source2: 99-nvidia.conf
Source3: 00-avoid-glamor.conf
Source4: blacklist-nouveau.conf
Source5: alternate-install-present
-Source6: nvidia.conf
-Source7: 60-nvidia.rules
-Source8: xorg-x11-drv-nvidia.metainfo.xml
-Source9: parse-readme.py
+Source6: nvidia.conf
+Source7: 60-nvidia.rules
+Source8: xorg-x11-drv-nvidia.metainfo.xml
+Source9: parse-readme.py
Source10: 60-nvidia-uvm.rules
Source11: nvidia-uvm.conf
Source12: 99-nvidia-dracut.conf
@@ -226,6 +226,7 @@ cp -a \
libnvidia-fbc.so.%{version} \
libnvidia-glcore.so.%{version} \
libnvidia-glsi.so.%{version} \
+ libnvidia-glvkspirv.so.%{version} \
libnvidia-ifr.so.%{version} \
libnvidia-ml.so.%{version} \
libnvidia-ptxjitcompiler.so.%{version} \
@@ -513,6 +514,7 @@ fi ||:
%{_libdir}/libnvidia-fbc.so.%{version}
%{_libdir}/libnvidia-glcore.so.%{version}
%{_libdir}/libnvidia-glsi.so.%{version}
+%{_libdir}/libnvidia-glvkspirv.so.%{version}
%{_libdir}/libnvidia-ifr.so.1
%{_libdir}/libnvidia-ifr.so.%{version}
%{_libdir}/libnvidia-tls.so.%{version}
5 years, 11 months
[xorg-x11-drv-nvidia] rebase to 396xx pt1
by Leigh Scott
commit 7208af05e29f98005b5e671a2b815bd0a3d93260
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri May 4 09:43:23 2018 +0100
rebase to 396xx pt1
xorg-x11-drv-nvidia.spec | 136 +++++++++++++++++++----------------------------
1 file changed, 54 insertions(+), 82 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index a72a10f..1eb4e20 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -36,31 +36,29 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
-Version: 390.48
-Release: 2%{?dist}
+Version: 396.24
+Release: 1%{?dist}
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/%{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.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
+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
+Source8: xorg-x11-drv-nvidia.metainfo.xml
+Source9: parse-readme.py
+Source10: 60-nvidia-uvm.rules
+Source11: nvidia-uvm.conf
+Source12: 99-nvidia-dracut.conf
+Source13: 10-nvidia.rules
+Source14: nvidia-fallback.service
+
+ExclusiveArch: x86_64
%if 0%{?rhel} > 6 || 0%{?fedora}
Buildrequires: systemd
@@ -145,9 +143,7 @@ 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
@@ -191,13 +187,9 @@ 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}.
@@ -205,18 +197,9 @@ 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
+ --extract-only --target nvidiapkg-x86_64
+ln -s nvidiapkg-x86_64 nvidiapkg
%build
@@ -248,6 +231,12 @@ cp -a \
libnvidia-ptxjitcompiler.so.%{version} \
%{buildroot}%{_libdir}/
+cp -af \
+ tls/libnvidia-tls.so* \
+ libnvidia-compiler.so.%{version} \
+ libnvidia-opencl.so.%{version} \
+ %{buildroot}%{_libdir}/
+
%if 0%{?rhel} && 0%{?rhel} < 8
mkdir -p %{buildroot}%{_nvidia_libdir}
cp -a \
@@ -258,18 +247,6 @@ cp -a \
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}/
@@ -295,19 +272,17 @@ install -p -D -m 0755 libglx.so.%{version} %{buildroot}%{_nvidia_xorgdir}/libglx
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
+install -p -m 0644 nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.x86_64.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
+sed -i -e 's|libGLX_nvidia.so.0|libGL.so.1|' %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.x86_64.json
+touch -r nvidia_icd.json.template %{buildroot}%{_datadir}/vulkan/icd.d/nvidia_icd.x86_64.json
%endif
# EGL config for libglvnd
@@ -316,21 +291,21 @@ 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 %{SOURCE15} %{buildroot}%{_modprobe_d}
+install -p -m 0644 %{SOURCE11} %{buildroot}%{_modprobe_d}
%if 0%{?rhel} && 0%{?rhel} < 8
-install -p -m 0644 %{SOURCE6} %{buildroot}%{_modprobe_d}
+install -p -m 0644 %{SOURCE4} %{buildroot}%{_modprobe_d}
%endif
# UDev rules for nvidia
install -m 0755 -d %{buildroot}%{_udevrulesdir}
-install -p -m 0644 %{SOURCE11} %{buildroot}%{_udevrulesdir}
+install -p -m 0644 %{SOURCE7} %{buildroot}%{_udevrulesdir}
# UDev rules for nvidia-uvm
-install -p -m 0644 %{SOURCE14} %{buildroot}%{_udevrulesdir}
+install -p -m 0644 %{SOURCE10} %{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 -p -m 0644 %{SOURCE12} %{buildroot}%{_dracut_conf_d}/
# Install binaries
install -m 0755 -d %{buildroot}%{_bindir}
@@ -348,7 +323,7 @@ install -p -m 0644 nvidia-{cuda-mps-control,smi}.1.gz \
#Alternate-install-present is checked by the nvidia .run
mkdir -p %{buildroot}%{_alternate_dir}
-install -p -m 0644 %{SOURCE7} %{buildroot}%{_alternate_dir}
+install -p -m 0644 %{SOURCE5} %{buildroot}%{_alternate_dir}
#install the NVIDIA supplied application profiles
mkdir -p %{buildroot}%{_datadir}/nvidia
@@ -358,15 +333,15 @@ install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation}
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 %{SOURCE10} %{buildroot}%{_datadir}/X11/xorg.conf.d/nvidia.conf
+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 %{SOURCE10} %{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 %{SOURCE4} %{buildroot}%{_datadir}/X11/xorg.conf.d
-install -pm 0644 %{SOURCE5} %{buildroot}%{_datadir}/X11/xorg.conf.d
+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 %{SOURCE4} %{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
@@ -378,17 +353,17 @@ mkdir -p %{buildroot}%{_sysconfdir}/nvidia
#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
+tar Jcf %{buildroot}%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-x86_64.tar.xz kernel
%if 0%{?fedora} >= 25
# install AppData and add modalias provides
mkdir -p %{buildroot}%{_datadir}/appdata/
-install -pm 0644 %{SOURCE12} %{buildroot}%{_datadir}/appdata/
+install -pm 0644 %{SOURCE8} %{buildroot}%{_datadir}/appdata/
fn=%{buildroot}%{_datadir}/appdata/xorg-x11-drv-nvidia.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
+%{SOURCE9} README.txt "NVIDIA GEFORCE GPUS" | xargs appstream-util add-provide ${fn} modalias
+%{SOURCE9} README.txt "NVIDIA QUADRO GPUS" | xargs appstream-util add-provide ${fn} modalias
+%{SOURCE9} README.txt "NVIDIA NVS GPUS" | xargs appstream-util add-provide ${fn} modalias
+%{SOURCE9} 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
@@ -396,8 +371,8 @@ install -pm 0644 nvidia-settings.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
# 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}
+install -p -m 0644 %{SOURCE13} %{buildroot}%{_udevrulesdir}
+install -p -m 0644 %{SOURCE14} %{buildroot}%{_unitdir}
%endif
@@ -507,7 +482,7 @@ fi ||:
%files kmodsrc
%dir %{_datadir}/nvidia-kmod-%{version}
-%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz
+%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-x86_64.tar.xz
%files libs
%if 0%{?rhel} && 0%{?rhel} < 8
@@ -518,9 +493,7 @@ fi ||:
%{_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
+%{_datadir}/vulkan/icd.d/nvidia_icd.x86_64.json
%dir %{_nvidia_libdir}
%{_libdir}/libEGL_nvidia.so.0
%{_libdir}/libEGL_nvidia.so.%{version}
@@ -552,9 +525,7 @@ fi ||:
%{_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
@@ -573,11 +544,9 @@ fi ||:
%{_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/
@@ -585,6 +554,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Fri May 04 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:396.24-1
+- Update to 396.24 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
5 years, 11 months
[kodi] Fix assert on startup
by Michael Cronenworth
commit d39f324e551fea1c2c9d148929ea509ddf11a604
Author: Michael Cronenworth <mike(a)cchtml.com>
Date: Thu May 3 23:21:50 2018 -0500
Fix assert on startup
kodi-18a1-assert.patch | 26 ++++++++++++++++++++++++++
kodi.spec | 42 +++++++++++++++++++++++++++++-------------
2 files changed, 55 insertions(+), 13 deletions(-)
---
diff --git a/kodi-18a1-assert.patch b/kodi-18a1-assert.patch
new file mode 100644
index 0000000..9276752
--- /dev/null
+++ b/kodi-18a1-assert.patch
@@ -0,0 +1,26 @@
+--- a/xbmc/Application.cpp 2018-05-03 20:59:05.320639560 -0500
++++ b/xbmc/Application.cpp 2018-05-03 22:40:33.340693565 -0500
+@@ -432,6 +432,11 @@
+ }
+ #endif
+
++ if (!m_ServiceManager->InitStageOnePointFive())
++ return false;
++
++ CSpecialProtocol::RegisterProfileManager(m_ServiceManager->GetProfileManager());
++
+ // only the InitDirectories* for the current platform should return true
+ bool inited = InitDirectoriesLinux();
+ if (!inited)
+@@ -458,11 +463,6 @@
+ // Init our DllLoaders emu env
+ init_emu_environ();
+
+- if (!m_ServiceManager->InitStageOnePointFive())
+- return false;
+-
+- CSpecialProtocol::RegisterProfileManager(m_ServiceManager->GetProfileManager());
+-
+ CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
+ CLog::Log(LOGNOTICE, "Starting %s from RPM Fusion (%s). Platform: %s %s %d-bit", CSysInfo::GetAppName().c_str(), CSysInfo::GetVersion().c_str(),
+ g_sysinfo.GetBuildTargetPlatformName().c_str(), g_sysinfo.GetBuildTargetCpuFamily().c_str(), g_sysinfo.GetXbmcBitness());
diff --git a/kodi.spec b/kodi.spec
index 0222f14..6016d11 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -12,9 +12,20 @@
# Default: Do not ship DVD decryption for legal reasons
%bcond_with dvdcss
+# Optional deps (not in EPEL)
+%if 0%{?fedora}
+# (libbluray in EPEL 6 is too old.)
+%global _with_libbluray 1
+%global _with_cwiid 1
+%global _with_libssh 1
+%global _with_libcec 1
+%global _with_external_ffmpeg 1
+%global _with_wayland 0
+%endif
+
Name: kodi
Version: 18.0
-Release: 0.0.a1%{?dist}
+Release: 0.1.a1%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -40,22 +51,19 @@ Source3: kodi-libdvdread-6.0.0-Leia-Alpha-1.tar.gz
Source4: kodi-libdvdcss-1.4.1-Leia-Alpha-1.tar.gz
%endif
+%if ! 0%{?_with_external_ffmpeg}
+# wget -O ffmpeg-3.4.1-Leia-Alpha-1.tar.gz https://github.com/xbmc/FFmpeg/archive/3.4.1-Leia-Alpha-1.tar.gz
+Source5: ffmpeg-3.4.1-Leia-Alpha-1.tar.gz
+%endif
+
# Set program version parameters
Patch1: kodi-18.0-versioning.patch
# stop using ancient, internal types
Patch2: kodi-18a1-wrapper.patch
-# Optional deps (not in EPEL)
-%if 0%{?fedora}
-# (libbluray in EPEL 6 is too old.)
-%global _with_libbluray 1
-%global _with_cwiid 1
-%global _with_libssh 1
-%global _with_libcec 1
-%global _with_external_ffmpeg 1
-%global _with_wayland 0
-%endif
+# fix assert at startup
+Patch3: kodi-18a1-assert.patch
%ifarch x86_64 i686
%global _with_crystalhd 1
@@ -271,13 +279,18 @@ library.
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
%patch2 -p1 -b.wrapper
+%patch3 -p1 -b.assert
%build
%cmake \
-%if ! %{with dvdcss}
- -DENABLE_DVDCSS=OFF \
+%if %{with dvdcss}
-DLIBDVDCSS_URL=%{SOURCE4} \
+%else
+ -DENABLE_DVDCSS=OFF \
+%endif
+%if ! 0%{?_with_external_ffmpeg}
+ -DFFMPEG_URL=%{SOURCE5} \
%endif
-DENABLE_EVENTCLIENTS=ON \
-DENABLE_INTERNAL_CROSSGUID=OFF \
@@ -354,6 +367,9 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
%changelog
+* Thu May 03 2018 Michael Cronenworth <mike(a)cchtml.com> - 18.0-0.1.a1
+- Add patch to fix assert on start.
+
* Fri Mar 16 2018 Michael Cronenworth <mike(a)cchtml.com> - 18.0-0.0.a1
- Kodi 18.0 alpha 1
5 years, 11 months
[discord/f26: 5/5] Update to 0.0.5
by seancallaway
commit 52c6f304d8c686f5296ed6f88415efc23236c585
Merge: 8a27e9a 55e1afa
Author: Sean Callaway <seancallaway(a)gmail.com>
Date: Thu May 3 20:52:47 2018 -0700
Update to 0.0.5
.gitignore | 2 +-
discord.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 84e2fb3,49e12e9..d101d91
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/discord-0.0.4.tar.gz
+ /discord-0.0.5.tar.gz
5 years, 11 months
[discord/f27: 5/5] Update to 0.0.5
by seancallaway
commit d72e8d277f032af51372f63f2d5ad0affd7e8979
Merge: e28af68 55e1afa
Author: Sean Callaway <seancallaway(a)gmail.com>
Date: Thu May 3 20:50:35 2018 -0700
Update to 0.0.5
.gitignore | 2 +-
discord.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 84e2fb3,49e12e9..d101d91
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--/discord-0.0.4.tar.gz
+ /discord-0.0.5.tar.gz
5 years, 11 months
