[nvidia-kmod/f25] (3 commits) ...fix merge
by Leigh Scott
Summary of changes:
358ee8e... Update to 370.23 beta (*)
c39036f... Update to 370.28 (*)
332a4cb... fix merge
(*) This commit already existed in another branch; no separate mail sent
8 years
[xorg-x11-drv-nvidia] (5 commits) ...Merge branch 'master' into f25
by Leigh Scott
Summary of changes:
fd75400... Update to 367.44 (*)
7ed2449... fix merge (*)
12dec79... fix gitignore (*)
e6141b3... Merge branch 'master' into f25 (*)
01510f4... Merge branch 'master' into f25 (*)
(*) This commit already existed in another branch; no separate mail sent
8 years
[xorg-x11-drv-nvidia/f25: 2/2] Merge branch 'master' into f25
by Leigh Scott
commit 01510f4f3d0dcfc7393bf8f43ef7de3838a07fc5
Merge: e6141b3 e02f136
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 30 07:43:08 2016 +0100
Merge branch 'master' into f25
xorg-x11-drv-nvidia.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
8 years
[xorg-x11-drv-nvidia] fix missing %
by Leigh Scott
commit e02f136dee16a13be0112f9f939e0eda82ded389
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 30 07:42:43 2016 +0100
fix missing %
xorg-x11-drv-nvidia.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index d1dc523..ae702ec 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -24,7 +24,7 @@ Source6: blacklist-nouveau.conf
Source7: alternate-install-present
Source9: nvidia-settings.desktop
Source10: nvidia.conf
-Source11: 00-ignoreabi.conf
+Source11: 00-ignoreabi.conf
ExclusiveArch: i686 x86_64 armv7hl
@@ -436,7 +436,7 @@ fi ||:
%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 %{_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
8 years
[xorg-x11-drv-nvidia/f25: 6/6] Merge branch 'master' into f25
by Leigh Scott
commit e6141b3958e4927b31cc3d1854d40929a1a665cb
Merge: 12dec79 d11d966
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 30 07:32:02 2016 +0100
Merge branch 'master' into f25
00-ignoreabi.conf | 4 ++++
xorg-x11-drv-nvidia.spec | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
---
8 years
[xorg-x11-drv-nvidia/f25] (6 commits) ...Merge branch 'master' into f25
by Leigh Scott
Summary of changes:
3af5c0c... add xorg abi override (*)
0079640... add xorg abi override (*)
bed268e... fix source number (*)
6cdb041... fix override file (*)
d11d966... edit changelog (*)
e6141b3... Merge branch 'master' into f25
(*) This commit already existed in another branch; no separate mail sent
8 years
[xorg-x11-drv-nvidia] edit changelog
by Leigh Scott
commit d11d96688af09dbbbce5b8685eac662722fdfa21
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 30 07:29:49 2016 +0100
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 <leigh123linux(a)googlemail.com> - 1:370.28-3
-- rebuilt
+- add xorg abi override
* Tue Sep 13 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1:370.28-2
- readd libGLdispatch.so.0
8 years
[xorg-x11-drv-nvidia] fix override file
by Leigh Scott
commit 6cdb04108b96b6811b315326cd222dd1fb9a0ff3
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 30 07:26:50 2016 +0100
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 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
-<head>
-<title>nonfree/xorg-x11-drv-nvidia-340xx.git - xorg-x11-drv-nvidia-340xx</title>
-<meta name='generator' content='cgit v0.12'/>
-<meta name='robots' content='index, nofollow'/>
-<link rel='stylesheet' type='text/css' href='/cgit-data/cgit.css'/>
-<link rel='shortcut icon' href='/favicon.ico'/>
-<link rel='alternate' title='Atom feed' href='https://pkgs.rpmfusion.org/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/ato...' type='application/atom+xml'/>
-<link rel='vcs-git' href='ssh://pkgs.rpmfusion.org/nonfree/xorg-x11-drv-nvidia-340xx.git' title='nonfree/xorg-x11-drv-nvidia-340xx.git Git repository'/>
-<link rel='vcs-git' href='https://pkgs.rpmfusion.org/git/nonfree/xorg-x11-drv-nvidia-340xx.git' title='nonfree/xorg-x11-drv-nvidia-340xx.git Git repository'/>
-</head>
-<body>
-<script src="https://apps.fedoraproject.org/fedmenu/js/jquery-1.11.2.min.js"></script>
-<script src="https://apps.fedoraproject.org/fedmenu/js/fedmenu.js"></script>
-
-<script>
- var base = 'https://apps.fedoraproject.org/';
- var tokens = window.location.href.split('/');
- var repo = null;
- if (tokens.length > 4 && tokens[4] != '') {
- repo = tokens[4].split('.')[0];
- }
- fedmenu({
- 'url': base + 'js/data.js',
- 'mimeType': 'application/javascript',
- 'position': 'bottom-right',
- 'package': repo,
- });
-</script>
-<div id='cgit'><table id='header'>
-<tr>
-<td class='logo' rowspan='2'><a href='/cgit/'><img src='/cgit-data/cgit.png' alt='cgit logo'/></a></td>
-<td class='main'><a href='/cgit/'>index</a> : <a title='nonfree/xorg-x11-drv-nvidia-340xx.git' href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/'>nonfree/xorg-x11-drv-nvidia-340xx.git</a></td><td class='form'><form method='get' action=''>
-<select name='h' onchange='this.form.submit();'>
-<option value='el5'>el5</option>
-<option value='el6'>el6</option>
-<option value='el7'>el7</option>
-<option value='f20'>f20</option>
-<option value='f21'>f21</option>
-<option value='f22'>f22</option>
-<option value='f23'>f23</option>
-<option value='f24'>f24</option>
-<option value='f25'>f25</option>
-<option value='master' selected='selected'>master</option>
-</select> <input type='submit' name='' value='switch'/></form></td></tr>
-<tr><td class='sub'>xorg-x11-drv-nvidia-340xx</td><td class='sub right'>git repository hosting</td></tr></table>
-<table class='tabs'><tr><td>
-<a href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/'>summary</a><a href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/refs/'>refs</a><a href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/log/00-ignoreabi.conf'>log</a><a class='active' href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/tree/00-ignoreabi.conf'>tree</a><a href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/commit/00-ignoreabi.conf'>commit</a><a href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/diff/00-ignoreabi.conf'>diff</a><a href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/stats/00-ignoreabi.conf'>stats</a></td><td class='form'><form class='right' method='get' action='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/log/00-ignoreabi.conf'>
-<select name='qt'>
-<option value='grep'>log msg</option>
-<option value='author'>author</option>
-<option value='committer'>committer</option>
-<option value='range'>range</option>
-</select>
-<input class='txt' type='text' size='10' name='q' value=''/>
-<input type='submit' value='search'/>
-</form>
-</td></tr></table>
-<div class='path'>path: <a href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/tree/'>root</a>/<a href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/tree/00-ignoreabi.conf'>00-ignoreabi.conf</a></div><div class='content'>blob: c2071f15625d88a8d48ac5cf6b7a382e4dc7f11f (<a href='/cgit/nonfree/xorg-x11-drv-nvidia-340xx.git/plain/00-ignoreabi.conf'>plain</a>)
-<table summary='blob content' class='blob'>
-<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
-<a id='n2' href='#n2'>2</a>
-<a id='n3' href='#n3'>3</a>
-</pre></td>
-<td class='lines'><pre><code>Section "ServerFlags"
+Section "ServerFlags"
Option "IgnoreABI" "True"
EndSection
-</code></pre></td></tr></table>
-</div> <!-- class=content -->
-<div class='footer'>generated by <a href='http://git.zx2c4.com/cgit/about/'>cgit v0.12</a> at 2016-09-30 06:19:47 (GMT)</div>
-</div> <!-- id=cgit -->
-</body>
-</html>
+
8 years
[xorg-x11-drv-nvidia] fix source number
by Leigh Scott
commit bed268e96e8463f94b53df930efc8aea72d1d429
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Sep 30 07:25:19 2016 +0100
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 "" \
8 years