- updated to 2.1.21

- removed obsolete build,xserver-1.19 patches

diff --git a/build.patch b/build.patch
deleted file mode 100644 (file)
index 84a44d9..0000000
--- a/build.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-commit fc78fe98222b0204b8a2872a529763d6fe5048da
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Sep 25 08:54:49 2012 -0400
-
-    Remove mibstore.h
-    
-    Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/g80_driver.c b/src/g80_driver.c
-index cc4e197..719b96c 100644
---- a/src/g80_driver.c
-+++ b/src/g80_driver.c
-@@ -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 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
-         }
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 6dad6e5..8f35334 100644
---- a/src/nv_driver.c
-+++ b/src/nv_driver.c
-@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
-     if (!pNv->NoAccel)
-       NVAccelInit(pScreen);
-     
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
-diff --git a/src/nv_include.h b/src/nv_include.h
-index fb190bf..f174eef 100644
---- a/src/nv_include.h
-+++ b/src/nv_include.h
-@@ -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 --git a/src/riva_driver.c b/src/riva_driver.c
-index e0667ef..759501e 100644
---- a/src/riva_driver.c
-+++ b/src/riva_driver.c
-@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
-     if (!pRiva->NoAccel)
-       RivaAccelInit(pScreen);
-     
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
-diff --git a/src/riva_include.h b/src/riva_include.h
-index f2c5302..c7aeef7 100644
---- a/src/riva_include.h
-+++ b/src/riva_include.h
-@@ -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/xorg-driver-video-nv.spec b/xorg-driver-video-nv.spec
index d55f49887e5bbea5170d628aad84ff609b710539..57621f1af14ab30d79566546ccb845310f10723e 100644 (file)
--- a/xorg-driver-video-nv.spec
+++ b/xorg-driver-video-nv.spec
@@ -1,15 +1,13 @@
 Summary:       X.org video driver for NVIDIA video adapters
 Summary(pl.UTF-8):     Sterownik obrazu X.org dla kart graficznych NVIDIA
 Name:          xorg-driver-video-nv
-Version:       2.1.20
-Release:       11
+Version:       2.1.21
+Release:       1
 License:       MIT
 Group:         X11/Applications
-Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-%{version}.tar.bz2
-# Source0-md5: e263dd0cd149b5224e92baa5a227bb00
-Patch0:                build.patch
-Patch1:                xserver-1.19.patch
-URL:           http://xorg.freedesktop.org/
+Source0:       https://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-%{version}.tar.bz2
+# Source0-md5: 1fdd41d88232043811cbe3f5ac724c5f
+URL:           https://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
 BuildRequires: libtool
@@ -77,8 +75,6 @@ zamknięte sterowniki firmy NVIDIA (tylko dla nowszych kart).
 
 %prep
 %setup -q -n xf86-video-nv-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}

diff --git a/xserver-1.19.patch b/xserver-1.19.patch
deleted file mode 100644 (file)
index a73ba2d..0000000
--- a/xserver-1.19.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- xf86-video-chips-1.2.6/src/compat-api.h~   2015-09-26 18:28:01.000000000 +0200
-+++ xf86-video-chips-1.2.6/src/compat-api.h    2016-11-28 09:12:37.337570460 +0100
-@@ -75,8 +75,13 @@
- 
- #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
- 
-+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
-+#define BLOCKHANDLER_ARGS arg, pTimeout
-+#else
- #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
- #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+#endif
- 
- #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
- #define CLOSE_SCREEN_ARGS pScreen