gnu: Reinstate xf86-video-ast.

* gnu/packages/patches/xf86-video-ast-remove-mibstore.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
* gnu/packages/xorg.scm (xf86-video-ast): New public variable.

2 files changed, 21 insertions, 117 deletions

diff --git a/gnu/packages/patches/xf86-video-ast-remove-mibstore.patch b/gnu/packages/patches/xf86-video-ast-remove-mibstore.patch
deleted file mode 100644
index 58a44ae260..0000000000
--- a/gnu/packages/patches/xf86-video-ast-remove-mibstore.patch
+++ /dev/null
@@ -1,90 +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/
-
-diff -ru xf86-video-ast-0.93.10.orig/src/ast_2dtool.c xf86-video-ast-0.93.10/src/ast_2dtool.c
---- xf86-video-ast-0.93.10.orig/src/ast_2dtool.c	2012-03-23 21:40:56.000000000 -0400
-+++ xf86-video-ast-0.93.10/src/ast_2dtool.c	2014-12-19 02:42:32.422383728 -0500
-@@ -27,7 +27,6 @@
- #include "xf86_OSproc.h"
- #include "xf86cmap.h"
- #include "compiler.h"
--#include "mibstore.h"
- #include "vgaHW.h"
- #include "mipointer.h"
- #include "micmap.h"
-diff -ru xf86-video-ast-0.93.10.orig/src/ast_accel.c xf86-video-ast-0.93.10/src/ast_accel.c
---- xf86-video-ast-0.93.10.orig/src/ast_accel.c	2012-03-23 21:40:56.000000000 -0400
-+++ xf86-video-ast-0.93.10/src/ast_accel.c	2014-12-19 02:41:55.534200809 -0500
-@@ -27,7 +27,6 @@
- #include "xf86_OSproc.h"
- #include "xf86cmap.h"
- #include "compiler.h"
--#include "mibstore.h"
- #include "vgaHW.h"
- #include "mipointer.h"
- #include "micmap.h"
-diff -ru xf86-video-ast-0.93.10.orig/src/ast_cursor.c xf86-video-ast-0.93.10/src/ast_cursor.c
---- xf86-video-ast-0.93.10.orig/src/ast_cursor.c	2012-03-23 21:40:56.000000000 -0400
-+++ xf86-video-ast-0.93.10/src/ast_cursor.c	2014-12-19 02:42:37.258407708 -0500
-@@ -27,7 +27,6 @@
- #include "xf86_OSproc.h"
- #include "xf86cmap.h"
- #include "compiler.h"
--#include "mibstore.h"
- #include "vgaHW.h"
- #include "mipointer.h"
- #include "micmap.h"
-diff -ru xf86-video-ast-0.93.10.orig/src/ast_driver.c xf86-video-ast-0.93.10/src/ast_driver.c
---- xf86-video-ast-0.93.10.orig/src/ast_driver.c	2012-03-23 21:40:56.000000000 -0400
-+++ xf86-video-ast-0.93.10/src/ast_driver.c	2014-12-19 02:42:50.710474414 -0500
-@@ -31,7 +31,6 @@
- #endif
- #include "xf86cmap.h"
- #include "compiler.h"
--#include "mibstore.h"
- #include "vgaHW.h"
- #include "mipointer.h"
- #include "micmap.h"
-@@ -865,7 +864,6 @@
-    }
- #endif /* end of Accel_2D */
-      
--   miInitializeBackingStore(pScreen);
-    xf86SetBackingStore(pScreen);
-    xf86SetSilkenMouse(pScreen);
- 
-diff -ru xf86-video-ast-0.93.10.orig/src/ast_mode.c xf86-video-ast-0.93.10/src/ast_mode.c
---- xf86-video-ast-0.93.10.orig/src/ast_mode.c	2012-03-23 21:40:56.000000000 -0400
-+++ xf86-video-ast-0.93.10/src/ast_mode.c	2014-12-19 02:42:24.894346398 -0500
-@@ -27,7 +27,6 @@
- #include "xf86_OSproc.h"
- #include "xf86cmap.h"
- #include "compiler.h"
--#include "mibstore.h"
- #include "vgaHW.h"
- #include "mipointer.h"
- #include "micmap.h"
-diff -ru xf86-video-ast-0.93.10.orig/src/ast_tool.c xf86-video-ast-0.93.10/src/ast_tool.c
---- xf86-video-ast-0.93.10.orig/src/ast_tool.c	2012-03-23 21:40:56.000000000 -0400
-+++ xf86-video-ast-0.93.10/src/ast_tool.c	2014-12-19 02:42:03.930242443 -0500
-@@ -27,7 +27,6 @@
- #include "xf86_OSproc.h"
- #include "xf86cmap.h"
- #include "compiler.h"
--#include "mibstore.h"
- #include "vgaHW.h"
- #include "mipointer.h"
- #include "micmap.h"
-diff -ru xf86-video-ast-0.93.10.orig/src/ast_vgatool.c xf86-video-ast-0.93.10/src/ast_vgatool.c
---- xf86-video-ast-0.93.10.orig/src/ast_vgatool.c	2012-03-23 21:40:56.000000000 -0400
-+++ xf86-video-ast-0.93.10/src/ast_vgatool.c	2014-12-19 02:42:18.406314226 -0500
-@@ -27,7 +27,6 @@
- #include "xf86_OSproc.h"
- #include "xf86cmap.h"
- #include "compiler.h"
--#include "mibstore.h"
- #include "vgaHW.h"
- #include "mipointer.h"
- #include "micmap.h"
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 30e46fac7c..90f4bf4f59 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2645,33 +2645,27 @@ as USB mice.")
      "xf86-video-ark is an Ark Logic video driver for the Xorg X server.")
     (license license:x11)))
 
-;; This driver depends on XAA which has been removed from xorg-server.
-;;
-;; (define-public xf86-video-ast
-;;   (package
-;;     (name "xf86-video-ast")
-;;     (version "0.93.10")
-;;     (source
-;;       (origin
-;;         (method url-fetch)
-;;         (uri (string-append
-;;                "mirror://xorg/individual/driver/xf86-video-ast-"
-;;                version
-;;                ".tar.bz2"))
-;;         (sha256
-;;           (base32
-;;            "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69"))
-;;         (patches (search-patches "xf86-video-ast-remove-mibstore.patch"))))
-;;     (build-system gnu-build-system)
-;;     (inputs `(("xorg-server" ,xorg-server)))
-;;     (native-inputs `(("pkg-config" ,pkg-config)))
-;;     (home-page "https://www.x.org/wiki/")
-;;     (synopsis "ASpeed Technologies video driver for X server")
-;;     (description
-;;      "xf86-video-ast is an ASpeed Technologies video driver for the Xorg
-;; X server.")
-;;     (license license:x11)))
-
+(define-public xf86-video-ast
+  (package
+    (name "xf86-video-ast")
+    (version "1.1.5")
+    (home-page "https://cgit.freedesktop.org/xorg/driver/xf86-video-ast/")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "mirror://xorg/individual/driver/xf86-video-ast-"
+                    version ".tar.bz2"))
+              (sha256
+               (base32
+                "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"))))
+    (build-system gnu-build-system)
+    (inputs `(("xorg-server" ,xorg-server)))
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (synopsis "ASpeed Technologies video driver for X server")
+    (description
+     "xf86-video-ast is an ASpeed Technologies video driver for the Xorg
+X server.")
+    (license license:x11)))
 
 (define-public xf86-video-ati
   (package