summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch')
-rw-r--r--x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.15-xf86Modes-include2.patch22
1 files changed, 22 insertions, 0 deletions
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