[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: Reinstate xf86-video-ast.
|
From: |
Marius Bakke |
|
Subject: |
01/05: gnu: Reinstate xf86-video-ast. |
|
Date: |
Wed, 19 Sep 2018 09:20:52 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit c5c1e410cfc175df8b4b61c1a3d42850bb268bf3
Author: Marius Bakke <address@hidden>
Date: Wed Sep 19 14:20:03 2018 +0200
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.
---
gnu/local.mk | 1 -
.../patches/xf86-video-ast-remove-mibstore.patch | 90 ----------------------
gnu/packages/xorg.scm | 48 +++++-------
3 files changed, 21 insertions(+), 118 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index d37a193..0ead43a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1229,7 +1229,6 @@ dist_patch_DATA =
\
%D%/packages/patches/xapian-revert-5489fb2f8.patch \
%D%/packages/patches/xboing-CVE-2004-0149.patch \
%D%/packages/patches/xf86-video-ark-remove-mibstore.patch \
- %D%/packages/patches/xf86-video-ast-remove-mibstore.patch \
%D%/packages/patches/xf86-video-geode-glibc-2.20.patch \
%D%/packages/patches/xf86-video-i128-remove-mibstore.patch \
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
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 58a44ae..0000000
--- 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 <address@hidden>
-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 30e46fa..90f4bf4 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