aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@igalia.com>2016-02-18 21:29:02 +0100
committerMark H Weaver <mhw@netris.org>2016-02-24 11:49:57 -0500
commit2ae7a5506299c3feffe43b5010fe6783e3f31df7 (patch)
tree583dab80fa35c4bffc5ee26e017aff6bd5a183c5
parent937c13f2204357c4e0b9338fdd6b7d45a7760fff (diff)
downloadguix-2ae7a5506299c3feffe43b5010fe6783e3f31df7.tar
guix-2ae7a5506299c3feffe43b5010fe6783e3f31df7.tar.gz
gnu: xf86-video-vmware: Update to 13.1.0.
* gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch: Delete file. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/xorg.scm (xf86-video-vmware): Update to 13.1.0. [source]: Remove patch.
-rw-r--r--gnu-system.am1
-rw-r--r--gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch15
-rw-r--r--gnu/packages/xorg.scm5
3 files changed, 2 insertions, 19 deletions
diff --git a/gnu-system.am b/gnu-system.am
index dd39e86398..b5f59e3449 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -774,7 +774,6 @@ dist_patch_DATA = \
gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \
gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \
gnu/packages/patches/xf86-video-tga-remove-mibstore.patch \
- gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch \
gnu/packages/patches/xfce4-panel-plugins.patch \
gnu/packages/patches/xfce4-session-fix-xflock4.patch \
gnu/packages/patches/xfce4-settings-defaults.patch \
diff --git a/gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch b/gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch
deleted file mode 100644
index 43d21d13ab..0000000000
--- a/gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow builds with glibc 2.20.
-Based on a patch by Peter Hutterer <peter.hutterer@who-t.net>.
-See <https://raw.githubusercontent.com/openembedded/oe-core/master/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch>.
-
---- xf86-video-vmware-13.0.2/vmwgfx/vmwgfx_overlay.c.~1~ 2014-03-20 09:15:03.000000000 -0400
-+++ xf86-video-vmware-13.0.2/vmwgfx/vmwgfx_overlay.c 2014-12-19 02:31:34.759122552 -0500
-@@ -35,6 +35,8 @@
- */
-
-
-+#include <xorg-server.h>
-+
- #include "xf86xv.h"
- #include "fourcc.h"
- #define debug_printf(...)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 6246c58a57..eeaf1c3ddb 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3341,7 +3341,7 @@ X server.")
(define-public xf86-video-vmware
(package
(name "xf86-video-vmware")
- (version "13.0.2")
+ (version "13.1.0")
(source
(origin
(method url-fetch)
@@ -3351,8 +3351,7 @@ X server.")
".tar.bz2"))
(sha256
(base32
- "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8"))
- (patches (list (search-patch "xf86-video-vmware-glibc-2.20.patch")))))
+ "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"))))
(build-system gnu-build-system)
(inputs `(("libx11" ,libx11)
("libxext" ,libxext)