[mock-rpmfusion-free] Add configuration files for Fedora 26 Remove Configuration files for Fedora 23
by Sérgio M. Basto
commit 68eef8c43adbf7b396a5924ae7be688fb9208adc
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Mar 2 03:26:55 2017 +0000
Add configuration files for Fedora 26
Remove Configuration files for Fedora 23
.gitignore | 1 +
mock-rpmfusion-free.spec | 6 +++++-
sources | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d34662..4c5df54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ mock-rpmfusion-free-23.0.tar.bz2
/mock-rpmfusion-free-25.0.tar.bz2
/mock-rpmfusion-free-25.1.tar.bz2
/mock-rpmfusion-free-25.2.tar.bz2
+/mock-rpmfusion-free-26.0.tar.bz2
diff --git a/mock-rpmfusion-free.spec b/mock-rpmfusion-free.spec
index 1f7f75c..79d2c32 100644
--- a/mock-rpmfusion-free.spec
+++ b/mock-rpmfusion-free.spec
@@ -1,5 +1,5 @@
Name: mock-rpmfusion-free
-Version: 25.2
+Version: 26.0
Release: 1%{?dist}
Summary: Mock config files for the RPM Fusion Free Repository
@@ -34,6 +34,10 @@ install -pm 0644 etc/mock/*_free.cfg %{buildroot}%{_sysconfdir}/mock
%changelog
+* Thu Mar 02 2017 Sérgio Basto <sergio(a)serjux.com> - 26.0-1
+- Add configuration files for Fedora 26
+- Remove Configuration files for Fedora 23
+
* Thu Jan 05 2017 Sérgio Basto <sergio(a)serjux.com> - 25.2-1
- Fix el-round.sh typo
- Not include rpmfusion-buildsys-epel-template
diff --git a/sources b/sources
index 23f1fee..5b02a23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-846bccc5f5f0c11a747f88574cdf34f2 mock-rpmfusion-free-25.2.tar.bz2
+4f6cfd6dffcc58dcb1d6fef387c78204 mock-rpmfusion-free-26.0.tar.bz2
7 years, 2 months
[xorg-x11-drv-nvidia] Make sure the license is installed in both normal driver and CUDA headless mode.
by Leigh Scott
commit 63951fd5e4c3df5b81888624cd9a7e06d80f778b
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Feb 27 15:02:20 2017 +0100
Make sure the license is installed in both normal driver and CUDA headless mode.
xorg-x11-drv-nvidia.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 11c53c6..07bd351 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -494,7 +494,7 @@ fi ||:
%postun cuda-libs -p /sbin/ldconfig
%files
-%doc nvidiapkg/LICENSE
+%license nvidiapkg/LICENSE
%doc nvidiapkg/NVIDIA_Changelog
%doc nvidiapkg/README.txt
%doc nvidiapkg/nvidia-application-profiles-%{version}-rc
@@ -580,6 +580,7 @@ fi ||:
%{_libdir}/vdpau/libvdpau_nvidia.so.*
%files cuda
+%license nvidiapkg/LICENSE
%if 0%{?rhel} > 6 || 0%{?fedora}
%{_unitdir}/nvidia-persistenced.service
%endif
7 years, 2 months
[obs-studio/f25: 2/2] Updated to 18.0.0
by Momcilo Medic
commit 97d9726f7a1496a4e4196c59e1fae0c17309057a
Merge: 58efa93 2eed5d3
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Wed Mar 1 23:17:49 2017 +0100
Updated to 18.0.0
.gitignore | 1 +
obs-studio.spec | 7 +++++--
sources | 3 +--
3 files changed, 7 insertions(+), 4 deletions(-)
---
7 years, 2 months
[obs-studio/f24] Updated to 18.0.0
by Momcilo Medic
Summary of changes:
2eed5d3... Updated to 18.0.0 (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 2 months
[obs-studio] Updated to 18.0.0
by Momcilo Medic
commit 2eed5d33baa7f22753ee2ad94fca8378ec2149e6
Author: Momcilo Medic <fedorauser(a)fedoraproject.org>
Date: Wed Mar 1 23:15:42 2017 +0100
Updated to 18.0.0
.gitignore | 1 +
obs-studio.spec | 7 +++++--
sources | 3 +--
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7df8e9..49cf4f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
/obs-studio-17.0.0.tar.gz
/obs-studio-17.0.2.tar.gz
/obs-ffmpeg-mux.patch
+/obs-studio-18.0.0.tar.gz
diff --git a/obs-studio.spec b/obs-studio.spec
index fcb7860..c4d3d0c 100644
--- a/obs-studio.spec
+++ b/obs-studio.spec
@@ -1,6 +1,6 @@
Name: obs-studio
-Version: 17.0.2
-Release: 2%{?dist}
+Version: 18.0.0
+Release: 1%{?dist}
Summary: Open Broadcaster Software Studio
License: GPLv2+
@@ -131,6 +131,9 @@ fi
%changelog
+* Wed Mar 1 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 18.0.0-1
+- Updated to 18.0.0
+
* Mon Jan 30 2017 Momcilo Medic <fedorauser(a)fedoraproject.org> - 17.0.2-2
- Reintroduced obs-ffmpeg-mux.patch
- Fixes #4436
diff --git a/sources b/sources
index 14c6206..6f42f1d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-2b845fff9881ea22fb42003dbedfd2f3 obs-studio-17.0.2.tar.gz
-66b48f74345fa2e76a5e70920aee2c9e obs-ffmpeg-mux.patch
+44de237679a2f1f6d51e61dc780dae70 obs-studio-18.0.0.tar.gz
7 years, 2 months
[xorg-x11-drv-nvidia] Remove remnants of no longer supported distributions
by Leigh Scott
commit 787dd18c6392f035c8453291c645e597a0daf197
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Feb 27 14:55:47 2017 +0100
Remove remnants of no longer supported distributions
xorg-x11-drv-nvidia.spec | 31 +++++++++----------------------
1 file changed, 9 insertions(+), 22 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index cdc1a77..11c53c6 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -26,7 +26,6 @@ Version: 375.39
Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
-Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
@@ -49,7 +48,7 @@ Source15: nvidia-uvm.conf
ExclusiveArch: i686 x86_64 armv7hl
BuildRequires: desktop-file-utils
-%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
+%if 0%{?rhel} > 6 || 0%{?fedora}
Buildrequires: systemd
Requires(post): systemd
Requires(preun): systemd
@@ -114,7 +113,6 @@ http://rpmfusion.org/Howto/nVidia
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-cuda = %{?epoch}:%{version}-%{release}
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
@@ -129,7 +127,6 @@ such as OpenGL headers.
%package cuda
Summary: CUDA driver for %{name}
-Group: Development/Libraries
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Provides: nvidia-persistenced = %{version}-%{release}
@@ -145,7 +142,6 @@ This package provides the CUDA driver.
%package cuda-libs
Summary: CUDA libraries for %{name}
-Group: Development/Libraries
Requires: %{name}-cuda = %{?epoch}:%{version}-%{release}
%description cuda-libs
@@ -153,7 +149,6 @@ This package provides the CUDA driver libraries.
%package kmodsrc
Summary: %{name} kernel module source code
-Group: System Environment/Kernel
%description kmodsrc
Source tree used for building kernel module packages (%{name}-kmod)
@@ -161,7 +156,6 @@ which is generated during the build of main package.
%package libs
Summary: Libraries for %{name}
-Group: User Interface/X Hardware Support
Requires: %{name} = %{?epoch}:%{version}-%{release}
Requires: libvdpau%{?_isa} >= 0.5
Requires: libglvnd%{?_isa} >= 0.2
@@ -276,9 +270,6 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_nvidia_xorgdir}
rm -f $RPM_BUILD_ROOT%{_nvidia_libdir}/lib{nvidia-wfb,glx,vdpau*}.so.%{version}
# Finish up the special case libs
-%if 0%{?rhel} == 5
-install -p -m 0755 libnvidia-wfb.so.%{version} $RPM_BUILD_ROOT%{_nvidia_xorgdir}
-%endif
install -p -m 0755 libglx.so.%{version} $RPM_BUILD_ROOT%{_nvidia_xorgdir}
install -p -m 0755 nvidia_drv.so $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/
@@ -371,7 +362,7 @@ install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.co
#Install the initscript
tar jxf nvidia-persistenced-init.tar.bz2
-%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
+%if 0%{?rhel} > 6 || 0%{?fedora}
mkdir -p $RPM_BUILD_ROOT%{_unitdir}
install -pm 0644 nvidia-persistenced-init/systemd/nvidia-persistenced.service.template \
$RPM_BUILD_ROOT%{_unitdir}/nvidia-persistenced.service
@@ -446,7 +437,7 @@ fi || :
%post cuda
/sbin/ldconfig
-%if 0%{?rhel} > 6 || 0%{?fedora} >= 18
+%if 0%{?rhel} > 6 || 0%{?fedora}
%systemd_post nvidia-persistenced.service
%endif
@@ -485,7 +476,7 @@ if [ "$1" -eq "0" ]; then
mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null
fi ||:
-%if 0%{?rhel} > 6 || 0%{?fedora} >= 18
+%if 0%{?rhel} > 6 || 0%{?fedora}
%preun cuda
%systemd_preun nvidia-persistenced.service
%endif
@@ -496,14 +487,13 @@ fi ||:
%postun cuda
/sbin/ldconfig
-%if 0%{?rhel} > 6 || 0%{?fedora} >= 18
+%if 0%{?rhel} > 6 || 0%{?fedora}
%systemd_postun_with_restart nvidia-persistenced.service
%endif
%postun cuda-libs -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc nvidiapkg/LICENSE
%doc nvidiapkg/NVIDIA_Changelog
%doc nvidiapkg/README.txt
@@ -544,7 +534,7 @@ fi ||:
%{_nvidia_libdir}/libnvidia-gtk3.so*
%endif
#/no_multilib
-%if 0%{?rhel} > 6 || 0%{?fedora} >= 21
+%if 0%{?rhel} > 6 || 0%{?fedora}
%{_datadir}/X11/xorg.conf.d/nvidia.conf
%endif
%if 0%{?fedora} >= 25
@@ -562,7 +552,6 @@ fi ||:
%{_datadir}/nvidia-kmod-%{version}/nvidia-kmod-%{version}-%{_target_cpu}.tar.xz
%files libs
-%defattr(-,root,root,-)
%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
%config %{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%dir %{_nvidia_libdir}
@@ -581,7 +570,7 @@ fi ||:
%exclude %{_nvidia_libdir}/libnvidia-ml.so*
%exclude %{_nvidia_libdir}/libnvidia-ptxjitcompiler.so*
%ifarch x86_64 i686
-%if 0%{?fedora} > 18
+%if 0%{?fedora}
%exclude %{_nvidia_libdir}/libOpenCL.so.*
%endif
%exclude %{_nvidia_libdir}/libnvidia-compiler.so*
@@ -591,8 +580,7 @@ fi ||:
%{_libdir}/vdpau/libvdpau_nvidia.so.*
%files cuda
-%defattr(-,root,root,-)
-%if 0%{?rhel} > 6 || 0%{?fedora} >= 15
+%if 0%{?rhel} > 6 || 0%{?fedora}
%{_unitdir}/nvidia-persistenced.service
%endif
%{_bindir}/nvidia-debugdump
@@ -625,10 +613,9 @@ fi ||:
%{_nvidia_libdir}/libnvidia-encode.so*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/nvidia/
%ifarch x86_64 i686
-%if 0%{?fedora} > 18
+%if 0%{?fedora}
%exclude %{_nvidia_libdir}/libOpenCL.so
%else
%{_nvidia_libdir}/libOpenCL.so
7 years, 2 months
[xorg-x11-drv-nvidia] Do not install OutputClass configuration file on anything but Fedora 24 and RHEL 7. Fixes build on R
by Leigh Scott
commit ecdea98b967d411c192f3dad57cf6390473f0649
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Mon Feb 27 14:53:31 2017 +0100
Do not install OutputClass configuration file on anything but Fedora 24 and RHEL 7. Fixes build on RHEL 6.
xorg-x11-drv-nvidia.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 9a07809..cdc1a77 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -364,7 +364,7 @@ install -pm 0644 %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.c
sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
touch -r %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
%endif
-%if 0%{?fedora} <= 24
+%if 0%{?rhel} == 7 || 0%{?fedora} == 24
mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/nvidia.conf
%endif
7 years, 2 months
[xorg-x11-drv-nvidia] Enable SLI and BaseMosaic (multimonitor on multiple cards) by default. The behaviour is then the sam
by Leigh Scott
commit 878339e0f515ef1e1a17ac230aef3e74302a73bc
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Fri Feb 24 18:17:38 2017 +0100
Enable SLI and BaseMosaic (multimonitor on multiple cards) by default.
The behaviour is then the same as a single card system (all outputs enabled, multimonitor with automatic detection).
nvidia.conf | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/nvidia.conf b/nvidia.conf
index 7481890..b2d9a85 100644
--- a/nvidia.conf
+++ b/nvidia.conf
@@ -7,6 +7,8 @@ Section "OutputClass"
Driver "nvidia"
Option "AllowEmptyInitialConfiguration"
Option "PrimaryGPU" "yes"
+ Option "SLI" "Auto"
+ Option "BaseMosaic" "on"
ModulePath "@LIBDIR@/nvidia/xorg"
EndSection
7 years, 2 months
[xorg-x11-drv-nvidia] Remove nvidia-modprobe and provide udev rules that actually do the same thing.
by Leigh Scott
commit 92cfbe942698d5ecd40ad5120228754fd0d84c5c
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Fri Feb 24 17:46:19 2017 +0100
Remove nvidia-modprobe and provide udev rules that actually do the same thing.
Add nvidia-uvm configuration rule to make sure that:
- the module does get loaded automatically if installing the cuda subpackage
- the module configuration file does not try to pull in the module in the initrd
60-nvidia-uvm.rules | 1 +
nvidia-uvm.conf | 11 +++++++++++
xorg-x11-drv-nvidia.spec | 25 ++++++++++++++++---------
3 files changed, 28 insertions(+), 9 deletions(-)
---
diff --git a/60-nvidia-uvm.rules b/60-nvidia-uvm.rules
new file mode 100644
index 0000000..1a84038
--- /dev/null
+++ b/60-nvidia-uvm.rules
@@ -0,0 +1 @@
+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'"
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/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index e2848a6..9a07809 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -11,6 +11,8 @@
%if 0%{?rhel} == 6
%global _modprobe_d %{_sysconfdir}/modprobe.d/
+# RHEL 6 does not have _udevrulesdir defined
+%global _udevrulesdir %{_prefix}/lib/udev/rules.d/
%else
%global _modprobe_d %{_prefix}/lib/modprobe.d/
%endif
@@ -41,6 +43,8 @@ Source10: nvidia.conf
Source11: 00-ignoreabi.conf
Source12: xorg-x11-drv-nvidia.metainfo.xml
Source13: parse-readme.py
+Source14: 60-nvidia-uvm.rules
+Source15: nvidia-uvm.conf
ExclusiveArch: i686 x86_64 armv7hl
@@ -128,7 +132,6 @@ Summary: CUDA driver for %{name}
Group: Development/Libraries
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
-Provides: nvidia-modprobe = %{version}-%{release}
Provides: nvidia-persistenced = %{version}-%{release}
Conflicts: xorg-x11-drv-nvidia-340xx-cuda
@@ -285,13 +288,17 @@ install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
echo -e "%{_nvidia_libdir} \n%{_glvnd_libdir} \n" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_lib}.conf
%endif
-#Blacklist nouveau (since F-11)
-install -m 0755 -d $RPM_BUILD_ROOT%{_modprobe_d}/
-install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_modprobe_d}/
+# Blacklist nouveau, autoload nvidia-uvm module after nvidia module
+install -m 0755 -d $RPM_BUILD_ROOT%{_modprobe_d}/
+install -p -m 0644 %{SOURCE6} %{SOURCE15} $RPM_BUILD_ROOT%{_modprobe_d}/
+
+# UDev rules for nvidia-uvm
+install -m 0755 -d $RPM_BUILD_ROOT%{_udevrulesdir}
+install -p -m 0644 %{SOURCE14} $RPM_BUILD_ROOT%{_udevrulesdir}
# Install binaries
install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
-install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,xconfig,settings,persistenced,modprobe} \
+install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,xconfig,settings,persistenced} \
$RPM_BUILD_ROOT%{_bindir}
# Install headers
@@ -300,7 +307,8 @@ install -p -m 0644 {gl.h,glext.h,glx.h,glxext.h} $RPM_BUILD_ROOT%{_includedir}/n
# Install man pages
install -m 0755 -d $RPM_BUILD_ROOT%{_mandir}/man1/
-install -p -m 0644 *.gz $RPM_BUILD_ROOT%{_mandir}/man1/
+install -p -m 0644 nvidia-{cuda-mps-control,persistenced,settings,smi,xconfig}.1.gz \
+ $RPM_BUILD_ROOT%{_mandir}/man1/
# Make unversioned links to dynamic libs
for lib in $( find $RPM_BUILD_ROOT%{_libdir} -name lib\*.%{version} ) ; do
@@ -592,8 +600,6 @@ fi ||:
%{_bindir}/nvidia-cuda-mps-control
%{_bindir}/nvidia-cuda-mps-server
%{_bindir}/nvidia-persistenced
-#nvidia-modprobe is setuid root to allow users to load the module in
-%attr(4755, root, root) %{_bindir}/nvidia-modprobe
%if 0%{?rhel} > 6 || 0%{?fedora} <= 24
%{_libdir}/libcuda.so*
%endif
@@ -610,7 +616,8 @@ fi ||:
%{_mandir}/man1/nvidia-smi.*
%{_mandir}/man1/nvidia-cuda-mps-control.1.*
%{_mandir}/man1/nvidia-persistenced.1.*
-%{_mandir}/man1/nvidia-modprobe.1.*
+%{_modprobe_d}/nvidia-uvm.conf
+%{_udevrulesdir}/60-nvidia-uvm.rules
%files cuda-libs
%{_nvidia_libdir}/libcuda.so*
7 years, 2 months