diff options
| author | Andy Wingo <wingo@igalia.com> | 2016-02-18 21:13:52 +0100 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-02-24 11:49:57 -0500 |
| commit | ea192db1195eff5a821e804064cd6ae883505163 (patch) | |
| tree | 1918857d4215084c189ed834061ed518e7972524 | |
| parent | 2a26eb96d3bc334586dcf0bdf834f67a685e14ae (diff) | |
| download | guix-ea192db1195eff5a821e804064cd6ae883505163.tar.gz | |
gnu: xf86-video-mga: Update to 1.6.4.
* gnu/packages/patches/xf86-video-mga-glibc-2.20.patch: Delete file. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/xorg.scm (xf86-video-mga): Update to 1.6.4. [source]: Remove patch.
| -rw-r--r-- | gnu-system.am | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/xf86-video-mga-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 a93b005c17..3f8a4cc6b1 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -771,7 +771,6 @@ dist_patch_DATA = \ 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-mga-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 \ diff --git a/gnu/packages/patches/xf86-video-mga-glibc-2.20.patch b/gnu/packages/patches/xf86-video-mga-glibc-2.20.patch deleted file mode 100644 index 3b8277df80..0000000000 --- a/gnu/packages/patches/xf86-video-mga-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-mga-1.6.3/configure.~1~ 2013-12-04 21:10:25.000000000 -0500 -+++ xf86-video-mga-1.6.3/configure 2014-12-19 01:06:23.005774736 -0500 -@@ -18464,7 +18464,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 c70d4f7e96..1e650f8196 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -2890,7 +2890,7 @@ the same level of support for generic VGA or 8514/A adapters.") (define-public xf86-video-mga (package (name "xf86-video-mga") - (version "1.6.3") + (version "1.6.4") (source (origin (method url-fetch) @@ -2900,8 +2900,7 @@ the same level of support for generic VGA or 8514/A adapters.") ".tar.bz2")) (sha256 (base32 - "1my7y67sadjjmab1dyxckylrggi7p01yk4wwg9w6k1q96pmb213p")) - (patches (list (search-patch "xf86-video-mga-glibc-2.20.patch"))))) + "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86driproto" ,xf86driproto) |