[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
113/116: gnu: xf86-video-vmware: Update to 13.0.2.
From: |
Mark H. Weaver |
Subject: |
113/116: gnu: xf86-video-vmware: Update to 13.0.2. |
Date: |
Sat, 20 Dec 2014 04:39:03 +0000 |
mhw pushed a commit to branch xorg-updates
in repository guix.
commit bd6863c24546826a693359624827627f4d754322
Author: Mark H Weaver <address@hidden>
Date: Fri Dec 19 21:26:54 2014 -0500
gnu: xf86-video-vmware: Update to 13.0.2.
* gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/xorg.scm (xf86-video-vmware): Update to 13.0.2.
Add patch. Add mesa to inputs.
---
gnu-system.am | 1 +
.../patches/xf86-video-vmware-glibc-2.20.patch | 15 +++++++++++++++
gnu/packages/xorg.scm | 8 +++++---
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/gnu-system.am b/gnu-system.am
index 3050e61..2af87af 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -475,6 +475,7 @@ dist_patch_DATA =
\
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 \
gnu/packages/patches/xfce4-panel-plugins.patch \
gnu/packages/patches/xmodmap-asprintf.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
new file mode 100644
index 0000000..43d21d1
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch
@@ -0,0 +1,15 @@
+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 1ec6257..743b178 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3050,20 +3050,22 @@ kernel mode setting (KMS).")
(define-public xf86-video-vmware
(package
(name "xf86-video-vmware")
- (version "12.0.2")
+ (version "13.0.2")
(source
(origin
(method url-fetch)
(uri (string-append
- "mirror://xorg/X11R7.7/src/everything/xf86-video-vmware-"
+ "mirror://xorg/individual/driver/xf86-video-vmware-"
version
".tar.bz2"))
(sha256
(base32
- "0isiwx516gww8hfk3vy7js83yziyjym9mq2zjadyq1a8v5gqf9y8"))))
+ "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8"))
+ (patches (list (search-patch "xf86-video-vmware-glibc-2.20.patch")))))
(build-system gnu-build-system)
(inputs `(("libx11" ,libx11)
("libxext" ,libxext)
+ ("mesa" ,mesa) ; for xatracker
("xorg-server" ,xorg-server)))
(native-inputs
`(("pkg-config" ,pkg-config)))
- 107/116: gnu: xf86-video-suncg6: Update to 1.1.2., (continued)
- 107/116: gnu: xf86-video-suncg6: Update to 1.1.2., Mark H. Weaver, 2014/12/19
- 104/116: gnu: xf86-video-siliconmotion: Update to 1.7.7., Mark H. Weaver, 2014/12/19
- 108/116: gnu: xf86-video-sunffb: Update to 1.2.2., Mark H. Weaver, 2014/12/19
- 109/116: gnu: xf86-video-tdfx: Update to 1.4.5., Mark H. Weaver, 2014/12/19
- 110/116: gnu: xf86-video-tga: Update to 1.2.2., Mark H. Weaver, 2014/12/19
- 111/116: gnu: xf86-video-trident: Update to 1.3.6., Mark H. Weaver, 2014/12/19
- 112/116: gnu: xf86-video-vesa: Update to 2.3.3., Mark H. Weaver, 2014/12/19
- 115/116: gnu: xorg-server: Update to 1.16.2.901, with many security fixes., Mark H. Weaver, 2014/12/19
- 114/116: gnu: xf86-video-voodoo: Update to 1.2.5., Mark H. Weaver, 2014/12/19
- 105/116: gnu: xf86-video-sis: Update to 0.10.7., Mark H. Weaver, 2014/12/19
- 113/116: gnu: xf86-video-vmware: Update to 13.0.2.,
Mark H. Weaver <=
- 102/116: gnu: xf86-video-r128: Update to 6.9.2., Mark H. Weaver, 2014/12/19
- 116/116: gnu: Consistently use modular xorg source URIs in xorg.scm., Mark H. Weaver, 2014/12/19