diff options
| author |   Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-02-24 20:55:05 +0000 |
|---|---|---|
| committer | Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> | 2014-02-24 20:55:05 +0000 |
| commit | 83e274c65d4b9baccb993becac8e7729f08d962d (patch) | |
| tree | 5c2254fc2b9efa1e10e8a03fe0fe043118f1648f /x11-drivers/xf86-video-geode/files | |
| parent | Update ebuild to EAPI 5. Specify LICENSE more precisely. (diff) | |
| download | historical-83e274c65d4b9baccb993becac8e7729f08d962d.tar.gz historical-83e274c65d4b9baccb993becac8e7729f08d962d.tar.bz2 historical-83e274c65d4b9baccb993becac8e7729f08d962d.zip | |
Fix building against xorg-server-1.15
Package-Manager: portage-2.2.7/cvs/Linux x86_64
Diffstat (limited to 'x11-drivers/xf86-video-geode/files')
| -rw-r--r-- | x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include.patch | 23 | ||||
| -rw-r--r-- | x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch | 22 |
2 files changed, 45 insertions, 0 deletions
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 <martin-eric.racine@iki.fi> +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 <xf86.h> ++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,0,0,0) ++#include <xf86Modes.h> ++#endif + #include <xf86_OSproc.h> + #include <compiler.h> + +-- +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 <martin-eric.racine@iki.fi> +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 <xf86.h> +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,0,0,0) + #include <xf86Modes.h> +-#endif + #include <xf86_OSproc.h> + #include <compiler.h> + +-- +cgit v0.9.0.2-2-gbebe |