From 3af5c0c3bcecba34845ee39a635f7f2643a6f4ee Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:23:33 +0100 Subject: [PATCH 1/5] add xorg abi override --- xorg-x11-drv-nvidia.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 2e4e5f6..631267a 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -8,7 +8,7 @@ Name: xorg-x11-drv-nvidia Epoch: 1 Version: 370.28 -Release: 2%{?dist} +Release: 3%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Group: User Interface/X Hardware Support @@ -24,6 +24,7 @@ Source6: blacklist-nouveau.conf Source7: alternate-install-present Source9: nvidia-settings.desktop Source10: nvidia.conf +Source11: 00-ignoreabi.conf ExclusiveArch: i686 x86_64 armv7hl @@ -259,6 +260,8 @@ install -pm 0644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ +# Comment Xorg abi override +install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d # Desktop entry for nvidia-settings desktop-file-install --vendor "" \ @@ -432,6 +435,8 @@ fi ||: %ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf %config %{_sysconfdir}/X11/xorg.conf.d/00-avoid-glamor.conf +# Comment Xorg abi override +config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %config(noreplace) %{_prefix}/lib/modprobe.d/blacklist-nouveau.conf %config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf %config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop @@ -548,6 +553,9 @@ fi ||: %{_nvidia_libdir}/libGLX_nvidia.so %changelog +* Fri Sep 30 2016 Leigh Scott - 1:370.28-3 +- rebuilt + * Tue Sep 13 2016 Leigh Scott - 1:370.28-2 - readd libGLdispatch.so.0 From 007964011b554f249f9a87789836f5e72ea6b4ae Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:24:14 +0100 Subject: [PATCH 2/5] add xorg abi override --- 00-ignoreabi.conf | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 00-ignoreabi.conf diff --git a/00-ignoreabi.conf b/00-ignoreabi.conf new file mode 100644 index 0000000..f40110f --- /dev/null +++ b/00-ignoreabi.conf @@ -0,0 +1,75 @@ + + + +nonfree/xorg-x11-drv-nvidia-340xx.git - xorg-x11-drv-nvidia-340xx + + + + + + + + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/00-ignoreabi.conf
blob: c2071f15625d88a8d48ac5cf6b7a382e4dc7f11f (plain) + + +
1
+2
+3
+
Section "ServerFlags"
+    Option         "IgnoreABI" "True"
+EndSection
+
+
+
generated by cgit v0.12 at 2016-09-30 06:19:47 (GMT)
+
+ + From bed268e96e8463f94b53df930efc8aea72d1d429 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:25:19 +0100 Subject: [PATCH 3/5] fix source number --- 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 631267a..58af34f 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -261,7 +261,7 @@ sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf. touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/99-nvidia.conf install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/ # Comment Xorg abi override -install -pm 0644 %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d +install -pm 0644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d # Desktop entry for nvidia-settings desktop-file-install --vendor "" \ From 6cdb04108b96b6811b315326cd222dd1fb9a0ff3 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:26:50 +0100 Subject: [PATCH 4/5] fix override file --- 00-ignoreabi.conf | 75 ++--------------------------------------------- 1 file changed, 2 insertions(+), 73 deletions(-) diff --git a/00-ignoreabi.conf b/00-ignoreabi.conf index f40110f..103fd76 100644 --- a/00-ignoreabi.conf +++ b/00-ignoreabi.conf @@ -1,75 +1,4 @@ - - - -nonfree/xorg-x11-drv-nvidia-340xx.git - xorg-x11-drv-nvidia-340xx - - - - - - - - - - - - - -
- - - - -
-summaryrefslogtreecommitdiffstats
- - - -
-
-
path: root/00-ignoreabi.conf
blob: c2071f15625d88a8d48ac5cf6b7a382e4dc7f11f (plain) - - -
1
-2
-3
-
Section "ServerFlags"
+Section "ServerFlags"
     Option         "IgnoreABI" "True"
 EndSection
-
-
-
generated by cgit v0.12 at 2016-09-30 06:19:47 (GMT)
-
- - + From d11d96688af09dbbbce5b8685eac662722fdfa21 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Fri, 30 Sep 2016 07:29:49 +0100 Subject: [PATCH 5/5] edit changelog --- 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 58af34f..d1dc523 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -554,7 +554,7 @@ config %{_sysconfdir}/X11/xorg.conf.d/00-ignoreabi.conf %changelog * Fri Sep 30 2016 Leigh Scott - 1:370.28-3 -- rebuilt +- add xorg abi override * Tue Sep 13 2016 Leigh Scott - 1:370.28-2 - readd libGLdispatch.so.0