me/guix
Archived
1
0
Fork 0
Code Activity

gnu: xf86-video-mach64: Update to 6.9.4.

Browse source 
* 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.
This commit is contained in:
Mark H Weaver 2014-12-19 20:48:18 -05:00
parent 49a9099ebc
commit e7908a24d3
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu-system.am
View file

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

17
gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch Normal file
View file

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

7
gnu/packages/xorg.scm
View file

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