diff options
| author | Andy Wingo <wingo@igalia.com> | 2016-02-18 21:28:14 +0100 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-02-24 11:49:57 -0500 |
| commit | 816decebf27352ee0843a2d3d8f06fa0979e10da (patch) | |
| tree | b48b7721d8a163e2bce1e878100e0ceed9f5b122 | |
| parent | 5f59f5103a2988130bbe3da619a828a8cf642735 (diff) | |
| download | guix-816decebf27352ee0843a2d3d8f06fa0979e10da.tar guix-816decebf27352ee0843a2d3d8f06fa0979e10da.tar.gz | |
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.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch | 26 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 6 |
3 files changed, 2 insertions, 31 deletions
diff --git a/gnu-system.am b/gnu-system.am index 0367903381..b74ba26e5a 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -773,7 +773,6 @@ dist_patch_DATA = \ gnu/packages/patches/xf86-video-mach64-glibc-2.20.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-tdfx-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-vmware-glibc-2.20.patch \ diff --git a/gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch b/gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch deleted file mode 100644 index 05e2154433..0000000000 --- a/gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch +++ /dev/null @@ -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); - diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c1b167a00b..3b984a8ef5 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3234,7 +3234,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") (define-public xf86-video-tdfx (package (name "xf86-video-tdfx") - (version "1.4.5") + (version "1.4.6") (source (origin (method url-fetch) @@ -3244,9 +3244,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") ".tar.bz2")) (sha256 (base32 - "0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh")) - (patches (list - (search-patch "xf86-video-tdfx-remove-mibstore.patch"))))) + "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86driproto" ,xf86driproto) |