[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: gnu: xf86-video-vmware: Fix build by removing patches.
From: |
Andy Wingo |
Subject: |
06/06: gnu: xf86-video-vmware: Fix build by removing patches. |
Date: |
Wed, 24 Feb 2016 08:59:25 +0000 |
wingo pushed a commit to branch media-updates
in repository guix.
commit 6a784e3cea10705f85439ac9aabcb2a9a9d62685
Author: Andy Wingo <address@hidden>
Date: Wed Feb 24 09:42:36 2016 +0100
gnu: xf86-video-vmware: Fix build by removing patches.
* gnu/packages/xorg.scm (xf86-video-vmware): Remove patches.
* gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch: Remove.
---
.../patches/xf86-video-vmware-glibc-2.20.patch | 15 ---------------
gnu/packages/xorg.scm | 3 +--
2 files changed, 1 insertions(+), 17 deletions(-)
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 43d21d1..0000000
--- 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 <address@hidden>.
-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 172ebc3..61ba555 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3351,8 +3351,7 @@ X server.")
".tar.bz2"))
(sha256
(base32
- "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"))
- (patches (list (search-patch "xf86-video-vmware-glibc-2.20.patch")))))
+ "1k50whwnkzxam2ihc1sw456dx0pvr76naycm4qhyjxqv9d72879w"))))
(build-system gnu-build-system)
(inputs `(("libx11" ,libx11)
("libxext" ,libxext)
- branch media-updates updated (5b657b8 -> 6a784e3), Andy Wingo, 2016/02/24
- 01/06: gnu: xf86-video-mga: Downgrade to 1.6.4., Andy Wingo, 2016/02/24
- 02/06: gnu: xf86-video-r128: Fix build by removing patches., Andy Wingo, 2016/02/24
- 03/06: gnu: xf86-video-siliconmotion: Fix build., Andy Wingo, 2016/02/24
- 04/06: gnu: xf86-video-tdfx: Fix build, Andy Wingo, 2016/02/24
- 05/06: gnu: xf86-video-trident: Fix build., Andy Wingo, 2016/02/24
- 06/06: gnu: xf86-video-vmware: Fix build by removing patches.,
Andy Wingo <=