more kernel 2.5 fixes

3 files changed, 43 insertions, 21 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index 7bf71213bae1..87b3bbf0d57e 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/svgalib
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.11 2002/12/29 22:22:25 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.12 2002/12/31 21:15:53 azarah Exp $
+
+  31 Dec 2002; Martin Schlemmer <azarah@gentoo.org> svgalib-1.9.17-r1.ebuild :
+  Ok, I should not be lazy, patch Makefile in svga_helper module, as my
+  previous hack seems to fail for some people ... (bug #11092).
 
 *svgalib-1.9.17-r1 (29 Dec 2002)
 
diff --git a/media-libs/svgalib/files/svgalib-1.9.17-kernel25.patch b/media-libs/svgalib/files/svgalib-1.9.17-kernel25.patch
index 603470fe466d..dd4f08df83f5 100644
--- a/media-libs/svgalib/files/svgalib-1.9.17-kernel25.patch
+++ b/media-libs/svgalib/files/svgalib-1.9.17-kernel25.patch
@@ -9,3 +9,22 @@
  
  #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
  #define my_remap_page_range(vma, start, ofs, len, prot) remap_page_range(start,ofs,len,prot)
+--- svgalib-1.9.17/kernel/svgalib_helper/Makefile.orig	2002-12-31 22:55:42.000000000 +0200
++++ svgalib-1.9.17/kernel/svgalib_helper/Makefile	2002-12-31 22:56:19.000000000 +0200
+@@ -1,11 +1,11 @@
+ include ../../Makefile.cfg
+ 
+-MODVER = $(shell grep CONFIG_MODVERSIONS $(INCLUDEDIR)/linux/autoconf.h)
++#MODVER = $(shell grep CONFIG_MODVERSIONS $(INCLUDEDIR)/linux/autoconf.h)
+ 
+-ifeq ($(MODVER),)
+-	@echo INCLUDEDIR is not set up correctly
+-	exit 1
+-endif
++#ifeq ($(MODVER),)
++#	@echo INCLUDEDIR is not set up correctly
++#	exit 1
++#endif
+ 
+ CFLAGS = -O2 -DLINUX -Dlinux -D__KERNEL__ -DMODULE -Wall $(DEBFLAGS) 
+ CFLAGS += -I$(INCLUDEDIR)
diff --git a/media-libs/svgalib/svgalib-1.9.17-r1.ebuild b/media-libs/svgalib/svgalib-1.9.17-r1.ebuild
index 78e528df24bb..8ce4cdac1d0f 100644
--- a/media-libs/svgalib/svgalib-1.9.17-r1.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.17-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.17-r1.ebuild,v 1.1 2002/12/29 22:22:25 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.17-r1.ebuild,v 1.2 2002/12/31 21:15:53 azarah Exp $
 
 IUSE=""
 
@@ -60,27 +60,25 @@ src_compile() {
 
 	check_kernel
 
-	make OPTIMIZE="${CFLAGS}" static shared textutils lrmi utils || die
+	make OPTIMIZE="${CFLAGS}" static shared textutils lrmi utils || \
+		die "Failed to build libraries and utils!"
 	# Build the gl stuff tpp
-	make OPTIMIZE="${CFLAGS}" -C gl || die
-	make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} || die
+	make OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!"
+	make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} || \
+		die "Failed to build libvgagl.so.${PV}!"
 	rm -f src/svgalib_helper.h
-	make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} || die
+	make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} || \
+		die "Failed to build libvga.so.${PV}!"
 	cp -a src/libvga.so.${PV} sharedlib/
 	make OPTIMIZE="${CFLAFS}" LDFLAGS='-L ../sharedlib' \
-		-C threeDKit lib3dkit.a || die
+		-C threeDKit lib3dkit.a || die "Failed to build threeDKit!"
 	
-	# For kernel 2.5, we need to set $MODVER, else it fails.  The
-	# other alternative is to patch the Makefile, but too much hassle ...
-	if [ "${KV_MAJOR}${KV_MINOR}" -gt "24" ]
-	then
-		make INCLUDEDIR="${INCLUDEDIR}" MODVER="foo" \
-			-C kernel/svgalib_helper
-	else
-		make INCLUDEDIR="${INCLUDEDIR}" -C kernel/svgalib_helper
-	fi
+	make INCLUDEDIR="${INCLUDEDIR}" -C kernel/svgalib_helper || \
+		die "Failed to build kernel module!"
+	
+	make OPTIMIZE="${CFLAGS}" LDFLAGS='-L ../sharedlib' demoprogs || \
+		die "Failed to build demoprogs!"
 	
-	make OPTIMIZE="${CFLAGS}" LDFLAGS='-L ../sharedlib' demoprogs || die
 	cp Makefile Makefile.orig
 	sed -e 's/\(install: $(INSTALLAOUTLIB) \)installheaders \(.*\)/\1\2/g' \
 	 	Makefile.orig > Makefile
@@ -88,12 +86,12 @@ src_compile() {
 
 src_install() {
 
-	check_kernel
-
 	dodir /etc/svgalib /usr/{include,lib,bin,share/man}
-	
+
+	# Do not use 'hacked' INCLUDEDIR here ...
 	make TOPDIR=${D} OPTIMIZE="${CFLAGS}" \
-		INCLUDEDIR="${INCLUDEDIR}" install || die
+		INCLUDEDIR="/usr/src/linux/include" install || \
+		die "Failed to install svgalib!"
 	
 	insinto /usr/include
 	doins gl/vgagl.h
@@ -107,6 +105,7 @@ src_install() {
 	doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
 	doins src/keyboard/vgakeyboard.h
 
+	dodir /etc/modules.d
 	echo "probeall  /dev/svga  svgalib_helper" > ${D}/etc/modules.d/svgalib
 
 	cd ${S}/demos