Updating to today's DRI, in hopes of solving a couple of problems with MTRR_TYPE_WRCOMB. Masked for testing.

4 files changed, 170 insertions, 2 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index d9e9702e3aa0..0289168ae8f4 100644
--- a/x11-base/xfree-drm/ChangeLog
+++ b/x11-base/xfree-drm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xfree-drm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.27 2003/06/30 06:10:36 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.28 2003/07/01 06:49:43 spyderous Exp $
+
+*xfree-drm-4.3.0-r5 (01 Jul 2003)
+
+  01 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r5.ebuild:
+  Updating to today's DRI, in hopes of solving a couple of problems with
+  MTRR_TYPE_WRCOMB. Masked for testing.
 
   30 Jun 2003; Donnie Berkholz <spyderous@gentoo.org>;
   xfree-drm-4.3.0-r4.ebuild:
diff --git a/x11-base/xfree-drm/Manifest b/x11-base/xfree-drm/Manifest
index b3d50dba8e1a..e08b2456db3e 100644
--- a/x11-base/xfree-drm/Manifest
+++ b/x11-base/xfree-drm/Manifest
@@ -1,7 +1,9 @@
-MD5 152c80322d44b9ec3631b973d12dd258 ChangeLog 5903
 MD5 6b1f0d725e8037cbf3c62d9ebee51ec8 xfree-drm-4.3.0-r2.ebuild 2655
 MD5 0ed345e1687362bd46dbb26d1b3958e8 xfree-drm-4.3.0-r3.ebuild 2917
 MD5 6e4f83191b106d1d4b1a7439b4d1bb37 xfree-drm-4.3.0-r4.ebuild 4062
+MD5 0dc7994107b35d26829b47221c948fcc xfree-drm-4.3.0-r5.ebuild 4221
+MD5 3f8ceb1d0e3f7d6afdc9fe5ce31c649c ChangeLog 6136
 MD5 b340ab262c964f235620a98d7626d6b9 files/digest-xfree-drm-4.3.0-r2 166
 MD5 08d125fc239e02143fe64d48dcadb64c files/digest-xfree-drm-4.3.0-r3 169
 MD5 ac5dd043f538e9fed0825d46d6e999e4 files/digest-xfree-drm-4.3.0-r4 168
+MD5 e8df58fc40e04737c8a8e140c5903c44 files/digest-xfree-drm-4.3.0-r5 168
diff --git a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r5 b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r5
new file mode 100644
index 000000000000..1c930b15e6d8
--- /dev/null
+++ b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r5
@@ -0,0 +1,2 @@
+MD5 71e431370243132109a9c60f6aed4359 linux-drm-4.3.0-kernelsource-20030630.tar.gz 276134
+MD5 35fa1043b25f1a000d4d307103fef834 xfree-drm-4.3.0-r5-gentoo-0.1.tar.bz2 966
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r5.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r5.ebuild
new file mode 100644
index 000000000000..d09d1b7c90e0
--- /dev/null
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r5.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r5.ebuild,v 1.1 2003/07/01 06:49:43 spyderous Exp $
+
+# Small note:  we should prob consider using a DRM only tarball, as it will ease
+#              some of the overhead on older systems, and will enable us to
+#              update DRM if there are fixes not already in XFree86 tarballs ...
+
+IUSE="3dfx gamma i8x0 matrox rage128 radeon sis"
+
+# VIDEO_CARDS="3dfx gamma i810 i830 matrox rage128 radeon sis"
+
+inherit eutils xfree
+
+# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure
+# that only we only strip stuff that are safe to strip ...
+DEBUG="yes"
+RESTRICT="nostrip"
+
+SNAPSHOT="20030630"
+PATCHVER="0.1"
+
+S="${WORKDIR}/drm"
+DESCRIPTION="Xfree86 Kernel DRM modules"
+HOMEPAGE="http://www.xfree.org"
+SRC_URI="mirror://gentoo/linux-drm-${PV}-kernelsource-${SNAPSHOT}.tar.gz
+	mirror://gentoo/${PF}-gentoo-${PATCHVER}.tar.bz2"
+
+# These sources come from one of these places:
+#
+#   http://www.xfree86.org/~alanh/ -- DRM snapshots, outdated 
+#   http://people.debian.org/~daenzer/ -- full tree, often patched but
+#	somewhat outdated
+#   http://dri.sourceforge.net/snapshots/ -- daily CVS snapshots, lacking
+#	gamma and sis
+#   http://dri.sourceforge.net CVS -- full tree
+#   http://cvs.sourceforge.net/cvstarballs/dri-cvsroot.tar.gz -- backup
+#   rsync -avz --delete rsync://mefriss1.swan.ac.uk/dri/ -- temporary
+#
+# We throw all necessary files into one folder and turn that into our tarball.
+
+SLOT="${KV}"
+LICENSE="X11"
+KEYWORDS="-x86 -ppc -alpha"
+
+DEPEND=">=x11-base/xfree-${PV}
+	virtual/linux-sources"
+
+PROVIDE="virtual/drm"
+
+
+VIDCARDS=""
+
+if [ `use matrox || vcards matrox` ]
+then
+	VIDCARDS="${VIDCARDS} mga.o"
+fi
+if [ `use 3dfx || vcards 3dfx` ]
+then
+	VIDCARDS="${VIDCARDS} tdfx.o"
+fi
+if [ `use rage128 || vcards rage128` ]
+then
+	VIDCARDS="${VIDCARDS} r128.o"
+fi
+if [ `use radeon || vcards radeon` ]
+then
+	VIDCARDS="${VIDCARDS} radeon.o"
+fi
+if [ `use sis || vcards sis` ]
+then
+	VIDCARDS="${VIDCARDS} sis.o"
+fi
+if use i8x0 &>/dev/null
+then
+	VIDCARDS="${VIDCARDS} i810.o i830.o"
+fi
+if [ `use gamma || vcards gamma` ]
+then
+	VIDCARDS="${VIDCARDS} gamma.o"
+fi
+
+# Add VIDEO_CARDS functionality.
+# Having a module twice (once from USE, once from VIDEO_CARDS)
+# doesn't matter at all.
+#vcards matrox &>/dev/null && VIDCARDS="${VIDCARDS} mga.o"
+#vcards 3dfx &>/dev/null && VIDCARDS="${VIDCARDS} tdfx.o"
+#vcards rage128 &>/dev/null && VIDCARDS="${VIDCARDS} r128.o"
+#vcards radeon &>/dev/null && VIDCARDS="${VIDCARDS} radeon.o"
+#vcards sis &>/dev/null && VIDCARDS="${VIDCARDS} sis.o"
+#vcards gamma &>/dev/null && VIDCARDS="${VIDCARDS} gamma.o"
+vcards i810 &>/dev/null && VIDCARDS="${VIDCARDS} i810.o"
+vcards i830 &>/dev/null && VIDCARDS="${VIDCARDS} i830.o"
+
+# This builds everything if none of the cards are in USE.
+#if [ -z "${VIDCARDS}" ]
+#then
+#	if [ "${ARCH}" = "ppc" ]
+#	then
+#		VIDCARDS="r128.o radeon.o"
+#	else
+#		VIDCARDS="mga.o tdfx.o r128.o radeon.o sis.o i810.o i830.o gamma.o"
+#	fi
+#fi
+
+src_unpack() {
+	if [ ! -f /usr/src/linux/include/config/MARKER ] ; then
+		die "Please compile kernel sources."
+	fi
+
+	if [ -z "${VIDCARDS}" ] ; then
+		die "Please set at least one video card in VIDEO_CARDS. USE is deprecated. Possible VIDEO_CARDS values are matrox, 3dfx, rage128, radeon, sis, i810, i830, and gamma."
+	fi
+
+	unpack ${A}
+	cd ${S}
+
+	local PATCHDIR=${WORKDIR}/patch
+
+	epatch ${PATCHDIR}/${PF}-gentoo-Makefile-fixup.patch
+	epatch ${PATCHDIR}/${PF}-dristat.patch
+}
+
+src_compile() {
+	check_KV
+	ln -sf Makefile.linux Makefile
+	einfo "Building DRM..."
+	make ${VIDCARDS} \
+		TREE="/usr/src/linux/include" KV="${KV}"
+	make dristat || die
+}
+
+src_install() {
+
+	einfo "installing DRM..."
+	make \
+		TREE="/usr/src/linux/include" \
+		KV="${KV}" \
+		DESTDIR="${D}" \
+		MODS="${VIDCARDS}" \
+		install || die
+	dodoc README*
+	exeinto /usr/X11R6/bin
+	doexe dristat
+}
+
+pkg_postinst() {
+
+	if [ "${ROOT}" = "/" ]
+	then
+		/sbin/modules-update
+	fi
+
+	einfo "USE is deprecated. Please set your video cards using VIDEO_CARDS."
+	einfo "Possible VIDEO_CARDS values are matrox, 3dfx, rage128, radeon, sis, i810, i830, and gamma."
+
+}