Browse Source

Dimitar Zhekov:


			
			
				rocklinux
			
			
		
Dimitar Zhekov 20 years ago
parent
commit
a576a0b869
5 changed files with 8 additions and 113 deletions
  1. +0
    -34
      package/jimmy/svgalib/gcc-3.3.patch
  2. +0
    -45
      package/jimmy/svgalib/installmodule.patch
  3. +0
    -27
      package/jimmy/svgalib/kernel26compat.patch
  4. +5
    -4
      package/jimmy/svgalib/svgalib.conf
  5. +3
    -3
      package/jimmy/svgalib/svgalib.desc

+ 0
- 34
package/jimmy/svgalib/gcc-3.3.patch

@ -1,34 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/jimmy/svgalib/gcc-3.3.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./demos/lineart.c.orig 2000-02-19 11:12:28.000000000 +0200
+++ ./demos/lineart.c 2003-10-19 08:40:01.000000000 +0300
@@ -19,8 +19,7 @@
if(mode == 0)
{
- printf("Usage:linp [mode mode ...]\n
- where mode is an integer.\n");
+ printf("Usage:linp [mode mode ...]\n\nwhere mode is an integer.\n");
return;
}
if(! vga_hasmode(mode)) {diff -Nru3 trunk-1582/package/jimmy/svgalib/installmodule.patch trunk/package/jimmy/svgalib/installmodule.patch

+ 0
- 45
package/jimmy/svgalib/installmodule.patch

@ -1,45 +0,0 @@
# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/jimmy/svgalib/installmodule.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./Makefile.cfg.orig 2003-01-24 13:56:05.000000000 +0200
+++ ./Makefile.cfg 2003-10-06 21:52:14.000000000 +0300
@@ -128,6 +128,9 @@
# Comment this out if you use devfs only and don't want to make svga nodes
INSTALLDEV = installdev
+# Comment this out if you are going to install the kernel module manually
+INSTALLMODULE = installmodule
+
#
# Comment out any driver that you don't want included in the library.
#
--- ./Makefile.orig 2002-12-22 12:58:47.000000000 +0200
+++ ./Makefile 2003-10-06 21:52:15.000000000 +0300
@@ -211,7 +211,7 @@
(cd threeDKit/; $(MAKE) install)
install: uninstall installheaders $(INSTALLSHAREDLIB) installconfig \
- $(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN) installmodule $(INSTALLDEV) \
+ $(INSTALLSTATICLIB) $(INSTALLUTILS) $(INSTALLMAN) $(INSTALLMODULE) $(INSTALLDEV) \
lib3dkit-install
@echo
@echo

+ 0
- 27
package/jimmy/svgalib/kernel26compat.patch

@ -1,27 +0,0 @@
--- ./kernel/svgalib_helper/kernel26compat.h.orig 2003-10-04 16:42:01.000000000 +0300
+++ ./kernel/svgalib_helper/kernel26compat.h 2004-04-17 15:04:45.000000000 +0300
@@ -9,9 +9,12 @@
# define my_io_remap_page_range(vma, start, ofs, len, prot) io_remap_page_range(start,ofs,len,prot)
+#ifndef IRQ_NONE
+/* The newest 2.4 kernels define these ... */
typedef void irqreturn_t;
# define IRQ_NONE
# define IRQ_HANDLED
+#endif
#else /* Kernel 2.6 */
@@ -44,10 +47,5 @@
#endif
-/* Our main.c really do not like MINOR from 2.6 kernels ... */
-#if (defined MINOR) && (!defined KERNEL_2_6)
-# define my_minor(x) MINOR(x)
-#else
-# define my_minor(x) minor(x)
-#endif
+#define my_minor(x) MINOR(x)

+ 5
- 4
package/jimmy/svgalib/svgalib.conf

@ -25,19 +25,20 @@ svgalib_main() {
hook_eval preconf
makeopt="$makeopt prefix=$root/$prefix NO_ASM= MANFORMAT=uncompressed"
makeopt="$makeopt LDFLAGS=\"$LDFLAGS -s -L$root/$prefix/lib\""
makeopt="$makeopt INSTALLMODULE= INSTALLDEV="
makeopt="$makeopt INSTALLMODULE=installmodule.alt INSTALLDEV="
hook_eval premake
mkdir -p $root/$prefix/man/man{1,3,5,6,7,8}
for i in `ls doc/man6 | egrep -v "^accel|svidtune|testgl|vgatest"` ; do
rm -f doc/man6/$i
done
eval $MAKE $makeopt install || return
make -C kernel/svgalib_helper -f Makefile.alt modules_install || return
cp -f utils/gtfcalc $root/$prefix/bin
cp -f src/config/* $root/etc/vga
rm -f $root/$prefix/man/man6/*
eval $MAKE $makeopt demoprogs || return
cp -f demos/{accel,svidtune,testgl,vgatest} $root/$prefix/bin
cp -f doc/man6/{accel,svidtune,testgl,vgatest}.6 $root/$prefix/man/man6
hook_eval postmake
}

+ 3
- 3
package/jimmy/svgalib/svgalib.desc

@ -24,7 +24,7 @@
[I] A low level graphics library for Linux, derived from libvga
[T] A low level graphics library for Linux, originally based on VGAlib 1.2
[T] by Tommy Frandsen. The hardware access in this version is done with a
[T] by Tommy Frandsen. All hardware access in this version is done thru a
[T] kernel module.
[U] http://www.arava.co.il/matan/svgalib/
@ -36,8 +36,8 @@
[L] OpenSource
[S] Stable
[V] 1.9.18
[V] 1.9.19
[P] X -----5---9 334.000
[D] 1975261132 svgalib-1.9.18.tar.gz http://www.arava.co.il/matan/svgalib/
[D] 1832913768 svgalib-1.9.19.tar.gz http://www.arava.co.il/matan/svgalib/

Loading…
Cancel
Save