Merge branch 'xorg-modular' of /home/sandalle/scm/git/smgl/grimoire/ into xorg-modular

Remember kids, make sure your branch is up-to-date *before* you do a bunch of
work on it. :(

Conflicts:

	ChangeLog
	audio-creation/qsynth/HISTORY
	audio-creation/rosegarden/HISTORY
	audio-drivers/nas/BUILD
	audio-drivers/nas/HISTORY
	audio-drivers/pulseaudio/HISTORY
	audio-soft/qjackctl/DEPENDS
	audio-soft/qjackctl/HISTORY
	chat-im/gajim/DEPENDS
	chat-im/gajim/HISTORY
	devel/gambas2/HISTORY
	devel/tk/HISTORY
	display/directfb/HISTORY
	display/qingy/HISTORY
	e/e17/DEPENDS
	e/e17/HISTORY
	e/e_module-bling/HISTORY
	e/ecore/DEPENDS
	e/ecore/HISTORY
	e/evas/DEPENDS
	e/evas/HISTORY
	e/imlib2/HISTORY
	editors/lyx/HISTORY
	editors/openoffice/HISTORY
	editors/vim/HISTORY
	gnome2-apps/gthumb2/HISTORY
	gnome2-libs/java-access-bridge/HISTORY
	gnome2-libs/libxklavier/HISTORY
	gnome2-libs/pango/HISTORY
	graphics-libs/cegui/DEPENDS
	graphics-libs/cegui/HISTORY
	graphics-libs/cimg/HISTORY
	graphics-libs/devil/HISTORY
	graphics-libs/freeglut/DEPENDS
	graphics-libs/freeglut/HISTORY
	graphics-libs/freetype1/HISTORY
	graphics-libs/mesalib/HISTORY
	graphics-libs/mesalib/PRE_BUILD
	graphics-libs/vips/HISTORY
	graphics/fontforge/HISTORY
	graphics/freewrl/HISTORY
	graphics/imagemagick/HISTORY
	graphics/mesademos/HISTORY
	graphics/ploticus/HISTORY
	haskell/haskell-x11/HISTORY
	http/elinks/HISTORY
	http/links-twibright/HISTORY
	http/seamonkey/HISTORY
	http/xulrunner/HISTORY
	kde-apps/kid3/HISTORY
	kde-core/kdebase/HISTORY
	kde4/HISTORY
	kde4/KDE_DEPENDS
	kernels/synaptics/DEPENDS
	kernels/synaptics/HISTORY
	libs/sdl/HISTORY
	mail/exim/HISTORY
	mobile/gnokii/HISTORY
	mobile/gpsd/DEPENDS
	mobile/gpsd/HISTORY
	perl-cpan/perl-gd/HISTORY
	perl-cpan/perl-tk/HISTORY
	php-pear/php-dev/HISTORY
	php-pear/php/HISTORY
	php-pear/php4/HISTORY
	printer/ghostscript/HISTORY
	science-libs/vtk/HISTORY
	science/xaos/HISTORY
	shell-term-fm/mc/HISTORY
	shell-term-fm/mlterm/HISTORY
	shell-term-fm/rxvt-unicode/HISTORY
	shell-term-fm/worker/DEPENDS
	shell-term-fm/worker/HISTORY
	shell-term-fm/x3270/HISTORY
	shell-term-fm/yeahconsole/HISTORY
	utils/beagle/HISTORY
	utils/dbus/DEPENDS
	utils/dbus/HISTORY
	utils/gnuplot/HISTORY
	utils/sunbird/HISTORY
	utils/xen-tools/HISTORY
	video-libs/gst-plugins-base/HISTORY
	video-libs/gst-plugins-good/HISTORY
	video-libs/xine-lib/HISTORY
	video/mplayer/DEPENDS
	video/mplayer/HISTORY
	video/transcode/HISTORY
	video/xvattr/HISTORY
	windowmanagers/aewm++/HISTORY
	windowmanagers/dwm/HISTORY
	windowmanagers/evilwm/HISTORY
	windowmanagers/fluxbox/HISTORY
	windowmanagers/fvwm/HISTORY
	windowmanagers/icewm/DEPENDS
	windowmanagers/icewm/HISTORY
	windowmanagers/ion3/DEPENDS
	windowmanagers/ion3/HISTORY
	windowmanagers/kahakai/DEPENDS
	windowmanagers/kahakai/HISTORY
	windowmanagers/larswm/HISTORY
	windowmanagers/openbox/HISTORY
	windowmanagers/papuawm/DEPENDS
	windowmanagers/papuawm/HISTORY
	windowmanagers/pekwm/HISTORY
	windowmanagers/pwm/HISTORY
	windowmanagers/windowlab/HISTORY
	windowmanagers/windowmaker/HISTORY
	windowmanagers/wm2/HISTORY
	windowmanagers/wmi/DEPENDS
	windowmanagers/wmi/HISTORY
	windowmanagers/wmii/DEPENDS
	windowmanagers/wmii/HISTORY
	wm-addons/dzen2/HISTORY
	wm-addons/twin/HISTORY
	x11-libs/cairo/HISTORY
	x11-libs/dri/HISTORY
	x11-libs/wine/DEPENDS
	x11-libs/wine/HISTORY
	x11-toolkits/fltk/HISTORY
	x11-toolkits/fox/HISTORY
	x11-toolkits/gtk+2/HISTORY
	x11-toolkits/nucleo/HISTORY
	x11-toolkits/openmotif/DEPENDS
	x11-toolkits/openmotif/HISTORY
	x11-toolkits/qt4/HISTORY
	x11-toolkits/wxgtk/HISTORY
	x11/conky/HISTORY
	x11/fbpanel/HISTORY
	x11/gkrellm2/HISTORY
	x11/vnc/DEPENDS
	x11/vnc/HISTORY
	x11/xcompmgr/DEPENDS
	x11/xcompmgr/HISTORY
	x11/xdaliclock/HISTORY
	x11/xosview/HISTORY
	xfce/libxfce4mcs/DEPENDS
	xfce/libxfce4mcs/HISTORY
	xfce/xfce4-profile/DEPENDS
	xfce/xfce4-profile/HISTORY
	xfce/xfwm4/HISTORY

25 files changed, 364 insertions, 19 deletions

diff --git a/display/directfb/BUILD b/display/directfb/BUILD
index d12211af96..3db6c551f2 100755
--- a/display/directfb/BUILD
+++ b/display/directfb/BUILD
@@ -1,17 +1,9 @@
-if  [[  -f  /usr/include/linux/fusion.h  ]];  then
-  OPTS="$OPTS --enable-multi"
-fi  &&
-
 OPTS="--with-inputdrivers=$inputdrivers         \
       --with-gfxdrivers=$gfxdrivers             \
       $DFB_DEBUG $DFB_NETWORK $DFB_VOODOO       \
       $DFB_UNIQUE $DFB_V4L $DFB_V4L2 $DFB_TESTS \
       $OPTS"                                    &&
 
-#
-## Remove this after is_depends_enabled is integrated to stable sorcery.
-#
-source  "$GRIMOIRE/is_depends_enabled.function"  &&
 
 if is_depends_enabled $SPELL libmpeg3; then
      export CPPFLAGS="$CPPFLAGS -I/usr/include/libmpeg3/"
diff --git a/display/directfb/DEPENDS b/display/directfb/DEPENDS
index dbf0cb8998..e5f14d4f75 100755
--- a/display/directfb/DEPENDS
+++ b/display/directfb/DEPENDS
@@ -1,6 +1,11 @@
 depends  autoconf  &&
 depends  automake  &&
 
+optional_depends  linux-fusion                     \
+                  '--enable-multi'                 \
+                  '--enable-mutli=no'           \
+                  'build with support for multiple DFB applications?'  &&
+
 optional_depends  freetype2             \
                   '--enable-freetype'   \
                   '--disable-freetype'  \
diff --git a/display/directfb/DETAILS b/display/directfb/DETAILS
index 2e95a8baa9..545d2b9811 100755
--- a/display/directfb/DETAILS
+++ b/display/directfb/DETAILS
@@ -1,14 +1,13 @@
            SPELL=directfb
-         VERSION=1.0.0-rc1
+         VERSION=1.1.1
           SOURCE=DirectFB-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/DirectFB-$VERSION
    SOURCE_URL[0]=http://www.directfb.org/downloads/Core/$SOURCE
-      SOURCE_HASH=sha512:1fb193764bbe76f9d236b47bdffc700b57bfb612f5d68d01a4133bca2d4582a3aa10cfd56a645c04ba0fc095bfcd952ab31af6ce051bff7ca87cbe161589ad6d
+      SOURCE_HASH=sha512:a82793c5164f0379fad7662071c45bc350a44cc814462cf284cb65cf701ce6c4912570e4e7f34c1db62547a625bc57a907537032d0ea7b1bea946839c0ad9bc2
       LICENSE[0]=LGPL
         KEYWORDS="display"
         WEB_SITE=http://www.directfb.org/
          ENTERED=20030916
-         UPDATED=20031027
            SHORT="Graphics acceleration on Framebuffer Device"
 cat << EOF
 DirectFB is a thin library that provides hardware graphics acceleration, 
diff --git a/display/directfb/DirectFB-0.9.25.1.tar.gz.sig b/display/directfb/DirectFB-0.9.25.1.tar.gz.sig
deleted file mode 100644
index 03b91b6836..0000000000
--- a/display/directfb/DirectFB-0.9.25.1.tar.gz.sig
+++ /dev/null
diff --git a/display/directfb/HISTORY b/display/directfb/HISTORY
index c67854e4e0..d1f8200cdd 100644
--- a/display/directfb/HISTORY
+++ b/display/directfb/HISTORY
@@ -1,6 +1,13 @@
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-SERVER to the one and only xorg-server
 
+2008-01-28 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* BUILD: removed is_depends_enabled.function reference
+
+2007-12-23 Arjan Bouter <abouter@sourcemage.org>
+	* DETAILS: version 1.1.1, switched to sha512sum
+	* PRE_BUILD: disabled regeneration of configure
+
 2007-09-23 Arjan Bouter <abouter@sourcemage.org>
 	* CONFIGURE: fixed typo
 	* DEPENDS: added warning for SDL, added libvncserver
diff --git a/display/directfb/PRE_BUILD b/display/directfb/PRE_BUILD
index 4379c98e21..d94b936d5a 100755
--- a/display/directfb/PRE_BUILD
+++ b/display/directfb/PRE_BUILD
@@ -1,8 +1,10 @@
 default_pre_build      &&
-cd  $SOURCE_DIRECTORY  &&
+cd  $SOURCE_DIRECTORY
 
 #
 # Remake configure so it doesn't "need" cpp
+# <abouter> True as that might be, configure.in is broken
+# and won't generate a working configure
 #
-aclocal   &&
-autoconf
+#aclocal   &&
+#autoconf
diff --git a/display/directfb/TRIGGERS b/display/directfb/TRIGGERS
new file mode 100755
index 0000000000..4ef87a964b
--- /dev/null
+++ b/display/directfb/TRIGGERS
@@ -0,0 +1 @@
+on_cast linux-fusion cast_self
diff --git a/display/qingy/HISTORY b/display/qingy/HISTORY
index f4766a4699..0de653fff6 100644
--- a/display/qingy/HISTORY
+++ b/display/qingy/HISTORY
@@ -1,6 +1,9 @@
 2008-03-18 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Switch X11-SERVER to the one and only xorg-server
 
+2008-01-28 Jaka Kranjc <lynxlynxlynx@sourcemage.org>
+	* PRE_BUILD: removed is_depends_enabled.function reference
+
 2007-04-27 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated to 0.9.6
 	  Removed PATCHLEVEL
diff --git a/display/qingy/PRE_BUILD b/display/qingy/PRE_BUILD
index 9395dea417..36e4e7d4b6 100755
--- a/display/qingy/PRE_BUILD
+++ b/display/qingy/PRE_BUILD
@@ -2,10 +2,6 @@ default_pre_build                                                      &&
 cd ${SOURCE_DIRECTORY}                                                 &&
 patch  -p1  <  $SCRIPT_DIRECTORY/shutdown.patch                        &&
 
-#
-## Remove this after is_depends_enabled is integrated to stable sorcery.
-#
-source  "$GRIMOIRE/is_depends_enabled.function"  &&
 
 if ! is_depends_enabled $SPELL emacs; then
   rm  media/sessions/emacs                                             &&
diff --git a/display/splashy/DEPENDS b/display/splashy/DEPENDS
new file mode 100755
index 0000000000..ee8f4a2b29
--- /dev/null
+++ b/display/splashy/DEPENDS
@@ -0,0 +1,4 @@
+depends  directfb         &&
+depends  glib2            &&
+optional_depends  libpng  ''  ''  'For PNG image support' &&
+optional_depends  jpeg    ''  ''  'For JPEG image support'
diff --git a/display/splashy/DETAILS b/display/splashy/DETAILS
new file mode 100755
index 0000000000..1142c37483
--- /dev/null
+++ b/display/splashy/DETAILS
@@ -0,0 +1,28 @@
+           SPELL=splashy
+         VERSION=0.3.7
+          SOURCE=$SPELL-$VERSION.tar.gz
+     SOURCE_HASH=sha512:5d87f24de06c5fcafe359bf2462ba84c9bea2d7b30a360761e0b746d2020157f0454b705eadafeab10b8263fc0b2f9c0cad9146081f10b697c2cd6a739e5f734
+   SOURCE_URL[0]=http://alioth.debian.org/frs/download.php/2218/${SOURCE}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SPELL}-${VERSION}
+        WEB_SITE=http://splashy.alioth.debian.org/wiki/
+         ENTERED=20071210
+      LICENSE[0]=GPL
+           SHORT="Graphical boot"
+cat << EOF
+Splashy is a next generation boot splashing system for Unix-like systems.
+Unlike other splashing systems, it needs no patches to the kernel.
+
+INSTRUCTIONS:
+1. Install Splashy as you normally would (see INSTALL)
+
+2. Add "splash vga=791 quiet" to the append= line on your bootloader configuration
+   NOTE: For Grub, this is /boot/grub/menu.lst
+   For lilo you need "vga=791" in its own line before the kernel stanzas, and add
+   only "quiet splash" to append=
+   Other bootloaders will use the same options, but they need to be passed
+   differently. Check your bootloader's manual
+
+3. Make sure that /etc/init.d/runlevels/%S/splashy is installed.
+
+4. Reboot and have fun!
+EOF
diff --git a/display/splashy/HISTORY b/display/splashy/HISTORY
new file mode 100644
index 0000000000..34f3358d65
--- /dev/null
+++ b/display/splashy/HISTORY
@@ -0,0 +1,3 @@
+2007-12-10 Arjan Bouter <abouter@sourcemage.org>
+	* DETAILS, DEPENDS, PRE_BUILD,
+	  init.d/splashy, HISTORY: created spell
diff --git a/display/splashy/PRE_BUILD b/display/splashy/PRE_BUILD
new file mode 100755
index 0000000000..9f192f1477
--- /dev/null
+++ b/display/splashy/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build     &&
+cd $SOURCE_DIRECTORY  &&
+patch -p1 < ${SCRIPT_DIRECTORY}/splashy.patch
diff --git a/display/splashy/TRIGGERS b/display/splashy/TRIGGERS
new file mode 100755
index 0000000000..9e4f164ac6
--- /dev/null
+++ b/display/splashy/TRIGGERS
@@ -0,0 +1 @@
+on_cast directfb cast_self
diff --git a/display/splashy/WIP b/display/splashy/WIP
new file mode 100644
index 0000000000..ebd4dcbc77
--- /dev/null
+++ b/display/splashy/WIP
@@ -0,0 +1 @@
+This spell builds, but the init scripts need more work.
diff --git a/display/splashy/init.d/splashy b/display/splashy/init.d/splashy
new file mode 100755
index 0000000000..23a5fbe1c7
--- /dev/null
+++ b/display/splashy/init.d/splashy
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+#grep -q -e '[[:space:]]splash\([[:space:]]\|$\)' /proc/cmdline || exit 1
+
+PROGRAM=/usr/sbin/splashy
+ARGS=boot
+RUNLEVEL=S
+NEEDS="+local_fs"
+
+. /etc/init.d/smgl_init
diff --git a/display/splashy/init.d/splashy1 b/display/splashy/init.d/splashy1
new file mode 100755
index 0000000000..dce8159b09
--- /dev/null
+++ b/display/splashy/init.d/splashy1
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+PROGRAM=/bin/false
+RUNLEVEL=1
+NEEDS="+local_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/init
+
+MAX_LEVEL=$DEFAULT_RUNLEVEL
+
+case "$MAX_LEVEL" in
+  1)
+        SPLASHY_PROGRESS=100
+        ;;
+  2)
+        SPLASHY_PROGRESS=50
+        ;;
+  3)
+        SPLASHY_PROGRESS=33
+        ;;
+  4)
+        SPLASHY_PROGRESS=25
+        ;;
+  5)
+        SPLASHY_PROGRESS=20
+        ;;
+  *)
+        echo "Unknown default runlevel"
+        exit 1
+esac
+
+start()
+{
+  /usr/sbin/splashy_update "progress $SPLASHY_PROGRESS"
+}
+
+stop()
+{
+  true
+}
+
+restart()
+{
+  true
+}
diff --git a/display/splashy/init.d/splashy2 b/display/splashy/init.d/splashy2
new file mode 100755
index 0000000000..1e4aa3070a
--- /dev/null
+++ b/display/splashy/init.d/splashy2
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+PROGRAM=/bin/false
+RUNLEVEL=2
+NEEDS="+local_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/init
+
+MAX_LEVEL=$DEFAULT_RUNLEVEL
+
+case "$MAX_LEVEL" in
+  2)
+        SPLASHY_PROGRESS=100
+        ;;
+  3)
+        SPLASHY_PROGRESS=66
+        ;;
+  4)
+        SPLASHY_PROGRESS=50
+        ;;
+  5)
+        SPLASHY_PROGRESS=40
+        ;;
+  *)
+        echo "Unknown default runlevel"
+        exit 1
+esac
+
+start()
+{
+  /usr/sbin/splashy_update "progress $SPLASHY_PROGRESS"
+}
+
+stop()
+{
+  true
+}
+
+restart()
+{
+  true
+}
diff --git a/display/splashy/init.d/splashy3 b/display/splashy/init.d/splashy3
new file mode 100755
index 0000000000..ee5c6da951
--- /dev/null
+++ b/display/splashy/init.d/splashy3
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="+local_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/init
+
+MAX_LEVEL=$DEFAULT_RUNLEVEL
+
+case "$MAX_LEVEL" in
+  3)
+        SPLASHY_PROGRESS=100
+        ;;
+  4)
+        SPLASHY_PROGRESS=75
+        ;;
+  5)
+        SPLASHY_PROGRESS=60
+        ;;
+  *)
+        echo "Unknown default runlevel"
+        exit 1
+esac
+
+start()
+{
+  /usr/sbin/splashy_update "progress $SPLASHY_PROGRESS"
+}
+
+stop()
+{
+  true
+}
+
+restart()
+{
+  true
+}
diff --git a/display/splashy/init.d/splashy4 b/display/splashy/init.d/splashy4
new file mode 100755
index 0000000000..1ae6dc1efa
--- /dev/null
+++ b/display/splashy/init.d/splashy4
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+PROGRAM=/bin/false
+RUNLEVEL=4
+NEEDS="+local_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/init
+
+MAX_LEVEL=$DEFAULT_RUNLEVEL
+
+case "$MAX_LEVEL" in
+  4)
+        SPLASHY_PROGRESS=100
+        ;;
+  5)
+        SPLASHY_PROGRESS=80
+        ;;
+  *)
+        echo "Unknown default runlevel"
+        exit 1
+esac
+
+start()
+{
+  /usr/sbin/splashy_update "progress $SPLASHY_PROGRESS"
+}
+
+stop()
+{
+  true
+}
+
+restart()
+{
+  true
+}
diff --git a/display/splashy/init.d/splashy5 b/display/splashy/init.d/splashy5
new file mode 100755
index 0000000000..ba446ca66f
--- /dev/null
+++ b/display/splashy/init.d/splashy5
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+PROGRAM=/bin/false
+RUNLEVEL=5
+NEEDS="+local_fs"
+
+. /etc/init.d/smgl_init
+. /etc/sysconfig/init
+
+MAX_LEVEL=$DEFAULT_RUNLEVEL
+
+case "$MAX_LEVEL" in
+  5)
+        SPLASHY_PROGRESS=100
+        ;;
+  *)
+        echo "Unknown default runlevel"
+        exit 1
+esac
+
+start()
+{
+  /usr/sbin/splashy_update "progress $SPLASHY_PROGRESS"
+}
+
+stop()
+{
+  true
+}
+
+restart()
+{
+  true
+}
diff --git a/display/splashy/splashy.patch b/display/splashy/splashy.patch
new file mode 100644
index 0000000000..a2cd1ac2ba
--- /dev/null
+++ b/display/splashy/splashy.patch
@@ -0,0 +1,11 @@
+diff -Naur splashy-0.3.7/scripts/Makefile.in splashy-fixed/scripts/Makefile.in
+--- splashy-0.3.7/scripts/Makefile.in	2007-12-08 23:50:17.000000000 +0100
++++ splashy-fixed/scripts/Makefile.in	2007-12-10 02:00:56.000000000 +0100
+@@ -195,7 +195,6 @@
+ # This will canonically be installed in /etc
+ nobase_sysconf_DATA = \
+ 	console-tools/config.d/splashy \
+-	init.d/splashy \
+ 	default/splashy 
+ 
+ 
diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY
index b43f68d630..5c72579cb4 100644
--- a/display/svgalib/HISTORY
+++ b/display/svgalib/HISTORY
@@ -1,3 +1,8 @@
+2007-11-10 Robin Cook <rcook@wyrms.net>
+	* PRE_BUILD: added to apply patch for 2.6.23
+	  http://groups.google.com/group/svgalib/browse_thread/thread/367b73b209a0bb77
+	  http://groups.google.com/group/svgalib/browse_thread/thread/77a6f8362845b862
+
 2006-12-27 Robin Cook <rcook@wyrms.net>
 	* PRE_BUILD: added to apply patch for 2.6.19
 
diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD
index 72b73efd01..8f3b0f93e4 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//\./} > 2619 ]; then
+if [ ${KER//\./} > 2623 ]; then
+   patch -p1 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.23.diff
+elif [ ${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
diff --git a/display/svgalib/svgalib_helper-2.6.23.diff b/display/svgalib/svgalib_helper-2.6.23.diff
new file mode 100644
index 0000000000..dc60739d14
--- /dev/null
+++ b/display/svgalib/svgalib_helper-2.6.23.diff
@@ -0,0 +1,72 @@
+diff -u -r svgalib-1.9.25.orig/kernel/svgalib_helper/kernel26compat.h svgalib-1.9.25.mod/kernel/svgalib_helper/kernel26compat.h
+--- svgalib-1.9.25.orig/kernel/svgalib_helper/kernel26compat.h	2007-11-10 20:03:01.000000000 -0600
++++ svgalib-1.9.25.mod/kernel/svgalib_helper/kernel26compat.h	2007-11-10 20:16:58.000000000 -0600
+@@ -31,6 +31,7 @@
+ #else /* Kernel 2.6 */
+ 
+ #define NO_TASK
++#include <linux/fs.h>
+ 
+ # ifndef KERNEL_2_6
+ #  define KERNEL_2_6
+@@ -77,7 +78,8 @@
+ }
+ static inline int devfs_unregister_chrdev (unsigned int major,const char *name)
+ {
+-    return unregister_chrdev (major, name);
++    unregister_chrdev (major, name);
++    return 0;
+ }
+ #endif
+ 
+diff -u -r svgalib-1.9.25.orig/kernel/svgalib_helper/main.c svgalib-1.9.25.mod/kernel/svgalib_helper/main.c
+--- svgalib-1.9.25.orig/kernel/svgalib_helper/main.c	2007-11-10 20:03:01.000000000 -0600
++++ svgalib-1.9.25.mod/kernel/svgalib_helper/main.c	2007-11-10 20:13:07.000000000 -0600
+@@ -1,5 +1,7 @@
+-#include <linux/config.h>
+-
++#ifndef AUTOCONF_INCLUDED
++#  include <linux/config.h>
++#endif
++ 
+ #if defined (CONFIG_MODVERSIONS) && !defined (MODVERSIONS)
+ # define MODVERSIONS
+ #endif
+@@ -17,7 +19,9 @@
+ #include <linux/ioport.h>
+ #include <linux/interrupt.h>
+ #include <linux/pci.h>
+-#include <linux/devfs_fs_kernel.h>
++#ifndef AUTOCONF_INCLUDED
++#  include <linux/devfs_fs_kernel.h>
++#endif 
+ #include <linux/mm.h>
+ #include <linux/thread_info.h>
+ #include <linux/smp.h>
+@@ -98,7 +102,7 @@
+ static volatile int vsync=0;
+ static wait_queue_head_t vsync_wait;
+ 
+-static irqreturn_t vsync_interrupt(int irq, void *dev_id, struct pt_regs *regs)
++static irqreturn_t vsync_interrupt(int irq, void *dev_id)
+ {
+     struct sh_pci_device *dev = (struct sh_pci_device *)dev_id;
+ 
+@@ -355,7 +359,7 @@
+                 vsync=1;
+                 i=0;
+                 while(irqs[i]!=-1)
+-                    request_irq(irqs[i++], vsync_interrupt, SA_SHIRQ, "svgalib_helper", sdev_id);
++                    request_irq(irqs[i++], vsync_interrupt, IRQF_SHARED, "svgalib_helper", sdev_id);
+                 vga_enable_vsync((void *)sdev_id);
+ 				wait_event_interruptible(vsync_wait, !vsync);
+                 i=0;
+@@ -443,7 +447,7 @@
+ 		int i=sh_pci_devs[minor]->dev->irq;
+ 		sh_pci_devs[minor]->opencount++;
+ 		if(sh_pci_devs[minor]->opencount==1 && i!=0 && i!=-1 && i!=255)
+-			request_irq(i, vsync_interrupt, SA_SHIRQ, "svgalib_helper", sh_pci_devs[minor]);
++			request_irq(i, vsync_interrupt, IRQF_SHARED, "svgalib_helper", sh_pci_devs[minor]);
+ 	}
+ 
+ #ifndef KERNEL_2_6