Fixed Makefile so it actually uses /usr/src/linux, fixed sandbox issues, updated drm to fix various bugs including i810 problems, fixed pte_offset unresolved symbols issue.

4 files changed, 171 insertions, 2 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index 5763e993ae90..d7a5409fbb6e 100644
--- a/x11-base/xfree-drm/ChangeLog
+++ b/x11-base/xfree-drm/ChangeLog
@@ -1,6 +1,14 @@
 # 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.30 2003/07/14 01:52:28 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.31 2003/07/14 07:31:39 spyderous Exp $
+
+*xfree-drm-4.3.0-r6 (14 Jul 2003)
+
+  14 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
+  xfree-drm-4.3.0-r6.ebuild:
+  Fixed Makefile so it actually uses /usr/src/linux, fixed sandbox issues,
+  updated drm to fix various bugs including i810 problems, fixed pte_offset
+  unresolved symbols issue.
 
   13 Jul 2003; Donnie Berkholz <spyderous@gentoo.org>;
   xfree-drm-4.3.0-r3.ebuild, xfree-drm-4.3.0-r5.ebuild:
diff --git a/x11-base/xfree-drm/Manifest b/x11-base/xfree-drm/Manifest
index 45d19b457cd6..afba56d13c59 100644
--- a/x11-base/xfree-drm/Manifest
+++ b/x11-base/xfree-drm/Manifest
@@ -1,10 +1,12 @@
-MD5 a34004d16acccf3d8b1714d616a4d569 ChangeLog 6427
+MD5 008b41605abe2b69dd4c81e5431fd985 ChangeLog 6726
 MD5 cd0b06404869599fa61bb7976be237a2 metadata.xml 476
 MD5 6b1f0d725e8037cbf3c62d9ebee51ec8 xfree-drm-4.3.0-r2.ebuild 2655
 MD5 bcc25e23d92acfd03d3a7ddb1a9cc12b xfree-drm-4.3.0-r3.ebuild 2917
 MD5 6e4f83191b106d1d4b1a7439b4d1bb37 xfree-drm-4.3.0-r4.ebuild 4062
 MD5 e1ab195612bb651d9dfecdd654ce1817 xfree-drm-4.3.0-r5.ebuild 4214
+MD5 053acb073ece28f5250ba814b259676c xfree-drm-4.3.0-r6.ebuild 4116
 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
+MD5 28e6b88023d6361cf34bf7fb2d66727a files/digest-xfree-drm-4.3.0-r6 169
diff --git a/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r6 b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r6
new file mode 100644
index 000000000000..a88b8cb41ff0
--- /dev/null
+++ b/x11-base/xfree-drm/files/digest-xfree-drm-4.3.0-r6
@@ -0,0 +1,2 @@
+MD5 26820c1cf12ba2b2b71b4a3806875e9c linux-drm-4.3.0-kernelsource-20030714.tar.gz 329112
+MD5 fdab08702dd8eb4896b7faeb6ee885b0 xfree-drm-4.3.0-r6-gentoo-0.1.tar.bz2 6669
diff --git a/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild b/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild
new file mode 100644
index 000000000000..7238ac624165
--- /dev/null
+++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r6.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-r6.ebuild,v 1.1 2003/07/14 07:31:39 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 ...
+
+# Removing USE as soon as VIDEO_CARDS shows up in make.conf
+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="20030714"
+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="-*"
+
+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
+
+vcards i810 &>/dev/null && VIDCARDS="${VIDCARDS} i810.o"
+vcards i830 &>/dev/null && VIDCARDS="${VIDCARDS} i830.o"
+
+src_unpack() {
+# Is this necessary with the fixed Makefile?
+	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
+
+# Pfeifer said this patch is ok for any kernel >= 2.4 <spyderous>
+#	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 4 ] && \
+	if [ -r /usr/src/linux/mm/rmap.c ]
+	then
+		einfo "Detected rmap enabled kernel."
+		EPATCH_SINGLE_MSG="Applying rmap patch..." \
+		epatch ${PATCHDIR}/${PF}-pte_offset.diff
+	fi
+
+# Fix for 2.5 kernels
+#	if [ "${KV_major}" -eq 2 -a "${KV_minor}" -eq 5 ]
+#	then
+#		EPATCH_SINGLE_MSG="Applying patch for kernel 2.5..." \
+#		epatch ${PATCHDIR}/${PF}-drm_2.5.diff
+#	fi
+
+}
+
+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
+	if [ -z "VIDEO_CARDS" ]
+	then
+		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."
+	fi
+}