TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: xf86-video-r128: Update to 6.10.1.

Browse source 
* 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.
This commit is contained in:
Andy Wingo 2016-02-18 21:16:13 +01:00 committed by Mark H Weaver
parent 9f9b89bcf2
commit bfe27469b4
3 changed files with 2 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu-system.am
View file

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

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

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

5
gnu/packages/xorg.scm
View file

@ -3079,7 +3079,7 @@ (define-public xf86-video-openchrome
(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 @@ (define-public xf86-video-r128
".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)