ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: xf86-video-vmware: Update to 13.1.0.

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2016-02-18 21:29:02 +01:00 committed by Mark H Weaver
parent 937c13f220
commit 2ae7a55062
3 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu-system.am
View file

@ -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 \

15
gnu/packages/patches/xf86-video-vmware-glibc-2.20.patch
View file

@ -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(...)

5
gnu/packages/xorg.scm
View file

@ -3341,7 +3341,7 @@ (define-public xf86-video-vesa
(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 @@ (define-public xf86-video-vmware
".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)