From 24ea882a6d488c3b569925a880555ea40b9bb91a Mon Sep 17 00:00:00 2001 From: Chí-Thanh Christopher Nguyễn Date: Mon, 24 Feb 2014 20:55:01 +0000 Subject: Fix building against xorg-server-1.15 (Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) --- x11-drivers/xf86-video-geode/ChangeLog | 10 ++++++++-- ...f86-video-geode-2.11.15-xf86Modes-include.patch | 23 ++++++++++++++++++++++ ...86-video-geode-2.11.15-xf86Modes-include2.patch | 22 +++++++++++++++++++++ .../xf86-video-geode-2.11.14-r1.ebuild | 4 ++-- .../xf86-video-geode-2.11.15.ebuild | 9 +++++++-- 5 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include.patch create mode 100644 x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch (limited to 'x11-drivers') diff --git a/x11-drivers/xf86-video-geode/ChangeLog b/x11-drivers/xf86-video-geode/ChangeLog index 20d1b1953e76..03af86952bb8 100644 --- a/x11-drivers/xf86-video-geode/ChangeLog +++ b/x11-drivers/xf86-video-geode/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-drivers/xf86-video-geode -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/ChangeLog,v 1.24 2013/12/24 12:50:03 ago Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/ChangeLog,v 1.25 2014/02/24 20:55:01 chithanh Exp $ + + 24 Feb 2014; Chí-Thanh Christopher Nguyễn + +files/xf86-video-geode-2.11.15-xf86Modes-include.patch, + +files/xf86-video-geode-2.11.15-xf86Modes-include2.patch, + xf86-video-geode-2.11.14-r1.ebuild, xf86-video-geode-2.11.15.ebuild: + Fix building against xorg-server-1.15 24 Dec 2013; Agostino Sarubbo xf86-video-geode-2.11.14-r1.ebuild: diff --git a/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include.patch b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include.patch new file mode 100644 index 000000000000..d93bbab526c5 --- /dev/null +++ b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include.patch @@ -0,0 +1,23 @@ +From 9707a7a5eac25536a5150fc12d9ace52420b4d36 Mon Sep 17 00:00:00 2001 +From: Martin-Éric Racine +Date: Sat, 08 Feb 2014 11:27:11 +0000 +Subject: Added conditional include to fix FTBFS on xserver 1.15 and up. + +Thanks to Maarten Lankhorst for the fix. +--- +diff --git a/src/geode_dcon.c b/src/geode_dcon.c +index 5580c96..c2b9c53 100644 +--- a/src/geode_dcon.c ++++ b/src/geode_dcon.c +@@ -29,6 +29,9 @@ + + /* Includes that are used by all drivers */ + #include ++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,0,0,0) ++#include ++#endif + #include + #include + +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch new file mode 100644 index 000000000000..1851c31a148d --- /dev/null +++ b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch @@ -0,0 +1,22 @@ +From 70b131d09b7d21df1d1ffcf6a4e50d3086924228 Mon Sep 17 00:00:00 2001 +From: Martin-Éric Racine +Date: Sat, 08 Feb 2014 12:58:26 +0000 +Subject: No need to conditionalize the xf86Modes.h include. + +--- +diff --git a/src/geode_dcon.c b/src/geode_dcon.c +index c2b9c53..5efd79e 100644 +--- a/src/geode_dcon.c ++++ b/src/geode_dcon.c +@@ -29,9 +29,7 @@ + + /* Includes that are used by all drivers */ + #include +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,0,0,0) + #include +-#endif + #include + #include + +-- +cgit v0.9.0.2-2-gbebe diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild index 25d91e775d81..4c3331321dcb 100644 --- a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild +++ b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild,v 1.2 2013/12/24 12:50:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild,v 1.3 2014/02/24 20:55:01 chithanh Exp $ EAPI=5 inherit xorg-2 diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.15.ebuild b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.15.ebuild index 67aa35137c75..aaf3f0b3fcda 100644 --- a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.15.ebuild +++ b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.15.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.15.ebuild,v 1.1 2013/10/13 23:52:53 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.15.ebuild,v 1.2 2014/02/24 20:55:01 chithanh Exp $ EAPI=5 inherit xorg-2 @@ -16,6 +16,11 @@ DEPEND="${RDEPEND} sys-kernel/linux-headers )" +PATCHES=( + "${FILESDIR}"/${P}-xf86Modes-include.patch + "${FILESDIR}"/${P}-xf86Modes-include2.patch +) + pkg_setup() { XORG_CONFIGURE_OPTIONS=( $(use_enable ztv) -- cgit v1.2.3-65-gdbad