summaryrefslogtreecommitdiffstats
path: root/display/svgalib
diff options
context:
space:
mode:
authorTreeve Jelbert2006-09-28 21:53:16 +0200
committerTreeve Jelbert2006-09-28 21:53:16 +0200
commitbce4ed74b07868116a57f1824b23f9c95713336f (patch)
treeba24dc8fb9b47ed5b710e0b4207424144442fb15 /display/svgalib
parent3a53def0b366d275d02fda57be42a394e0eec360 (diff)
svgalib-1.9.25
Diffstat (limited to 'display/svgalib')
-rwxr-xr-xdisplay/svgalib/BUILD4
-rwxr-xr-xdisplay/svgalib/DETAILS5
-rw-r--r--display/svgalib/HISTORY6
-rwxr-xr-xdisplay/svgalib/PRE_BUILD6
-rw-r--r--display/svgalib/svgalib_helper-2.6.18.diff11
5 files changed, 25 insertions, 7 deletions
diff --git a/display/svgalib/BUILD b/display/svgalib/BUILD
index c3f2ad83b1..bc555df0a4 100755
--- a/display/svgalib/BUILD
+++ b/display/svgalib/BUILD
@@ -10,14 +10,14 @@ rm -f src/svgalib_helper.h &&
make shared &&
# Missing in some cases ...
-ln -s libvga.so.${VERSION} sharedlib/libvga.so &&
+#ln -s libvga.so.${VERSION} sharedlib/libvga.so &&
# Build lrmi and tools ...
make LDFLAGS="-L../sharedlib" textutils lrmi utils &&
# Build the gl stuff too
make -C gl &&
make -C gl libvgagl.so.${VERSION} &&
# Missing in some cases ...
-ln -s libvgagl.so.${VERSION} sharedlib/libvgagl.so &&
+#ln -s libvgagl.so.${VERSION} sharedlib/libvgagl.so &&
rm -f src/svgalib_helper.h &&
make -C src libvga.so.${VERSION} &&
cp -a src/libvga.so.${VERSION} sharedlib/ &&
diff --git a/display/svgalib/DETAILS b/display/svgalib/DETAILS
index 7b1d42c811..c40012f169 100755
--- a/display/svgalib/DETAILS
+++ b/display/svgalib/DETAILS
@@ -1,12 +1,11 @@
SPELL=svgalib
- VERSION=1.9.24
- SOURCE_HASH='sha512:02ae619ce11bace86c998b9266d418c8067f84ecab34ddf898e437eee90c503ae99f18cf83c46f3db2a3ee277b8b574532e7b97ea4fd8e6d46e4ea26fd4621cd'
+ VERSION=1.9.25
+ SOURCE_HASH=sha512:697e417e6fb4fc3c41f47945a87bd0252f33b565ac1b20d98f984168c6b3ac0f04887e929fbf912ef7bb7b0a3b0a1763cc7cf3e316b62235cc926ca4b1ed96f7
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.arava.co.il/matan/svgalib/${SOURCE}
WEB_SITE=http://www.svgalib.org/
ENTERED=20011117
- UPDATED=20011117
LICENSE[0]=GPL
DOCS="0-README LICENSE README svgalib.lsm doc/0-INSTALL doc/CHANGES doc/DESIGN doc/Driver-programming-HOWTO doc/dual-head-howto doc/README.* doc/svgalib.lsm doc/TODO"
KEYWORDS="display"
diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY
index 86915ca1a7..315a61bf91 100644
--- a/display/svgalib/HISTORY
+++ b/display/svgalib/HISTORY
@@ -1,3 +1,9 @@
+2006-09-25 Treeve Jelbert <treeve@pi.be>
+ * DETAILS: version 1.9.25
+ * PRE_BUILD: apply patch for kernel 2.6.18
+ * BUILD: don't create symlinks, they already exist
+ * svgalib_helper-2.6.18.diff: add
+
2006-07-06 Robin Cook
* PRE_BUILD: fix patch line
diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD
index e7b49400fc..a66000d2aa 100755
--- a/display/svgalib/PRE_BUILD
+++ b/display/svgalib/PRE_BUILD
@@ -10,9 +10,11 @@ sedit "s:\$(shell uname -r):$KER:g" \
# Apply patchs for kernel versions 2.6.15* and newer
KER=${KER:0:6} &&
-if [[ ${KER//\./} > 2616 ]]; then
+if [ ${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
-elif [[ ${KER//\./} > 2614 ]]; then
+elif [ ${KER//\./} > 2614 ]; then
patch -p2 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.15.diff
fi &&
diff --git a/display/svgalib/svgalib_helper-2.6.18.diff b/display/svgalib/svgalib_helper-2.6.18.diff
new file mode 100644
index 0000000000..dbdefec611
--- /dev/null
+++ b/display/svgalib/svgalib_helper-2.6.18.diff
@@ -0,0 +1,11 @@
+diff -uNr svgalib-1.9.25/kernel/svgalib_helper/main.c svgalib-1.9.25.cp/kernel/svgalib_helper/main.c
+--- svgalib-1.9.25/kernel/svgalib_helper/main.c 2006-01-12 19:17:53.000000000 +0100
++++ svgalib-1.9.25.cp/kernel/svgalib_helper/main.c 2006-09-28 21:43:53.000000000 +0200
+@@ -17,7 +17,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>