gnu: xf86-video-tdfx: Update to 1.4.6.

* gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch: Delete
  file.
* gnu-system.am (dist_patch_DATA): Remove it.
* gnu/packages/xorg.scm (xf86-video-tdfx): Update to 1.4.6.
  [source]: Remove patch.
This commit is contained in:
Andy Wingo 2016-02-18 21:28:14 +01:00 committed by Mark H Weaver
parent 5f59f5103a
commit 816decebf2
3 changed files with 2 additions and 31 deletions

View File

@ -773,7 +773,6 @@ dist_patch_DATA = \
gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch \ gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch \
gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \ gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \
gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \ gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \
gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch \
gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \ gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \
gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \ gnu/packages/patches/xf86-video-trident-remove-mibstore.patch \
gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \ gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \

View File

@ -1,26 +0,0 @@
Removes references to mibstore.h and miInitializeBackingStore, which
have been removed from xorg-server. Zack Rusin <zackr@vmware.com>
wrote: "It was a noop for at least 5 years and it has been removed."
See: http://patches.openembedded.org/patch/46133/
--- xf86-video-tdfx-1.4.5/src/tdfx_driver.c.~1~ 2012-07-17 01:21:16.000000000 -0400
+++ xf86-video-tdfx-1.4.5/src/tdfx_driver.c 2014-12-19 01:36:42.762798424 -0500
@@ -62,10 +62,6 @@
#include "compiler.h"
-/* Drivers using the mi implementation of backing store need: */
-
-#include "mibstore.h"
-
/* All drivers using the vgahw module need this */
/* This driver needs to be modified to not use vgaHW for multihead operation */
#include "vgaHW.h"
@@ -2373,7 +2369,6 @@
}
}
- miInitializeBackingStore(pScreen);
xf86SetBackingStore(pScreen);
xf86SetSilkenMouse(pScreen);

View File

@ -3234,7 +3234,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
(define-public xf86-video-tdfx (define-public xf86-video-tdfx
(package (package
(name "xf86-video-tdfx") (name "xf86-video-tdfx")
(version "1.4.5") (version "1.4.6")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3244,9 +3244,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.")
".tar.bz2")) ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh")) "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is"))))
(patches (list
(search-patch "xf86-video-tdfx-remove-mibstore.patch")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs `(("mesa" ,mesa) (inputs `(("mesa" ,mesa)
("xf86driproto" ,xf86driproto) ("xf86driproto" ,xf86driproto)