diff options
| author | Jeremy Blosser | 2006-04-24 09:50:23 -0500 |
|---|---|---|
| committer | Jeremy Blosser | 2006-04-24 09:50:23 -0500 |
| commit | 5403748fbfe9fb8e39047ade4c360dc10becffb3 (patch) | |
| tree | 14b4ac90f3b3156153c1878f0f5892c55cbc0301 /display/svgalib | |
| parent | d94c88d3b476eaae173d92d86597cd79bf9bc5c0 (diff) | |
sync ./display/svgalib from stable-rc 0.4
Diffstat (limited to 'display/svgalib')
| -rwxr-xr-x | display/svgalib/BUILD | 9 | ||||
| -rwxr-xr-x | display/svgalib/DETAILS | 5 | ||||
| -rw-r--r-- | display/svgalib/HISTORY | 23 | ||||
| -rwxr-xr-x | display/svgalib/PRE_BUILD | 21 | ||||
| -rw-r--r-- | display/svgalib/svgalib_helper-2.6.15.diff | 36 |
5 files changed, 83 insertions, 11 deletions
diff --git a/display/svgalib/BUILD b/display/svgalib/BUILD index ef7dee2850..21bf2bfa1f 100755 --- a/display/svgalib/BUILD +++ b/display/svgalib/BUILD @@ -1,14 +1,5 @@ message "${MESSAGE_COLOR}If this fails, disable kernel module versioning{$DEFAULT_COLOR}" && -# Some other fixes I needed to do -sedit 's:<config.h>:\"config.h\":' threeDKit/3dinit.c && -sedit 's:<config.h>:\"config.h\":' threeDKit/3dkit.c && -sedit 's:<config.h>:\"config.h\":' threeDKit/triangl.c && -sedit 's:<config.h>:\"config.h\":' threeDKit/wrapsurf.c && - -# Disable kernel module support while building stages -sedit 's:installmodule ::' Makefile && - # First build static make_single && make static && diff --git a/display/svgalib/DETAILS b/display/svgalib/DETAILS index d45cae6312..e7ab36f9a2 100755 --- a/display/svgalib/DETAILS +++ b/display/svgalib/DETAILS @@ -1,14 +1,15 @@ SPELL=svgalib - VERSION=1.9.21 + VERSION=1.9.24 + SOURCE_HASH='sha512:02ae619ce11bace86c998b9266d418c8067f84ecab34ddf898e437eee90c503ae99f18cf83c46f3db2a3ee277b8b574532e7b97ea4fd8e6d46e4ea26fd4621cd' SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION SOURCE_URL[0]=http://www.arava.co.il/matan/svgalib/${SOURCE} - MD5[0]='8a01bb4a56cd74a0642031781d760152' WEB_SITE=http://www.svgalib.org/ ENTERED=20011117 UPDATED=20011117 LICENSE[0]=GPL BUILD_API=2 + 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" SHORT="Graphics library to provide VGA and SVGA modes in a console" cat << EOF svgalib is a low-level graphics library that provides VGA and SVGA diff --git a/display/svgalib/HISTORY b/display/svgalib/HISTORY index 2a777701ee..e327fa73fa 100644 --- a/display/svgalib/HISTORY +++ b/display/svgalib/HISTORY @@ -1,3 +1,26 @@ +2006-02-15 Robin Cook <rcook@wyrms.net> + * PRE_BUILD: fix if statement to apply patch + +2006-02-08 Robin Cook <rcook@wyrms.net> + * PRE_BUILD: change uname to get_kernel_version + +2006-02-07 Robin Cook <rcook@wyrms.net> + * PRE_BUILD: apply patch from maintainer for kernels 2.6.15 or newer + +2006-02-04 Sergey Lipnevich <sergey@sourcemage.org> + * DETAILS: upgrade to 1.9.24. + +2005-11-29 Seth Woolley <seth@tautology.org> + * DETAILS: MD5 -> SHA512 + +2005-11-14 Jason Flatt <jflatt@sourcemage.org> + * BUILD, PRE_BUILD: Move pre-build source modifying code to PRE_BUILD. + +2005-11-13 Jason Flatt <jflatt@sourcemage.org> + * BUILD: Add sedit line to put man pages in their correct location. + * DETAILS: Added DOCS to not copy all the man files to the docs + location. + 2005-04-21 Sergey Lipnevich <sergey@sourcemage.org> * DETAILS: upgrade to 1.9.21. diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD new file mode 100755 index 0000000000..96b49f5a2f --- /dev/null +++ b/display/svgalib/PRE_BUILD @@ -0,0 +1,21 @@ +default_pre_build && +cd ${SOURCE_DIRECTORY} && + +S_KERNELRELEASE=get_kernel_version && +export S_KERNELRELEASE && + +if [[ $(get_kernel_version) == 2.6.15* ]]; then + patch -p2 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.15.diff +fi && + +# Some other fixes I needed to do +sedit 's:<config.h>:\"config.h\":' threeDKit/3dinit.c && +sedit 's:<config.h>:\"config.h\":' threeDKit/3dkit.c && +sedit 's:<config.h>:\"config.h\":' threeDKit/triangl.c && +sedit 's:<config.h>:\"config.h\":' threeDKit/wrapsurf.c && + +# Put the man pages in their proper location. +sedit 's:$(prefix)/man:$(prefix)/share/man:' Makefile.cfg && + +# Disable kernel module support while building stages +sedit 's:installmodule ::' Makefile diff --git a/display/svgalib/svgalib_helper-2.6.15.diff b/display/svgalib/svgalib_helper-2.6.15.diff new file mode 100644 index 0000000000..6cae36553f --- /dev/null +++ b/display/svgalib/svgalib_helper-2.6.15.diff @@ -0,0 +1,36 @@ +--- /usr/src/svgalib/svgalib-1.9.24/kernel/svgalib_helper/kernel26compat.h 2005-11-05 00:33:00.000000000 +0200 ++++ /svgalib/kernel/svgalib_helper/kernel26compat.h 2006-01-06 15:11:15.000000000 +0200 +@@ -84,6 +84,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 +94,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 +152,7 @@ + #if !defined(MODULE_VERSION) + # define MODULE_VERSION(x) + #endif ++ ++#ifndef PCI_VENDOR_ID_RENDITION ++#define PCI_VENDOR_ID_RENDITION 0x1163 ++#endif |