diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-12-19 21:04:35 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-12-19 23:28:16 -0500 |
| commit | 3d7d909c9da0545eb6b9b98bf63335a76eea037b (patch) | |
| tree | 4286fbb7c064e434cca22d5446784377e159b635 /gnu/packages/patches | |
| parent | fc7a0cf6785b2134ca8c07aa98e6f0c6dfa811ba (diff) | |
| download | guix-3d7d909c9da0545eb6b9b98bf63335a76eea037b.tar.gz | |
gnu: xf86-video-openchrome: Update to 0.3.3.
* gnu/packages/patches/xf86-video-openchrome-includes.patch: Remove. * gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch: New file. * gnu-system.am (dist_patch_DATA): Add it and remove the other. * gnu/packages/xorg.scm (xf86-video-openchrome): Update to 0.3.3. Add one patch and remove the other.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/patches/xf86-video-openchrome-includes.patch | 35 |
2 files changed, 15 insertions, 35 deletions
diff --git a/gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch b/gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch new file mode 100644 index 0000000000..4ed7ab00bf --- /dev/null +++ b/gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch @@ -0,0 +1,15 @@ +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-openchrome-0.3.3/src/via_3d.h.~1~ 2013-05-23 11:11:28.000000000 -0400 ++++ xf86-video-openchrome-0.3.3/src/via_3d.h 2014-12-19 01:17:04.000953259 -0500 +@@ -24,6 +24,8 @@ + #ifndef VIA_3D_H + #define VIA_3D_H + ++#include <xorg-server.h> ++ + #include "xf86.h" + #include "via_dmabuffer.h" + diff --git a/gnu/packages/patches/xf86-video-openchrome-includes.patch b/gnu/packages/patches/xf86-video-openchrome-includes.patch deleted file mode 100644 index 3c79596387..0000000000 --- a/gnu/packages/patches/xf86-video-openchrome-includes.patch +++ /dev/null @@ -1,35 +0,0 @@ -This follows the same rationale as xf86-input-synaptics-glibc-2.20.patch -to allow building with glibc-2.20. -diff -u -r xf86-video-openchrome-0.2.906.old/src/via_3d.h xf86-video-openchrome-0.2.906/src/via_3d.h ---- xf86-video-openchrome-0.2.906.old/src/via_3d.h 2014-11-23 14:04:58.000000000 +0100 -+++ xf86-video-openchrome-0.2.906/src/via_3d.h 2014-11-23 14:18:37.000000000 +0100 -@@ -24,6 +24,7 @@ - #ifndef VIA_3D_H - #define VIA_3D_H - -+#include "xorg-server.h" - #include "xf86.h" - #include "via_dmabuffer.h" - -diff -u -r xf86-video-openchrome-0.2.906.old/src/via_driver.h xf86-video-openchrome-0.2.906/src/via_driver.h ---- xf86-video-openchrome-0.2.906.old/src/via_driver.h 2014-11-23 14:04:58.000000000 +0100 -+++ xf86-video-openchrome-0.2.906/src/via_driver.h 2014-11-23 14:21:43.000000000 +0100 -@@ -35,6 +35,7 @@ - #endif - - #include "vgaHW.h" -+#include "xorg-server.h" - #include "xf86.h" - - #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 -diff -u -r xf86-video-openchrome-0.2.906.old/src/via_timing.h xf86-video-openchrome-0.2.906/src/via_timing.h ---- xf86-video-openchrome-0.2.906.old/src/via_timing.h 2014-11-23 14:04:58.000000000 +0100 -+++ xf86-video-openchrome-0.2.906/src/via_timing.h 2014-11-23 14:20:50.000000000 +0100 -@@ -25,6 +25,7 @@ - #ifndef _TIMING_H_ - #define _TIMING_H_ - -+#include "xorg-server.h" - #include "xf86.h" - - /* Aspect ratio not CVT standard */ |