- updated to 1.2.6

- removed obsolete chips-git,build patches

diff --git a/build.patch b/build.patch
deleted file mode 100644 (file)
index 9961433..0000000
--- a/build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 151a1ec855a9ada44907cb6bef06a71e9080504b
-Author: Adam Jackson <ajax@redhat.com>
-Date:   Tue Sep 25 08:54:34 2012 -0400
-
-    Remove mibstore.h
-    
-    Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/ct_driver.c b/src/ct_driver.c
-index 6f3a5d4..effbc60 100644
---- a/src/ct_driver.c
-+++ b/src/ct_driver.c
-@@ -96,9 +96,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* All drivers using the mi banking wrapper need this */
- #ifdef HAVE_ISA
- #include "mibank.h"
-@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
-           pBankInfo = NULL;
-           return FALSE;
-       }
--      miInitializeBackingStore(pScreen);
-       xf86SetBackingStore(pScreen);
- 
-       /* Initialise cursor functions */
-@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
-           }
-       }
-       
--      miInitializeBackingStore(pScreen);
-       xf86SetBackingStore(pScreen);
- #ifdef ENABLE_SILKEN_MOUSE
-       xf86SetSilkenMouse(pScreen);

diff --git a/chips-git.patch b/chips-git.patch
deleted file mode 100644 (file)
index d31577f..0000000
--- a/chips-git.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/util/iopl.h b/util/iopl.h
-new file mode 100644
-index 0000000..e08207c
---- /dev/null
-+++ b/util/iopl.h
-@@ -0,0 +1,60 @@
-+#ifdef __NetBSD__
-+#  include <sys/types.h>
-+#  include <machine/pio.h>
-+#  include <machine/sysarch.h>
-+#else
-+#  if defined(__linux__)
-+/* Can't because <sys/iopl.h> provides conflicting inb, outb, etc
-+ * #    include <sys/io.h>
-+ */
-+int iopl(int level);
-+#  endif
-+#  if defined(SVR4) && defined(i386)
-+#    include <sys/types.h>
-+#    ifdef NCR
-+       /* broken NCR <sys/sysi86.h> */
-+#      define __STDC
-+#      include <sys/sysi86.h>
-+#      undef __STDC
-+#    else
-+#      include <sys/sysi86.h>
-+#    endif
-+#    ifdef SVR4
-+#      if !defined(sun)
-+#        include <sys/seg.h>
-+#      endif
-+#    endif
-+#    include <sys/v86.h>
-+#    if defined(sun)
-+#      include <sys/psw.h>
-+#    endif
-+#  endif
-+#  include "AsmMacros.h"
-+#endif /* NetBSD */
-+
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#ifdef __NetBSD__
-+#  define SET_IOPL() i386_iopl(3)
-+#  define RESET_IOPL() i386_iopl(0)
-+#else
-+#  if defined(SVR4) && defined(i386)
-+#    ifndef SI86IOPL
-+#      define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL)
-+#      define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0)
-+#    else
-+#      define SET_IOPL() sysi86(SI86IOPL,3)
-+#      define RESET_IOPL() sysi86(SI86IOPL,0)
-+#    endif
-+#  else
-+#    ifdef linux
-+#      define SET_IOPL() iopl(3)
-+#      define RESET_IOPL() iopl(0)
-+#    else
-+#      define SET_IOPL() (void)0
-+#      define RESET_IOPL() (void)0
-+#    endif
-+#  endif
-+#endif

diff --git a/xorg-driver-video-chips.spec b/xorg-driver-video-chips.spec
index fde9c3ca5bbf2d7ddb36f9e68daec76c378d7967..6aaddd960d7b3293c10b10edb5f602dbff4ac74c 100644 (file)
--- a/xorg-driver-video-chips.spec
+++ b/xorg-driver-video-chips.spec
@@ -1,14 +1,12 @@
 Summary:       X.org video driver for Chips and Technologies video processors
 Summary(pl.UTF-8):     Sterownik obrazu X.org do układów graficznych Chips and Technologies
 Name:          xorg-driver-video-chips
-Version:       1.2.5
-Release:       8
+Version:       1.2.6
+Release:       1
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-%{version}.tar.bz2
-# Source0-md5: 56be62612f98a0cf469a2a78c0a14ed5
-Patch0:                chips-git.patch
-Patch1:                build.patch
+# Source0-md5: 7c3ac8a7338367b05d9315d65ef91226
 URL:           http://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -52,8 +50,6 @@ Obsługiwane są układy z trzech klas architektur:
 
 %prep
 %setup -q -n xf86-video-chips-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}