[xorg-x11-drv-nvidia] Fix error in nvidia.conf rfbz#4388
by Leigh Scott
commit 3f492e57477d853e143480eb953f84a677a5e357
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Dec 24 14:09:18 2016 +0000
Fix error in nvidia.conf rfbz#4388
nvidia.conf | 10 +++++++++-
xorg-x11-drv-nvidia.spec | 5 ++++-
2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/nvidia.conf b/nvidia.conf
index 9315780..79a73d4 100644
--- a/nvidia.conf
+++ b/nvidia.conf
@@ -7,5 +7,13 @@ Section "OutputClass"
Driver "nvidia"
Option "AllowEmptyInitialConfiguration"
Option "PrimaryGPU" "yes"
- ModulePath "@LIBDIR@/xorg/modules"
+ ModulePath "@LIBDIR@/nvidia/xorg"
+EndSection
+
+Section "OutputClass"
+ Identifier "intel"
+ MatchDriver "i915"
+ Driver "modesetting"
+ # Disable glamor as it causes crashes when combined with the nvidia driver's libEGL.so
+ Option "AccelMethod" "none"
EndSection
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 0557b7c..b628594 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -569,6 +569,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* 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
7 years, 11 months
[xorg-x11-drv-nvidia/f24: 2/2] Merge branch 'master' into f24
by Leigh Scott
commit 5ace704441bc539d634e44288dcd95f60ed3a31e
Merge: 5285330 0807a51
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Dec 24 09:36:03 2016 +0000
Merge branch 'master' into f24
xorg-x11-drv-nvidia.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
7 years, 11 months
[xorg-x11-drv-nvidia/f25: 2/2] Merge branch 'master' into f25
by Leigh Scott
commit 27c7cc2fc92e4b721715f63c9621b7ae87fce9f5
Merge: 61a8770 0807a51
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Dec 24 09:35:32 2016 +0000
Merge branch 'master' into f25
xorg-x11-drv-nvidia.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
7 years, 11 months
[xorg-x11-drv-nvidia] Add xorg-x11-server-Xorg minimum version requires for F25 and greater
by Leigh Scott
commit 0807a51709b774b0226271e4f21d4dac790015a1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Dec 24 09:34:44 2016 +0000
Add xorg-x11-server-Xorg minimum version requires for F25 and greater
xorg-x11-drv-nvidia.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index b008f57..0557b7c 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 375.26
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -45,6 +45,9 @@ Requires: which
Requires: %{_nvidia_serie}-kmod >= %{?epoch}:%{version}
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%if 0%{?fedora} >= 25
+Requires: xorg-x11-server-Xorg%{_isa} >= 1.19.0-2
+%endif
Obsoletes: %{_nvidia_serie}-kmod < %{?epoch}:%{version}
Provides: %{_nvidia_serie}-kmod-common = %{?epoch}:%{version}
@@ -566,6 +569,9 @@ fi ||:
%{_nvidia_libdir}/libGLX_nvidia.so
%changelog
+* 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
7 years, 11 months
[flowblade/f24: 2/2] Merge branch 'master' into f24
by Martin Gansser
commit 566ebe503ddede7031551ac6b03c372e228ee582
Merge: e96c774 d9fd20f
Author: Martin Gansser <mgansser(a)alice.de>
Date: Thu Dec 22 17:58:24 2016 +0100
Merge branch 'master' into f24
flowblade.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
7 years, 11 months
[flowblade/f25] rebuild
by Martin Gansser
Summary of changes:
d9fd20f... rebuild (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 11 months