summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2014-12-19 20:48:18 -0500
committerMark H Weaver <mhw@netris.org>2014-12-19 23:28:16 -0500
commite7908a24d3d570347d7281f88613bd180ec8cc2c (patch)
tree8115a4e084b19b4ff0277045c2ad9a2d99a4f158
parent49a9099ebc2cd3a31d274613f307b66cd0df2204 (diff)
gnu: xf86-video-mach64: Update to 6.9.4.
* gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. * gnu/packages/xorg.scm (xf86-video-mach64): Update to 6.9.4. Add patch.
-rw-r--r--gnu-system.am1
-rw-r--r--gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch17
-rw-r--r--gnu/packages/xorg.scm7
3 files changed, 22 insertions, 3 deletions
diff --git a/gnu-system.am b/gnu-system.am
index 2dcb29a67f..1cf72dd074 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -465,6 +465,7 @@ dist_patch_DATA = \
gnu/packages/patches/xf86-video-i128-remove-mibstore.patch \
gnu/packages/patches/xf86-video-intel-compat-api.patch \
gnu/packages/patches/xf86-video-intel-glibc-2.20.patch \
+ gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch \
gnu/packages/patches/xf86-video-openchrome-includes.patch \
gnu/packages/patches/xfce4-panel-plugins.patch \
gnu/packages/patches/xmodmap-asprintf.patch
diff --git a/gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch b/gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch
new file mode 100644
index 0000000000..7fb1452c20
--- /dev/null
+++ b/gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch
@@ -0,0 +1,17 @@
+Fix test compilation with exa.h in configure when using glibc 2.20.
+Inspired by 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-mach64-6.9.4/configure.~1~ 2012-12-20 01:16:10.000000000 -0500
++++ xf86-video-mach64-6.9.4/configure 2014-12-19 02:48:18.040097554 -0500
+@@ -18370,7 +18370,9 @@
+
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+- ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default"
++ ac_fn_c_check_header_mongrel "$LINENO" "exa.h" "ac_cv_header_exa_h" "$ac_includes_default
++#include <xorg-server.h>
++"
+ if test "x$ac_cv_header_exa_h" = xyes; then :
+ have_exa_h="yes"
+ else
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 2670bd4a5e..5b5d11b717 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -2614,17 +2614,18 @@ devices, thus making direct access unnecessary.")
(define-public xf86-video-mach64
(package
(name "xf86-video-mach64")
- (version "6.9.1")
+ (version "6.9.4")
(source
(origin
(method url-fetch)
(uri (string-append
- "mirror://xorg/X11R7.7/src/everything/xf86-video-mach64-"
+ "mirror://xorg/individual/driver/xf86-video-mach64-"
version
".tar.bz2"))
(sha256
(base32
- "0kl3kvpc2ny48z89313i9fi4cxzwb2pllvxcr9j5ly680ygx8slz"))))
+ "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp"))
+ (patches (list (search-patch "xf86-video-mach64-glibc-2.20.patch")))))
(build-system gnu-build-system)
(inputs `(("mesa" ,mesa)
("xf86driproto" ,xf86driproto)