diff options
4 files changed, 66 insertions, 6 deletions
diff --git a/x11-drivers/xf86-video-openchrome/ChangeLog b/x11-drivers/xf86-video-openchrome/ChangeLog index d5b69a39d28a..85576e372e15 100644 --- a/x11-drivers/xf86-video-openchrome/ChangeLog +++ b/x11-drivers/xf86-video-openchrome/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-drivers/xf86-video-openchrome -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.74 2014/02/20 11:46:20 chithanh Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/ChangeLog,v 1.75 2015/01/15 13:19:13 pacho Exp $ + + 15 Jan 2015; Pacho Ramos <pacho@gentoo.org> + +files/xf86-video-openchrome-0.3.3-glibc-2.20.patch, + xf86-video-openchrome-0.3.3.ebuild: + Fix building with glibc-2.20 (#526728) 20 Feb 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> -xf86-video-openchrome-0.3.1.ebuild, -xf86-video-openchrome-0.3.2.ebuild, diff --git a/x11-drivers/xf86-video-openchrome/Manifest b/x11-drivers/xf86-video-openchrome/Manifest index e82d2c5d4303..9477b09f2fad 100644 --- a/x11-drivers/xf86-video-openchrome/Manifest +++ b/x11-drivers/xf86-video-openchrome/Manifest @@ -1,4 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX xf86-video-openchrome-0.3.3-glibc-2.20.patch 1233 SHA256 43a6ec34b5e0187edcbdf0878c4fd95b3d07461b881a2aeb211cd4a83d4c2657 SHA512 6a416243511b013cb145ce6c947d02f18d3fb39e66d1aaa9b7ac13cc85c90972e140c8275abf2ab840135b2c8565f0fe99899751707ddb9ba64a3bd7265ddbd0 WHIRLPOOL f4006e872b0016d8d7dcc4395cd30eeec27ec7748fd819db69ee4f6ccac8322b117c56522471ac1e91fc27916bc03fdba8c9f8156092c4adedb2e714fbb65acd DIST xf86-video-openchrome-0.3.3.tar.bz2 518705 SHA256 e49e2f1e5dac86408e5a74b87038cc4082d2c3fba4e0579823161991432412ed SHA512 ed1c30a6d92b804648de324d98ca61bd7887b4b97ed94e5b0c1f5abaf7d0dbb5ba1dc79e7c35a8cd76bff0d5b05594921bddc9007ef9ba00e72d0b9bd678de9e WHIRLPOOL d22b8a6ffaaad33a705a725abb018b9637097011f83682c10a6c72a8ffce29ae82341080a86d82203f00aad2fec9c94fda5065c9df7494a4fc858843292e75ab -EBUILD xf86-video-openchrome-0.3.3.ebuild 1310 SHA256 542de1c8edfcb70a69d8b79ef8ba4ef3fa4f4b71a777bae55cb53cde5389ffbe SHA512 8cdefd8852c8b53b05bccfdab48efefd65cbd35f02d7933f057895a0ba33a7fbb3549c7a5212b6ba39503e65d350e31d8a16ca7b07f5d04fd9cb130a17cfa67b WHIRLPOOL 0f50ead738adcfc22fd70956952248786479ca20de0f32e7dc1aea59593de31b1636c01d22e2e56e4c788d4c173cd324ead750d06a31a5698b2051547a187a92 -MISC ChangeLog 12871 SHA256 74fb8f728cc5232e48696e0cccdd16a3af57b66834936fcc03f94c9961e61cdc SHA512 69dcfc9e788773825ed08d949c356b3352233f27e3877e763ba309a6b1351303c34d5e8e33ec1871168a2b51a3e72839a0fca9bbfeae433199d92dee9b2df7fa WHIRLPOOL f9a54ea70d8b4c3be8e80ef148ab396386e331c92d550fa49243bb12b2e8f031ff31d20594dbb06be3ec7345973f0e19b8e18ea9c6bcf439561378ecdf670210 +EBUILD xf86-video-openchrome-0.3.3.ebuild 1364 SHA256 55be778a03f855cc93555a1a55c43440cfade8ad0c8c562ab527aa84c586eebb SHA512 bf6353eda69ceda1318d30bff4c0cbdb5a27ac089dd3794e4732a373de0226d4c4847f7682d59a6f871d0fc5046efaa2317aff93d39686cd67f684244c4e63bc WHIRLPOOL 1742f224bd8dc2929ddc8019a3abd04ca56cb30512c3a59698e957b47b935f349ee26db1c04eda6df8792d15e49cc9ef295e11545ca0bdc00302cb45cf2fbd6a +MISC ChangeLog 13049 SHA256 4fcd2b59ed9522bf21507fd7d2a9143582c4fe242875ee709a19289a936d5f2d SHA512 5624c68e0d87235531aa0f311e42cc777e52ac702f42a830585baf1734d1fe85a783afeacd34b1fd834c35e1b558fc6a0c7188f9cc873a25269f31cda21970dc WHIRLPOOL 89f7194bbd5dd2fa49aeed0289f854bbe9aac7edebe07c8f0cddb19deab03f1aa0e1dbb0435daa4c2de70458cf1fc1a41c75baec5996cedc44ecbbb8622b369f MISC metadata.xml 230 SHA256 8a201413caed89294342b4155b5796d3964976c9e64bba1956c0166adfc74067 SHA512 c6acea9b97a0d4cca996be238105f688c861f78ddba70bee28ec57a43c3a8e75169a3dd29954eff8a07573198d566871fae118c4f387afcec368f174ef138a13 WHIRLPOOL a0585b90484fd22357de316fd8edca99327a733ae0e5e3b8057a93e4141bd49d1817617b837a3d2862447645c9d3f3ec9d4ff5e7039c417ba20d3d2e5badc1c4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEAREIAAYFAlS3vlQACgkQCaWpQKGI+9SW1QCfQVY6Qk5v31TRcr3PAFgi2Ctn +Qm4An0vffmSHW7wT+bIynnCnsHqiC2Lt +=DuSs +-----END PGP SIGNATURE----- diff --git a/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.3.3-glibc-2.20.patch b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.3.3-glibc-2.20.patch new file mode 100644 index 000000000000..7d96f8701a27 --- /dev/null +++ b/x11-drivers/xf86-video-openchrome/files/xf86-video-openchrome-0.3.3-glibc-2.20.patch @@ -0,0 +1,42 @@ +From 879f098cf8b8dc134569b9943f9665bfae17467e Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch <sndirsch@suse.de> +Date: Wed, 5 Nov 2014 11:29:37 +0100 +Subject: [PATCH] xf86.h cannot be included without first including + xorg-server.h. + +Without this the build fails on systems with the latest glibc, +throwing this error: + +In file included from /usr/include/string.h:634:0, + from /usr/include/xorg/os.h:53, + from /usr/include/xorg/misc.h:115, + from /usr/include/xorg/xf86str.h:37, + from /usr/include/xorg/xf86.h:44, + from via_3d.h:28, + from via_3d.c:24: +/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' + strndup(const char *str, size_t n); + +This is caused by HAVE_STRNDUP not being set (it is set from xorg-server.h), +causing os.h to redefine it. + +Signed-off-by: Stefan Dirsch <sndirsch@suse.de> +--- + src/via_3d.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/via_3d.h b/src/via_3d.h +index c33228e..15be0be 100644 +--- a/src/via_3d.h ++++ b/src/via_3d.h +@@ -24,6 +24,7 @@ + #ifndef VIA_3D_H + #define VIA_3D_H + ++#include "xorg-server.h" + #include "xf86.h" + #include "via_dmabuffer.h" + +-- +1.8.4.5 + diff --git a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.3.ebuild b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.3.ebuild index b1eb72e28dc6..77a9a5869236 100644 --- a/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.3.ebuild +++ b/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.3.ebuild,v 1.4 2014/02/20 11:46:20 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-openchrome/xf86-video-openchrome-0.3.3.ebuild,v 1.5 2015/01/15 13:19:13 pacho Exp $ EAPI=5 XORG_DRI="always" @@ -25,6 +25,8 @@ DEPEND=" DOCS=( ChangeLog NEWS README ) +PATCHES=( "${FILESDIR}"/${P}-glibc-2.20.patch ) #526728 + src_configure() { XORG_CONFIGURE_OPTIONS=( $(use_enable debug) |