Version bump for change in dmesg format to report FFB devices.

Package-Manager: portage-2.1.3.16

5 files changed, 130 insertions, 5 deletions

diff --git a/x11-misc/afbinit/ChangeLog b/x11-misc/afbinit/ChangeLog
index 9ef1f50f5c55..8d878fb88b2e 100644
--- a/x11-misc/afbinit/ChangeLog
+++ b/x11-misc/afbinit/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2007/04/28 21:53:45 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/afbinit/ChangeLog,v 1.22 2007/10/31 16:52:29 fmccor Exp $
+
+*afbinit-1.0.1-r6 (31 Oct 2007)
+
+  31 Oct 2007; Ferris McCormick <fmccor@gentoo.org>
+  +files/rc.afb-1.0.1-r6.patch, +afbinit-1.0.1-r6.ebuild:
+  Version bump for change in dmesg format to report FFB devices.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> afbinit-1.0.1-r4.ebuild:
   Fix *initd, *confd and *envd calls (#173884, #174266)
diff --git a/x11-misc/afbinit/Manifest b/x11-misc/afbinit/Manifest
index f2406f83d7a2..6d9d073fc259 100644
--- a/x11-misc/afbinit/Manifest
+++ b/x11-misc/afbinit/Manifest
@@ -14,6 +14,10 @@ AUX rc.afb-1.0.1-r5.patch 1593 RMD160 5a4359d05d6a0a1b98710028af58ddc9478ce332 S
 MD5 26078ed2c686632d2d8ba17ac8109497 files/rc.afb-1.0.1-r5.patch 1593
 RMD160 5a4359d05d6a0a1b98710028af58ddc9478ce332 files/rc.afb-1.0.1-r5.patch 1593
 SHA256 0ef3ea485f801f737cbb2f860f8ed6a6cf02733b534f14bdb76eb19e99b0ece7 files/rc.afb-1.0.1-r5.patch 1593
+AUX rc.afb-1.0.1-r6.patch 1588 RMD160 51675be34c50567020bc35cad3401b897e2a5901 SHA1 a9c9a78ebc59ea331b2970d73779ccbfe1a963b8 SHA256 c428d5349616522077c4e29240b63f6c88ddf119d4086c2bbbf68aef733a685f
+MD5 6d0c5abab31388b8567e0facdf77c20c files/rc.afb-1.0.1-r6.patch 1588
+RMD160 51675be34c50567020bc35cad3401b897e2a5901 files/rc.afb-1.0.1-r6.patch 1588
+SHA256 c428d5349616522077c4e29240b63f6c88ddf119d4086c2bbbf68aef733a685f files/rc.afb-1.0.1-r6.patch 1588
 AUX rc.afb-1.0.1.patch 1594 RMD160 8708a80f12cc4b43e413bb2ceb77f8c3c852811d SHA1 ce9eff84486241f973e4102e0a93e9fc80a31047 SHA256 914de2c94af9e0b74814a975167953b93eba573e0a29ecf93a7bff4d41f4b6de
 MD5 194a2423d8a3f0398f958d989f891c91 files/rc.afb-1.0.1.patch 1594
 RMD160 8708a80f12cc4b43e413bb2ceb77f8c3c852811d files/rc.afb-1.0.1.patch 1594
@@ -27,10 +31,14 @@ EBUILD afbinit-1.0.1-r5.ebuild 1252 RMD160 2c5436d446a4188035943b59813c6228d15c7
 MD5 c268e579da391c3ceccc10fce8cbfe00 afbinit-1.0.1-r5.ebuild 1252
 RMD160 2c5436d446a4188035943b59813c6228d15c7fdc afbinit-1.0.1-r5.ebuild 1252
 SHA256 60b890805418f3e51811204cdb3ca3aaefc78118e6c31997fdf6a0182e2574fc afbinit-1.0.1-r5.ebuild 1252
-MISC ChangeLog 4707 RMD160 aec69aa79738e91fcf86266e9533a49a33e19d44 SHA1 b9d30492e39c6fc5d344ebc518e5f63711d150f1 SHA256 100272016da486b30b0b28a4cb1c8e5dc97ed2cbef112e3aef1df33cd28553e7
-MD5 b3bb644443ffa01476d5078d38d83129 ChangeLog 4707
-RMD160 aec69aa79738e91fcf86266e9533a49a33e19d44 ChangeLog 4707
-SHA256 100272016da486b30b0b28a4cb1c8e5dc97ed2cbef112e3aef1df33cd28553e7 ChangeLog 4707
+EBUILD afbinit-1.0.1-r6.ebuild 1250 RMD160 33cd75214d837b762f7ae2cfb39988ce10e3e7b3 SHA1 aef6928ee3ad061fe9d418a9a4454a3db5e6baaf SHA256 6bb84ddc2c3770beff5dea14116ee8aa56518c82ddc7db7709d064518eb52f30
+MD5 036cfad022a1d0ba30a5825554df6931 afbinit-1.0.1-r6.ebuild 1250
+RMD160 33cd75214d837b762f7ae2cfb39988ce10e3e7b3 afbinit-1.0.1-r6.ebuild 1250
+SHA256 6bb84ddc2c3770beff5dea14116ee8aa56518c82ddc7db7709d064518eb52f30 afbinit-1.0.1-r6.ebuild 1250
+MISC ChangeLog 4914 RMD160 9a4e741cd6b6dc653c91364494b57d760279adeb SHA1 ec3b0bde08a44ca427d1dadecfc9549d84f02fa2 SHA256 9618605c0bbd46cc1225fe180a29946a059c35fabfeb4df36ff4a49cc30a018c
+MD5 bf44f8598ef89909cf0abdbd3f4d666e ChangeLog 4914
+RMD160 9a4e741cd6b6dc653c91364494b57d760279adeb ChangeLog 4914
+SHA256 9618605c0bbd46cc1225fe180a29946a059c35fabfeb4df36ff4a49cc30a018c ChangeLog 4914
 MISC metadata.xml 165 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc SHA1 87fed26b774e4dd2226bea04c4bcc8ba39fcc4c3 SHA256 d7da9ed29b7afb87ac00580d48a49d248f89c92269e9a7791782dc72f4490aec
 MD5 9ba3ceca3ae81ec759fbb9a277c0e45c metadata.xml 165
 RMD160 4ebc1c537fcebcb28586a47c958a7d0237f3bbcc metadata.xml 165
@@ -41,3 +49,6 @@ SHA256 07dd403ce6923ae6af4fa3a219483c4413f1d3b2541975517b14de8af99cf138 files/di
 MD5 a824a8f086f340320f503e743a9871c5 files/digest-afbinit-1.0.1-r5 238
 RMD160 6797b1248762351ad6fe871bf74e2ffe95a3efb9 files/digest-afbinit-1.0.1-r5 238
 SHA256 07dd403ce6923ae6af4fa3a219483c4413f1d3b2541975517b14de8af99cf138 files/digest-afbinit-1.0.1-r5 238
+MD5 a824a8f086f340320f503e743a9871c5 files/digest-afbinit-1.0.1-r6 238
+RMD160 6797b1248762351ad6fe871bf74e2ffe95a3efb9 files/digest-afbinit-1.0.1-r6 238
+SHA256 07dd403ce6923ae6af4fa3a219483c4413f1d3b2541975517b14de8af99cf138 files/digest-afbinit-1.0.1-r6 238
diff --git a/x11-misc/afbinit/afbinit-1.0.1-r6.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r6.ebuild
new file mode 100644
index 000000000000..4aca98ee0897
--- /dev/null
+++ b/x11-misc/afbinit/afbinit-1.0.1-r6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 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-r6.ebuild,v 1.1 2007/10/31 16:52:29 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/digest-afbinit-1.0.1-r6 b/x11-misc/afbinit/files/digest-afbinit-1.0.1-r6
new file mode 100644
index 000000000000..2463ee5c7015
--- /dev/null
+++ b/x11-misc/afbinit/files/digest-afbinit-1.0.1-r6
@@ -0,0 +1,3 @@
+MD5 e8fe8ac0fc16d942ff3b1508e8324e6a afbinit-1.0.1.tar.bz2 3288
+RMD160 3b401ce48ad3f135c2548b293df906dc7ddd6068 afbinit-1.0.1.tar.bz2 3288
+SHA256 3a9b246b34f9b518f2e9a143e5c9faacd0197baa4e5dd13f82ce3c336a3c285c afbinit-1.0.1.tar.bz2 3288
diff --git a/x11-misc/afbinit/files/rc.afb-1.0.1-r6.patch b/x11-misc/afbinit/files/rc.afb-1.0.1-r6.patch
new file mode 100644
index 000000000000..d02a0732cea4
--- /dev/null
+++ b/x11-misc/afbinit/files/rc.afb-1.0.1-r6.patch
@@ -0,0 +1,60 @@
+--- rc.afb-	2004-05-27 17:59:23.549406000 +0000
++++ rc.afb	2004-05-27 18:32:34.709406000 +0000
+@@ -10,25 +10,44 @@
+ 	exit 0
+ fi
+ 
+-if [ `/bin/dmesg | /bin/grep -c "Elite 3D"` -eq 0 ]
++# The microcode loader binary and the microcode
++# itself must exist.
++if [ ! -x /usr/sbin/afbinit -o ! -f /usr/lib/afb.ucode ]
+ 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 ]
++# 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
+ fi
++##
++#	OK, we're not kernel 2.4.x
++#	try kernel 2.6.x
+ 
+-# Make FB device list.
+-afb_devs=`/bin/dmesg | /bin/egrep -i "Elite 3D" | /bin/sed 's/\:.*//'`
++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