Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (f2deac79642d373c6936b52007db4afbdcc46e74)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

Chronological Thread  
    < Chronological >       < Thread >
  • 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 (f2deac79642d373c6936b52007db4afbdcc46e74)
  • Date: Sat, 1 Jul 2006 11:03:09 -0500
GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

display/svgalib/HISTORY | 3
display/svgalib/PRE_BUILD | 6 -
display/svgalib/svgalib_helper-2.6.17.diff | 119
+++++++++++++++++++++++++++++
3 files changed, 126 insertions(+), 2 deletions(-)

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

svgalib: forgot HISTORY

commit 9b18fd67a0fea2b9eac7e1dfb1475a96ef14d463
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

svgalib: add appling patch for kernel 2.6.17

diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY
index 0839c0a..23b39f9 100644
--- a/display/svgalib/HISTORY
+++ b/display/svgalib/HISTORY
@@ -1,3 +1,6 @@
+2006-07-01 Robin Cook
+ * PRE_BUILD: add appling patch for kernel 2.6.17
+
2006-06-28 Eric Sandall <eric AT sandall.us>
* DETAILS: Removed BUILD_API=2, set grimoire-wide

diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD
index dc78813..3a4777e 100755
--- a/display/svgalib/PRE_BUILD
+++ b/display/svgalib/PRE_BUILD
@@ -8,9 +8,11 @@ sedit "s:\$(shell uname -r):$KER:g" ker
sedit "s:\$(shell uname -r):$KER:g" \
kernel/svgalib_helper/Makefile.alt &&

-# Apply patch for kernel versions 2.6.15* and newer
+# Apply patchs for kernel versions 2.6.15* and newer
KER=${KER:0:6} &&
-if (( ${KER//\./} > 2614 )); then
+if [[ ${KER//\./} > 2616 ]]; then
+ patch -p2 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.17.diff
+elif [[ ${KER//\./} > 2614 ]]; then
patch -p2 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.15.diff
fi &&

diff --git a/display/svgalib/svgalib_helper-2.6.17.diff
b/display/svgalib/svgalib_helper-2.6.17.diff
new file mode 100644
index 0000000..f8e2f48
--- /dev/null
+++ b/display/svgalib/svgalib_helper-2.6.17.diff
@@ -0,0 +1,119 @@
+diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/Makefile
svgalib_helper/Makefile
+--- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/Makefile
2005-12-16 14:53:10.000000000 +0200
++++ svgalib_helper/Makefile 2006-05-20 15:31:04.000000000 +0300
+@@ -1,8 +1,6 @@
+
+ SVGALIB_HELPER_MAJOR=209
+
+-# list-multi := svgalib_helper.o
+-
+ svgalib_helper-objs := main.o i810.o interrupt.o virtual.o displaystart.o
+ obj-m := svgalib_helper.o
+
+@@ -6,10 +4,8 @@
+ svgalib_helper-objs := main.o i810.o interrupt.o virtual.o displaystart.o
+ obj-m := svgalib_helper.o
+
+-
+ ifneq ($(KERNELRELEASE),)
+
+-EXTRA_CFLAGS = -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
$(CLASS_CFLAGS)
+ VER ?= $(KERNELRELEASE)
+ KDIR := /lib/modules/$(VER)/build
+ PWD := $(shell pwd)
+@@ -34,6 +31,9 @@
+ CLASS_CFLAGS = -DCLASS_SIMPLE=1
+ endif
+
++EXTRA_CFLAGS := -DSVGALIB_HELPER_MAJOR=$(SVGALIB_HELPER_MAJOR)
$(CLASS_CFLAGS)
++
++
+ default:
+ $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) CLASS_CFLAGS=$(CLASS_CFLAGS) modules
+
+diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/dkms.conf
svgalib_helper/dkms.conf
+--- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/dkms.conf
2005-12-17 21:30:55.000000000 +0200
++++ svgalib_helper/dkms.conf 2006-01-12 19:49:00.000000000 +0200
+@@ -5,5 +5,5 @@
+
+ BUILT_MODULE_NAME="svgalib_helper"
+ PACKAGE_NAME="svgalib_helper"
+-PACKAGE_VERSION="1.9.24"
++PACKAGE_VERSION="1.9.25"
+ AUTOINSTALL="yes"
+diff -urbBw
/usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/kernel26compat.h
svgalib_helper/kernel26compat.h
+--- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/kernel26compat.h
2005-11-05 00:33:00.000000000 +0200
++++ svgalib_helper/kernel26compat.h 2006-05-20 15:17:13.000000000 +0300
+@@ -36,6 +36,11 @@
+ # define KERNEL_2_6
+ # endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++# undef MODULE_PARM
++# define MODULE_PARM(x,y) module_param(x, int, 0)
++#endif
++
+ /* WHY ? */
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
+ # define PCI_GET_CLASS pci_find_class
+@@ -84,6 +89,7 @@
+ # define SLH_SYSFS_REGISTER \
+ svgalib_helper_class = class_create(THIS_MODULE, "svgalib_helper");
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+ # define SLH_SYSFS_ADD_CONTROL \
+ class_device_create(svgalib_helper_class, \
+ MKDEV(SVGALIB_HELPER_MAJOR, 0), \
+@@ -93,6 +99,17 @@
+ class_device_create(svgalib_helper_class, \
+ MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
+ &sh_pci_devs[_minor]->dev->dev, _name);
++#else /* 2.6.15 changed class_device_create */
++# define SLH_SYSFS_ADD_CONTROL \
++ class_device_create(svgalib_helper_class, NULL, \
++ MKDEV(SVGALIB_HELPER_MAJOR, 0), \
++ NULL, "svga");
++
++# define SLH_SYSFS_ADD_DEVICE(_name, _minor) \
++ class_device_create(svgalib_helper_class, NULL, \
++ MKDEV(SVGALIB_HELPER_MAJOR, _minor), \
++ &sh_pci_devs[_minor]->dev->dev, _name);
++#endif /* 2.6.15 */
+
+ # define SLH_SYSFS_REMOVE_DEVICE(i) \
+ class_destroy(svgalib_helper_class);
+@@ -140,3 +157,7 @@
+ #if !defined(MODULE_VERSION)
+ # define MODULE_VERSION(x)
+ #endif
++
++#ifndef PCI_VENDOR_ID_RENDITION
++#define PCI_VENDOR_ID_RENDITION 0x1163
++#endif
+diff -urbBw /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/main.c
svgalib_helper/main.c
+--- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/main.c
2005-12-16 20:17:57.000000000 +0200
++++ svgalib_helper/main.c 2006-01-12 20:17:53.000000000 +0200
+@@ -731,7 +731,6 @@
+ kfree(sh_pci_devs[i]);
+ }
+
+- SLH_SYSFS_REMOVE_DEVICE(0);
+ SLH_SYSFS_UNREGISTER;
+
+ devfs_unregister_chrdev(SVGALIB_HELPER_MAJOR, "svgalib_helper");
+@@ -748,7 +747,6 @@
+ kfree(sh_pci_devs[i]);
+ }
+
+- SLH_SYSFS_REMOVE_DEVICE(0);
+ SLH_SYSFS_UNREGISTER;
+
+ #ifdef CONFIG_DEVFS_FS
+diff -urbBw
/usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/vgaversion.h
svgalib_helper/vgaversion.h
+--- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/vgaversion.h
2005-12-16 20:18:04.000000000 +0200
++++ svgalib_helper/vgaversion.h 2005-12-24 00:25:39.000000000 +0200
+@@ -1,2 +1,2 @@
+-int vga_version=0x1924;
+-static char versionstr[32]="1.9.24";
++int vga_version=0x1925;
++static char versionstr[32]="1.9.25";


  • [SM-Commit] GIT changes to master grimoire by Robin Cook (f2deac79642d373c6936b52007db4afbdcc46e74), Robin Cook, 07/01/2006

Archive powered by MHonArc 2.6.24.

Top of Page