Relax tests for Elite framebuffers to help with initrd systems. Please see ChangeLog.

Package-Manager: portage-2.2_pre4

5 files changed, 130 insertions, 5 deletions

diff --git a/x11-misc/afbinit/ChangeLog b/x11-misc/afbinit/ChangeLog
index 8d878fb88b2e..982980fb5dbd 100644
--- a/x11-misc/afbinit/ChangeLog
+++ b/x11-misc/afbinit/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-misc/afbinit
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.22 2007/10/31 16:52:29 fmccor Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.23 2008/03/18 18:16:23 fmccor Exp $
+
+*afbinit-1.0.1-r7 (18 Mar 2008)
+
+  18 Mar 2008; Ferris McCormick <fmccor@gentoo.org>
+  +files/rc.afb-1.0.1-r7.patch, metadata.xml, +afbinit-1.0.1-r7.ebuild:
+  Version bump to 1.0.1-r7 to help with systems using an initram.  It can happen
+  on these systems that the AFB information is gone from the dmesg output by the
+  time that afbinit wants to load the microcode.  If this happens, older
+  versions will not see the Elite frame buffer and so the load will fail.  In
+  this version, with current kernels we just look unconditionally at any
+  /proc/fb devices.
 
 *afbinit-1.0.1-r6 (31 Oct 2007)
 
diff --git a/x11-misc/afbinit/Manifest b/x11-misc/afbinit/Manifest
index f72fd9ac8e8a..b471f8ddc973 100644
--- a/x11-misc/afbinit/Manifest
+++ b/x11-misc/afbinit/Manifest
@@ -3,10 +3,12 @@ AUX afbinit.init 354 RMD160 476a6079dff99b3f72d9a16bfebe6f448385c3fa SHA1 86f350
 AUX rc.afb-1.0.1-r4.patch 1595 RMD160 ef429c85d08e94691028a332ea6bc0cdac54203a SHA1 a7117e471b44b502d55e9e079fd5cbc2468a8225 SHA256 667105f3ef3b2b26baf4d2e52701e2e69fbcdc12a09119297538e5ade1a0bdb9
 AUX rc.afb-1.0.1-r5.patch 1593 RMD160 5a4359d05d6a0a1b98710028af58ddc9478ce332 SHA1 4858afab1b4b0673488a88d55d98f797ae356dc7 SHA256 0ef3ea485f801f737cbb2f860f8ed6a6cf02733b534f14bdb76eb19e99b0ece7
 AUX rc.afb-1.0.1-r6.patch 1588 RMD160 51675be34c50567020bc35cad3401b897e2a5901 SHA1 a9c9a78ebc59ea331b2970d73779ccbfe1a963b8 SHA256 c428d5349616522077c4e29240b63f6c88ddf119d4086c2bbbf68aef733a685f
+AUX rc.afb-1.0.1-r7.patch 1501 RMD160 d622bb531810c6a9efdd9e8aecd0b1b564ec354b SHA1 c8770c3b7e8715c6918ad35f4790b372b837ace4 SHA256 b91fd88f5f9a2426c4df32667e4ddfdd1fdbc00c441e23b902184ef790323b59
 AUX rc.afb-1.0.1.patch 1594 RMD160 8708a80f12cc4b43e413bb2ceb77f8c3c852811d SHA1 ce9eff84486241f973e4102e0a93e9fc80a31047 SHA256 914de2c94af9e0b74814a975167953b93eba573e0a29ecf93a7bff4d41f4b6de
 DIST afbinit-1.0.1.tar.bz2 3288 RMD160 3b401ce48ad3f135c2548b293df906dc7ddd6068 SHA1 f6051c679aa4776fdabb1b5f012b935d31312519 SHA256 3a9b246b34f9b518f2e9a143e5c9faacd0197baa4e5dd13f82ce3c336a3c285c
 EBUILD afbinit-1.0.1-r4.ebuild 1244 RMD160 92e71139fb131fab4173c1dbf307d2b410ba2ba7 SHA1 b251b37398fd0ba38e22f6a3d7097852c415245f SHA256 3b37a9c380f82c68349c726e899c44a524ab3b26f76dfeb985ee0b1046da30d8
 EBUILD afbinit-1.0.1-r5.ebuild 1252 RMD160 2c5436d446a4188035943b59813c6228d15c7fdc SHA1 95462cb99a881afaac746704734d0f960233e1c4 SHA256 60b890805418f3e51811204cdb3ca3aaefc78118e6c31997fdf6a0182e2574fc
 EBUILD afbinit-1.0.1-r6.ebuild 1250 RMD160 33cd75214d837b762f7ae2cfb39988ce10e3e7b3 SHA1 aef6928ee3ad061fe9d418a9a4454a3db5e6baaf SHA256 6bb84ddc2c3770beff5dea14116ee8aa56518c82ddc7db7709d064518eb52f30
-MISC ChangeLog 4914 RMD160 9a4e741cd6b6dc653c91364494b57d760279adeb SHA1 ec3b0bde08a44ca427d1dadecfc9549d84f02fa2 SHA256 9618605c0bbd46cc1225fe180a29946a059c35fabfeb4df36ff4a49cc30a018c
-MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
+EBUILD afbinit-1.0.1-r7.ebuild 1250 RMD160 f96270d6e8ad8432468e3e6ad5f63fcb1a7ac199 SHA1 097f6a489ef89455e9314cbda5c2fa87a8504e2b SHA256 0e489fe0e846896910c4dc829d9cee01c9d72d5f40c8bd9bc89cfc005af412d6
+MISC ChangeLog 5478 RMD160 74afbbd5d9b2b9e2534563a48ec3a19c7e25578b SHA1 7fb37d87501d243b3aac8d78cf89c707dfe575ed SHA256 9528377bbc3dc3ddb084d59e48e2e72e9f8dd13bd1af20a585b7824dd13204c7
+MISC metadata.xml 233 RMD160 1a148a584f4b911aa0a3555d022f41ac6c1cc161 SHA1 1ae2f00175a633df6b7154df449ea6fdcba8008e SHA256 43b6fee4b259fd47caa3673b5835514eabd3afbcdc5f218a60990c0cd7e987d5
diff --git a/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
new file mode 100644
index 000000000000..aeea8c55e714
--- /dev/null
+++ b/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild,v 1.1 2008/03/18 18:16:23 fmccor Exp $
+
+inherit eutils
+
+DESCRIPTION="loads the microcode for Elite3D framebuffers to use X"
+HOMEPAGE="I dont have a home :("
+SRC_URI="http://cvs.gentoo.org/~weeve/files/${P}.tar.bz2"
+IUSE=""
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="-* ~sparc"
+
+DEPEND="virtual/libc"
+RDEPEND="${DEPEND}
+	sys-apps/util-linux"
+
+src_unpack() {
+	unpack ${A}
+	##
+	# Patch rc.afb to handle both kernels 2.4.x and 2.6.x
+	einfo "Patching to handle both kernel 2.4.x and 2.6.x style afb identification"
+	cd "${S}"
+	epatch "${FILESDIR}"/rc.afb-${PVR}.patch || die "Cannot patch rc.afb init script"
+	einfo 'Patching afbinit.c to use MMAP_PUBLIC (needed for kernels > 2.6.14)'
+	epatch "${FILESDIR}"/afbinit-mmap-${PV}.patch || die "Cannot patch for mmap"
+}
+
+src_compile() {
+	emake || die "make failed"
+}
+
+src_install() {
+	dosbin afbinit
+	dosbin rc.afb
+	newinitd "${FILESDIR}"/afbinit.init afbinit
+}
+
+pkg_postinst() {
+	einfo "To use afbinit, you'll need the AFB microcode."
+	einfo "This is available via a Solaris install at /usr/lib/afb.ucode"
+	einfo "or via sun.com"
+}
diff --git a/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch b/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch
new file mode 100644
index 000000000000..0105a2aeef4a
--- /dev/null
+++ b/x11-misc/afbinit/files/rc.afb-1.0.1-r7.patch
@@ -0,0 +1,61 @@
+--- rc.afb-	1999-09-08 06:42:36.000000000 +0000
++++ rc.afb	2008-03-18 17:55:11.000000000 +0000
+@@ -10,11 +10,6 @@
+ 	exit 0
+ fi
+ 
+-if [ `/bin/dmesg | /bin/grep -c "Elite 3D"` -eq 0 ]
+-then
+-	exit 0
+-fi
+-
+ # The microcode loader binary and the microcode
+ # itself must exist.
+ if [ ! -x /usr/sbin/afbinit -o ! -f /usr/lib/afb.ucode ]
+@@ -22,13 +17,37 @@
+ 	exit 0
+ fi
+ 
+-# Make FB device list.
+-afb_devs=`/bin/dmesg | /bin/egrep -i "Elite 3D" | /bin/sed 's/\:.*//'`
++# Make FB device list, depending on which kind of kernel we have.
++# First, try kernel 2.4.x
++
++if [ `/bin/dmesg | /bin/grep -c "Elite 3D"` -gt 0 ]
++then
++
++	afb_devs=`/bin/dmesg | /bin/egrep -i "Elite 3D" | /bin/sed 's/\:.*//'`
++
++	# Load microcode onto each card.
++	for AFB in ${afb_devs}
++	do
++		echo -n "${AFB}: Loading Elite3D microcode... "
++		/usr/sbin/afbinit /dev/${AFB} /usr/lib/afb.ucode
++		echo "done."
++	done
++	exit 0
++else
++##
++#	OK, we're not kernel 2.4.x
++#	try kernel 2.6.x
++
++## if [ `/bin/dmesg | /bin/grep -c "AFB"` -gt 0 ]
++## then
+ 
+-# Load microcode onto each card.
+-for AFB in ${afb_devs}
+-do
+-	echo -n "${AFB}: Loading Elite3D microcode... "
+-	/usr/sbin/afbinit /dev/${AFB} /usr/lib/afb.ucode
+-	echo "done."
+-done
++	afb_devs=`/bin/more -s /proc/fb  | /bin/egrep -i "Elite 3D" | /bin/sed 's/\ .*//'`
++	# Load microcode onto each card.
++	for AFB in ${afb_devs}
++	do
++		echo -n "/dev/fb${AFB}: Loading Elite3D microcode... "
++		/usr/sbin/afbinit /dev/fb${AFB} /usr/lib/afb.ucode
++		echo "done."
++	done
++	exit 0
++fi
diff --git a/x11-misc/afbinit/metadata.xml b/x11-misc/afbinit/metadata.xml
index 40838bc36783..fb1d65b68b23 100644
--- a/x11-misc/afbinit/metadata.xml
+++ b/x11-misc/afbinit/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-misc</herd>
+
+	<herd>desktop-misc</herd>
+
+	<maintainer>
+		<email>fmccor@gentoo.org</email>
+	</maintainer>
+
 </pkgmetadata>