diff options
| author | Andy Wingo <wingo@igalia.com> | 2016-02-18 21:16:13 +0100 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-02-24 11:49:57 -0500 |
| commit | bfe27469b43a4d01d781ad8eec1223ab7966e207 (patch) | |
| tree | 2f2b0b7c539d9a3be8ac7b26e92423493f13038a | |
| parent | 9f9b89bcf2bd65539ab72af80f9be34f4945630e (diff) | |
| download | guix-bfe27469b43a4d01d781ad8eec1223ab7966e207.tar.gz | |
gnu: xf86-video-r128: Update to 6.10.1.
* gnu/packages/patches/xf86-video-r128-glibc-2.20.patch: Delete file. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/xorg.scm (xf86-video-r128): Update to 6.10.1. [source]: Remove patch.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/xf86-video-r128-glibc-2.20.patch | 17 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 5 |
3 files changed, 2 insertions, 21 deletions
diff --git a/gnu-system.am b/gnu-system.am index 3f8a4cc6b1..dee8fb7e38 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -773,7 +773,6 @@ dist_patch_DATA = \ gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch \ gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \ gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \ - gnu/packages/patches/xf86-video-r128-glibc-2.20.patch \ gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch \ gnu/packages/patches/xf86-video-sis-fix-exa-crash.patch \ gnu/packages/patches/xf86-video-sis-update-api.patch \ diff --git a/gnu/packages/patches/xf86-video-r128-glibc-2.20.patch b/gnu/packages/patches/xf86-video-r128-glibc-2.20.patch deleted file mode 100644 index 21a430ebc6..0000000000 --- a/gnu/packages/patches/xf86-video-r128-glibc-2.20.patch +++ /dev/null @@ -1,17 +0,0 @@ -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-r128-6.9.2/configure.~1~ 2013-10-02 14:38:15.000000000 -0400 -+++ xf86-video-r128-6.9.2/configure 2014-12-19 01:23:03.346735159 -0500 -@@ -18400,7 +18400,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 22ca3f9883..4dcda98431 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3079,7 +3079,7 @@ UniChrome Pro and Chrome9 integrated graphics processors.") (define-public xf86-video-r128 (package (name "xf86-video-r128") - (version "6.9.2") + (version "6.10.1") (source (origin (method url-fetch) @@ -3089,8 +3089,7 @@ UniChrome Pro and Chrome9 integrated graphics processors.") ".tar.bz2")) (sha256 (base32 - "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb")) - (patches (list (search-patch "xf86-video-r128-glibc-2.20.patch"))))) + "1sp4glyyj23rs77vgffmn0mar5h504a86701nzvi56qwhd4yzgsy")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86driproto" ,xf86driproto) |