| 1 |
chithanh 14/02/24 20:55:01 |
| 2 |
|
| 3 |
Added: xf86-video-geode-2.11.15-xf86Modes-include.patch |
| 4 |
xf86-video-geode-2.11.15-xf86Modes-include2.patch |
| 5 |
Log: |
| 6 |
Fix building against xorg-server-1.15 |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: xf86-video-geode-2.11.15-xf86Modes-include.patch |
| 17 |
=================================================================== |
| 18 |
From 9707a7a5eac25536a5150fc12d9ace52420b4d36 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Martin-Éric Racine <martin-eric.racine@×××.fi> |
| 20 |
Date: Sat, 08 Feb 2014 11:27:11 +0000 |
| 21 |
Subject: Added conditional include to fix FTBFS on xserver 1.15 and up. |
| 22 |
|
| 23 |
Thanks to Maarten Lankhorst for the fix. |
| 24 |
--- |
| 25 |
diff --git a/src/geode_dcon.c b/src/geode_dcon.c |
| 26 |
index 5580c96..c2b9c53 100644 |
| 27 |
--- a/src/geode_dcon.c |
| 28 |
+++ b/src/geode_dcon.c |
| 29 |
@@ -29,6 +29,9 @@ |
| 30 |
|
| 31 |
/* Includes that are used by all drivers */ |
| 32 |
#include <xf86.h> |
| 33 |
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,0,0,0) |
| 34 |
+#include <xf86Modes.h> |
| 35 |
+#endif |
| 36 |
#include <xf86_OSproc.h> |
| 37 |
#include <compiler.h> |
| 38 |
|
| 39 |
-- |
| 40 |
cgit v0.9.0.2-2-gbebe |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: xf86-video-geode-2.11.15-xf86Modes-include2.patch |
| 50 |
=================================================================== |
| 51 |
From 70b131d09b7d21df1d1ffcf6a4e50d3086924228 Mon Sep 17 00:00:00 2001 |
| 52 |
From: Martin-Éric Racine <martin-eric.racine@×××.fi> |
| 53 |
Date: Sat, 08 Feb 2014 12:58:26 +0000 |
| 54 |
Subject: No need to conditionalize the xf86Modes.h include. |
| 55 |
|
| 56 |
--- |
| 57 |
diff --git a/src/geode_dcon.c b/src/geode_dcon.c |
| 58 |
index c2b9c53..5efd79e 100644 |
| 59 |
--- a/src/geode_dcon.c |
| 60 |
+++ b/src/geode_dcon.c |
| 61 |
@@ -29,9 +29,7 @@ |
| 62 |
|
| 63 |
/* Includes that are used by all drivers */ |
| 64 |
#include <xf86.h> |
| 65 |
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,0,0,0) |
| 66 |
#include <xf86Modes.h> |
| 67 |
-#endif |
| 68 |
#include <xf86_OSproc.h> |
| 69 |
#include <compiler.h> |
| 70 |
|
| 71 |
-- |
| 72 |
cgit v0.9.0.2-2-gbebe |
Archives