Fix 2.6.10 compatibility, bug #77186

5 files changed, 53 insertions, 11 deletions

diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog
index f8f2c989f2e2..4ade0ab6e90b 100644
--- a/media-libs/svgalib/ChangeLog
+++ b/media-libs/svgalib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/svgalib
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.50 2004/11/16 04:56:31 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.51 2005/01/12 19:43:14 dsd Exp $
+
+  12 Jan 2005; Daniel Drake <dsd@gentoo.org>
+  +files/svgalib-1.9.19-devfs.patch, +files/svgalib.devfs,
+  svgalib-1.9.19-r1.ebuild:
+  Fix 2.6.10 compatibility, bug #77186
 
   15 Nov 2004; Mike Frysinger <vapier@gentoo.org> svgalib-1.9.19-r1.ebuild:
   Fix the buildcsr demo target to use the correct linking flags #71194.
diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest
index 9bdf48905d53..0e96c54f2aa4 100644
--- a/media-libs/svgalib/Manifest
+++ b/media-libs/svgalib/Manifest
@@ -1,11 +1,23 @@
-MD5 6d9c82e71dd0c815563a6baf90db2262 ChangeLog 9029
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5521852e3ebf7c90a8670fa0560b4140 svgalib-1.9.19-r1.ebuild 4919
+MD5 43f0e5562ee209f49ff2e7da1e0d533f ChangeLog 9198
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 d948b1a128d9deaf41314907bb3eeee3 svgalib-1.9.19-r1.ebuild 4774
-MD5 c136e25a99e0681344511eef09d410e6 files/svgalib-1.9.19-dont-touch-ld.conf.patch 350
+MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19-r1 66
+MD5 d137b721449f3fe88d6ec08a3cf6c51a files/svgalib.devfs 219
+MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
+MD5 358167742c3df76cc351ee5d7a542213 files/svgalib-1.9.19-devfs.patch 568
 MD5 1c4684bfc1f4a5ff9daf7cbf5da699b1 files/svgalib-1.9.19-pci-get-class.patch 458
 MD5 0877788ea40d3673a0c50d82d4560e0a files/svgalib-1.9.18-lrmi-gentoo-cflags.patch 269
-MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413
-MD5 8a336e556b73e4107cb5403bc07e7dc3 files/svgalib-1.9.19-gentoo.patch 4107
-MD5 431e1212290d169ae8f928e63c793009 files/svgalib-1.9.19-linux2.6.patch 7834
-MD5 71fa9630e100dc3a6ce8672b4b4b2cff files/digest-svgalib-1.9.19-r1 66
 MD5 91fa4baff3dfb211bcb57a068ed7495f files/svgalib-1.9.19-pic.patch 422
+MD5 c136e25a99e0681344511eef09d410e6 files/svgalib-1.9.19-dont-touch-ld.conf.patch 350
+MD5 431e1212290d169ae8f928e63c793009 files/svgalib-1.9.19-linux2.6.patch 7834
+MD5 627fcf9d82cd93cddcdef96a00248260 files/svgalib-1.9.18-utils-include.patch 413
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB5ZjjiJcSIUGNthERAqfTAJ9SljUrlBwKXbp4IfJB8aBV3WzwUwCeMql/
+H1h+CZl9c2sQPMaXDhSx834=
+=mmaL
+-----END PGP SIGNATURE-----
diff --git a/media-libs/svgalib/files/svgalib-1.9.19-devfs.patch b/media-libs/svgalib/files/svgalib-1.9.19-devfs.patch
new file mode 100644
index 000000000000..9029588f8370
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib-1.9.19-devfs.patch
@@ -0,0 +1,15 @@
+No longer available in Linux 2.6.10
+
+- Daniel Drake <dsd@gentoo.org>
+
+diff -urNp svgalib-1.9.19/kernel/svgalib_helper/main.c svgalib-dsd/kernel/svgalib_helper/main.c
+--- svgalib-1.9.19/kernel/svgalib_helper/main.c	2004-05-07 10:10:22.000000000 +0100
++++ svgalib-dsd/kernel/svgalib_helper/main.c	2005-01-09 18:25:13.094026296 +0000
+@@ -577,7 +577,6 @@ int init_module(void)
+ 		devfs_mk_cdev(MKDEV(SVGALIB_HELPER_MAJOR, i),
+ 				S_IFCHR |  S_IRUGO | S_IRWXU, "svga_helper/%d", i);
+ 	}
+-	devfs_mk_symlink("svga", "svga_helper/0");
+ # endif
+ #endif /* devfsd support */
+ 
diff --git a/media-libs/svgalib/files/svgalib.devfs b/media-libs/svgalib/files/svgalib.devfs
new file mode 100644
index 000000000000..d6bde0b2c798
--- /dev/null
+++ b/media-libs/svgalib/files/svgalib.devfs
@@ -0,0 +1,4 @@
+LOOKUP          ^svga$            CFUNCTION GLOBAL mksymlink svga_helper/0 svga
+REGISTER        ^svga_helper/0$   CFUNCTION GLOBAL mksymlink $devname svga
+UNREGISTER      ^svga_helper/0$   CFUNCTION GLOBAL unlink svga
+
diff --git a/media-libs/svgalib/svgalib-1.9.19-r1.ebuild b/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
index 75fa4141cc04..de94f59ab42b 100644
--- a/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19-r1.ebuild,v 1.6 2004/11/16 04:56:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.19-r1.ebuild,v 1.7 2005/01/12 19:43:14 dsd Exp $
 
 inherit eutils flag-o-matic toolchain-funcs kernel-mod
 
@@ -44,6 +44,9 @@ src_unpack() {
 	# PCI functions have been renamed with newer kernels #69580
 	epatch ${FILESDIR}/${P}-pci-get-class.patch
 
+	# devfs_mk_symlink no longer available #77186
+	epatch ${FILESDIR}/${P}-devfs.patch
+
 	# Link like the other packages
 	sed -i 's:$(FLAGS):$(CFLAGS) $(LDFLAGS):' demos/Makefile || die
 }
@@ -138,6 +141,9 @@ src_install() {
 	dodir /etc/modules.d
 	echo "probeall  /dev/svga  svgalib_helper" > ${D}/etc/modules.d/svgalib
 
+	dodir /etc/devfs.d
+	newins ${FILESDIR}/svgalib.devfs svgalib
+
 	exeinto /usr/lib/svgalib/demos
 	for x in ${S}/demos/*
 	do