sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Robin Cook (075ca78cec9958234b68ab0042b17fb6b5914600)

From: Robin Cook <scm AT mail.sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (075ca78cec9958234b68ab0042b17fb6b5914600)
Date: Wed, 27 Dec 2006 19:57:34 -0600

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

display/svgalib/HISTORY | 3 +++
display/svgalib/PRE_BUILD | 4 +++-
display/svgalib/svgalib_helper-2.6.19.diff | 16 ++++++++++++++++
3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit 075ca78cec9958234b68ab0042b17fb6b5914600
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

svgalib: apply patch to build against 2.6.19

diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY
index fa9132b..6d2355c 100644
--- a/display/svgalib/HISTORY
+++ b/display/svgalib/HISTORY
@@ -1,3 +1,6 @@
+2006-12-27 Robin Cook <rcook AT wyrms.net>
+ * PRE_BUILD: added to apply patch for 2.6.19
+
2006-11-08 George Sherwood <george AT beernabeer.com>
* BUILD: Simplify if statement. Fixes bug 13226 with bash 3.2
* INSTALL: Fix if statement to work the same way.
diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD
index a66000d..72b73ef 100755
--- a/display/svgalib/PRE_BUILD
+++ b/display/svgalib/PRE_BUILD
@@ -10,7 +10,9 @@ sedit "s:\$(shell uname -r):$KER:g"

# Apply patchs for kernel versions 2.6.15* and newer
KER=${KER:0:6} &&
-if [ ${KER//\./} > 2617 ]; then
+if [ ${KER//\./} > 2619 ]; then
+ patch -p0 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.19.diff
+elif [ ${KER//\./} > 2617 ]; then
patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.18.diff
elif [ ${KER//\./} == 2617 ]; then
patch -p0 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.17.diff
diff --git a/display/svgalib/svgalib_helper-2.6.19.diff
b/display/svgalib/svgalib_helper-2.6.19.diff
new file mode 100644
index 0000000..e27c563
--- /dev/null
+++ b/display/svgalib/svgalib_helper-2.6.19.diff
@@ -0,0 +1,16 @@
+--- kernel/svgalib_helper/main.c.orig 2006-12-27 18:21:28.000000000 -0600
++++ kernel/svgalib_helper/main.c 2006-12-27 18:21:45.000000000 -0600
+@@ -1,5 +1,3 @@
+-#include <linux/config.h>
+-
+ #if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
+ # define MODVERSIONS
+ #endif
+@@ -17,7 +15,6 @@
+ #include <linux/ioport.h>
+ #include <linux/interrupt.h>
+ #include <linux/pci.h>
+-#include <linux/devfs_fs_kernel.h>
+ #include <linux/mm.h>
+ #include <linux/thread_info.h>
+ #include <linux/smp.h>

[SM-Commit] GIT changes to master grimoire by Robin Cook (075ca78cec9958234b68ab0042b17fb6b5914600), Robin Cook, 12/27/2006