aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2016-08-27 23:17:07 +0300
committerEfraim Flashner <efraim@flashner.co.il>2016-08-28 20:31:30 +0300
commit7ca3ce6b9f0a93f214cdfdd480da2aea2ce40453 (patch)
treea19ae1b0bbc33b8e358abfee1fd02ce035a7026d /gnu
parent346b08564286c6695a23488beed551b3bf79e17a (diff)
downloadguix-7ca3ce6b9f0a93f214cdfdd480da2aea2ce40453.tar
guix-7ca3ce6b9f0a93f214cdfdd480da2aea2ce40453.tar.gz
gnu: xf86-video-openchrome: Update to 0.5.0.
* gnu/packages/xorg.scm (xf86-video-openchrome): Update to 0.5.0. [source]: Remove patch. * gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch15
-rw-r--r--gnu/packages/xorg.scm7
3 files changed, 3 insertions, 20 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 98c8848135..7ce8ad0db1 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -857,7 +857,6 @@ dist_patch_DATA = \
%D%/packages/patches/xf86-video-intel-glibc-2.20.patch \
%D%/packages/patches/xf86-video-mach64-glibc-2.20.patch \
%D%/packages/patches/xf86-video-nv-remove-mibstore.patch \
- %D%/packages/patches/xf86-video-openchrome-glibc-2.20.patch \
%D%/packages/patches/xf86-video-tga-remove-mibstore.patch \
%D%/packages/patches/xfce4-panel-plugins.patch \
%D%/packages/patches/xfce4-session-fix-xflock4.patch \
diff --git a/gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch b/gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch
deleted file mode 100644
index 4ed7ab00bf..0000000000
--- a/gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Allow builds with glibc 2.20.
-Based on 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-openchrome-0.3.3/src/via_3d.h.~1~ 2013-05-23 11:11:28.000000000 -0400
-+++ xf86-video-openchrome-0.3.3/src/via_3d.h 2014-12-19 01:17:04.000953259 -0500
-@@ -24,6 +24,8 @@
- #ifndef VIA_3D_H
- #define VIA_3D_H
-
-+#include <xorg-server.h>
-+
- #include "xf86.h"
- #include "via_dmabuffer.h"
-
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index c2a0e90269..524b26b238 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3072,7 +3072,7 @@ graphics cards.")
(define-public xf86-video-openchrome
(package
(name "xf86-video-openchrome")
- (version "0.3.3")
+ (version "0.5.0")
(source
(origin
(method url-fetch)
@@ -3081,9 +3081,8 @@ graphics cards.")
version
".tar.bz2"))
(sha256
- (base32
- "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4"))
- (patches (search-patches "xf86-video-openchrome-glibc-2.20.patch"))))
+ (base32
+ "1fsmr455lk89zl795d6b5ypyqjim40j3h2vjch52lcssjw9xdza9"))))
(build-system gnu-build-system)
(inputs `(("libx11" ,libx11)
("libxext" ,libxext)