diff options
| author | Jeremy Blosser | 2006-04-24 19:14:27 -0500 |
|---|---|---|
| committer | Jeremy Blosser | 2006-04-24 19:14:27 -0500 |
| commit | fad359c4a8f3a5103272ae94350f757115c5d3f6 (patch) | |
| tree | df47495c29a829cc3a30058d7e9a9a75dbb4de0a /display/svgalib | |
| parent | 3d0c39ddce9dec845043e85d6e7bd2937b9c85a0 (diff) | |
sync display/svgalib from test
Diffstat (limited to 'display/svgalib')
| -rwxr-xr-x | display/svgalib/BUILD | 3 | ||||
| -rwxr-xr-x | display/svgalib/DETAILS | 1 | ||||
| -rw-r--r-- | display/svgalib/HISTORY | 13 | ||||
| -rwxr-xr-x | display/svgalib/PRE_BUILD | 14 |
4 files changed, 25 insertions, 6 deletions
diff --git a/display/svgalib/BUILD b/display/svgalib/BUILD index 21bf2bfa1f..c3f2ad83b1 100755 --- a/display/svgalib/BUILD +++ b/display/svgalib/BUILD @@ -28,8 +28,7 @@ make CFLAGS="${CFLAGS} -I../gl -I../include" demoprogs \ LDFLAGS='-L../sharedlib' && cd kernel/svgalib_helper && -if [ `uname -r | cut -d. -f1,2` == "2.6" ] -then +if [[ "$(get_kernel_version)" =~ "^2.6" ]]; then message "${MESSAGE_COLOR}Building for 2.6...${DEFAULT_COLOR}" && make else diff --git a/display/svgalib/DETAILS b/display/svgalib/DETAILS index e7ab36f9a2..aa40c48ef6 100755 --- a/display/svgalib/DETAILS +++ b/display/svgalib/DETAILS @@ -10,6 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION 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" + KEYWORDS="display" 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 e327fa73fa..e51d661e7b 100644 --- a/display/svgalib/HISTORY +++ b/display/svgalib/HISTORY @@ -1,3 +1,16 @@ +2006-04-05 Juuso Alasuutari <iuso@sourcemage.org> + * PRE_BUILD: sedits to build against sorcery kernel, not running + kernel: fixes bug #10820. also made 1 var local. + * BUILD: changed conditional to read sorcery not running kernel + version + +2006-03-31 Juuso Alasuutari <iuso@sourcemage.org> + * PRE_BUILD: apply patch for also newer than 2.6.15 kernels, not + 2.6.15 alone + +2006-03-12 Karsten Behrmann <BearPerson@sourcemage.org> + * DETAILS: (automated) Add KEYWORDS + 2006-02-15 Robin Cook <rcook@wyrms.net> * PRE_BUILD: fix if statement to apply patch diff --git a/display/svgalib/PRE_BUILD b/display/svgalib/PRE_BUILD index 96b49f5a2f..dc78813dea 100755 --- a/display/svgalib/PRE_BUILD +++ b/display/svgalib/PRE_BUILD @@ -1,10 +1,16 @@ default_pre_build && cd ${SOURCE_DIRECTORY} && -S_KERNELRELEASE=get_kernel_version && -export S_KERNELRELEASE && +# Edit to build against sorcery kernel, not running kernel +local KER=$(get_kernel_version) && +sedit "s:\$(shell uname -r):$KER:g" Makefile.cfg && +sedit "s:\$(shell uname -r):$KER:g" kernel/svgalib_helper/Makefile && +sedit "s:\$(shell uname -r):$KER:g" \ + kernel/svgalib_helper/Makefile.alt && -if [[ $(get_kernel_version) == 2.6.15* ]]; then +# Apply patch for kernel versions 2.6.15* and newer +KER=${KER:0:6} && +if (( ${KER//\./} > 2614 )); then patch -p2 < ${SCRIPT_DIRECTORY}/svgalib_helper-2.6.15.diff fi && @@ -15,7 +21,7 @@ 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 && +sedit 's:$(prefix)/man:$(prefix)/share/man:' Makefile.cfg && # Disable kernel module support while building stages sedit 's:installmodule ::' Makefile |