[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/10: gnu: xf86-video-nv: Update to 2.1.21.
From: |
Marius Bakke |
Subject: |
05/10: gnu: xf86-video-nv: Update to 2.1.21. |
Date: |
Wed, 18 Jan 2017 17:35:08 +0000 (UTC) |
mbakke pushed a commit to branch master
in repository guix.
commit f733e603452c46640e57b1a0de34ecef324e5711
Author: Marius Bakke <address@hidden>
Date: Wed Jan 18 18:13:21 2017 +0100
gnu: xf86-video-nv: Update to 2.1.21.
* gnu/packages/xorg.scm (xf86-video-nv): Update to 2.1.21.
[source]: Remove upstreamed patch.
* gnu/packages/patches/xf86-video-nv-remove-mibstore.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
gnu/local.mk | 1 -
.../patches/xf86-video-nv-remove-mibstore.patch | 72 --------------------
gnu/packages/xorg.scm | 5 +-
3 files changed, 2 insertions(+), 76 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 7e816f7..acaf393 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -948,7 +948,6 @@ dist_patch_DATA =
\
%D%/packages/patches/xf86-video-intel-compat-api.patch \
%D%/packages/patches/xf86-video-intel-glibc-2.20.patch \
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
- %D%/packages/patches/xf86-video-nv-remove-mibstore.patch \
%D%/packages/patches/xf86-video-tga-remove-mibstore.patch \
%D%/packages/patches/xfce4-panel-plugins.patch \
%D%/packages/patches/xfce4-session-fix-xflock4.patch \
diff --git a/gnu/packages/patches/xf86-video-nv-remove-mibstore.patch
b/gnu/packages/patches/xf86-video-nv-remove-mibstore.patch
deleted file mode 100644
index 48588ed..0000000
--- a/gnu/packages/patches/xf86-video-nv-remove-mibstore.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Removes references to mibstore.h and miInitializeBackingStore, which
-have been removed from xorg-server. Zack Rusin <address@hidden>
-wrote: "It was a noop for at least 5 years and it has been removed."
-See: http://patches.openembedded.org/patch/46133/
-
-diff -ru xf86-video-nv-2.1.20.orig/src/g80_driver.c
xf86-video-nv-2.1.20/src/g80_driver.c
---- xf86-video-nv-2.1.20.orig/src/g80_driver.c 2012-07-17 02:47:02.000000000
-0400
-+++ xf86-video-nv-2.1.20/src/g80_driver.c 2014-12-17 10:11:42.197579082
-0500
-@@ -34,7 +34,6 @@
- #include <xf86Resources.h>
- #endif
- #include <mipointer.h>
--#include <mibstore.h>
- #include <micmap.h>
- #include <xf86cmap.h>
- #include <fb.h>
-@@ -833,7 +832,6 @@
- }
- }
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
-diff -ru xf86-video-nv-2.1.20.orig/src/nv_driver.c
xf86-video-nv-2.1.20/src/nv_driver.c
---- xf86-video-nv-2.1.20.orig/src/nv_driver.c 2012-07-17 02:47:02.000000000
-0400
-+++ xf86-video-nv-2.1.20/src/nv_driver.c 2014-12-17 10:11:39.037563413
-0500
-@@ -2550,7 +2550,6 @@
- if (!pNv->NoAccel)
- NVAccelInit(pScreen);
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
-diff -ru xf86-video-nv-2.1.20.orig/src/nv_include.h
xf86-video-nv-2.1.20/src/nv_include.h
---- xf86-video-nv-2.1.20.orig/src/nv_include.h 2012-07-17 02:48:19.000000000
-0400
-+++ xf86-video-nv-2.1.20/src/nv_include.h 2014-12-17 10:11:22.089479372
-0500
-@@ -24,9 +24,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
-
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- #include "micmap.h"
-
- #include "xf86DDC.h"
-diff -ru xf86-video-nv-2.1.20.orig/src/riva_driver.c
xf86-video-nv-2.1.20/src/riva_driver.c
---- xf86-video-nv-2.1.20.orig/src/riva_driver.c 2012-07-17
02:47:02.000000000 -0400
-+++ xf86-video-nv-2.1.20/src/riva_driver.c 2014-12-17 10:11:31.101524060
-0500
-@@ -1168,7 +1168,6 @@
- if (!pRiva->NoAccel)
- RivaAccelInit(pScreen);
-
-- miInitializeBackingStore(pScreen);
- xf86SetBackingStore(pScreen);
- xf86SetSilkenMouse(pScreen);
-
-diff -ru xf86-video-nv-2.1.20.orig/src/riva_include.h
xf86-video-nv-2.1.20/src/riva_include.h
---- xf86-video-nv-2.1.20.orig/src/riva_include.h 2012-07-17
02:48:45.000000000 -0400
-+++ xf86-video-nv-2.1.20/src/riva_include.h 2014-12-17 10:11:12.229430478
-0500
-@@ -22,9 +22,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
-
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- #include "micmap.h"
-
- #include "xf86DDC.h"
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 87bf914..3c8adc9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2953,7 +2953,7 @@ kernel mode setting (KMS).")
(define-public xf86-video-nv
(package
(name "xf86-video-nv")
- (version "2.1.20")
+ (version "2.1.21")
(source
(origin
(method url-fetch)
@@ -2963,8 +2963,7 @@ kernel mode setting (KMS).")
".tar.bz2"))
(sha256
(base32
- "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3"))
- (patches (search-patches "xf86-video-nv-remove-mibstore.patch"))))
+ "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"))))
(build-system gnu-build-system)
(inputs `(("xorg-server" ,xorg-server)))
(native-inputs `(("pkg-config" ,pkg-config)))
- branch master updated (1778ea7 -> 0d53d55), Marius Bakke, 2017/01/18
- 02/10: gnu: xf86-video-sis: Update to 0.10.9., Marius Bakke, 2017/01/18
- 01/10: gnu: xf86-video-tdfx: Update to 1.4.7., Marius Bakke, 2017/01/18
- 04/10: gnu: xf86-video-siliconmotion: Update to 1.7.9., Marius Bakke, 2017/01/18
- 07/10: gnu: xf86-video-trident: Update to 1.3.8., Marius Bakke, 2017/01/18
- 09/10: gnu: xf86-video-r128: Update to 6.10.2., Marius Bakke, 2017/01/18
- 10/10: gnu: xf86-input-evdev: Update to 2.10.5., Marius Bakke, 2017/01/18
- 08/10: gnu: xf86-video-savage: Update to 2.3.9., Marius Bakke, 2017/01/18
- 06/10: gnu: xf86-video-glint: Update to 1.2.9., Marius Bakke, 2017/01/18
- 03/10: gnu: xf86-video-mga: Update to 1.6.5., Marius Bakke, 2017/01/18
- 05/10: gnu: xf86-video-nv: Update to 2.1.21.,
Marius Bakke <=