guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/06: gnu: xf86-video-r128: Fix build by removing patches.


From: Andy Wingo
Subject: 02/06: gnu: xf86-video-r128: Fix build by removing patches.
Date: Wed, 24 Feb 2016 08:56:10 +0000

wingo pushed a commit to branch media-updates
in repository guix.

commit 5517d64accbacc3f52df7e810d3f8289612a346c
Author: Andy Wingo <address@hidden>
Date:   Wed Feb 24 09:40:19 2016 +0100

    gnu: xf86-video-r128: Fix build by removing patches.
    
    * gnu/packages/xorg.scm (xf86-video-r128): Remove patches.
---
 .../patches/xf86-video-r128-glibc-2.20.patch       |   17 -----------------
 gnu/packages/xorg.scm                              |    3 +--
 2 files changed, 1 insertions(+), 19 deletions(-)

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 21a430e..0000000
--- 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 <address@hidden>.
-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 2bdcbe0..c0b998f 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3089,8 +3089,7 @@ UniChrome Pro and Chrome9 integrated graphics 
processors.")
                ".tar.bz2"))
         (sha256
           (base32
-           "1sp4glyyj23rs77vgffmn0mar5h504a86701nzvi56qwhd4yzgsy"))
-        (patches (list (search-patch "xf86-video-r128-glibc-2.20.patch")))))
+           "1sp4glyyj23rs77vgffmn0mar5h504a86701nzvi56qwhd4yzgsy"))))
     (build-system gnu-build-system)
     (inputs `(("mesa" ,mesa)
               ("xf86driproto" ,xf86driproto)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]