new version for testing, set ~ppc only, see ChangeLog

4 files changed, 181 insertions, 1 deletions

diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog
index 0df9e953bb40..0382e459eb78 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.3 2003/02/03 03:08:24 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.4 2003/02/08 21:17:16 gerk Exp $
+
+*xfree-drm-4.2.99.4-r1 (07 Feb 2003)
+  07 Feb 2003; Mark Guertin <gerk@gentoo.org> xfree-drm-4.2.99.4.ebuild
+  files/xfree-drm-4.2.99.4-gentoo-ppc-Makefile-fixup.patch:
+  Major reworking of parts for ppc sections.  Using a drm tarball.
+  x86 not set at all as it's not tested yet (method stays same for 
+  x86). Set only as ~ppc
 
 *xfree-drm-4.2.99.4 (03 Feb 2003)
 
diff --git a/x11-base/xfree-drm/files/digest-xfree-drm-4.2.99.4-r1 b/x11-base/xfree-drm/files/digest-xfree-drm-4.2.99.4-r1
new file mode 100644
index 000000000000..c5d2ebf4eda7
--- /dev/null
+++ b/x11-base/xfree-drm/files/digest-xfree-drm-4.2.99.4-r1
@@ -0,0 +1 @@
+MD5 912e1bfd85ca8cfec42d1b4f44d716ba drm-trunk.tar.gz 191561
diff --git a/x11-base/xfree-drm/files/xfree-drm-4.2.99.4-gentoo-ppc-Makefile-fixup.patch b/x11-base/xfree-drm/files/xfree-drm-4.2.99.4-gentoo-ppc-Makefile-fixup.patch
new file mode 100644
index 000000000000..3a4c94b42a75
--- /dev/null
+++ b/x11-base/xfree-drm/files/xfree-drm-4.2.99.4-gentoo-ppc-Makefile-fixup.patch
@@ -0,0 +1,49 @@
+--- modules/drm-trunk/Makefile.linux.orig	2003-02-08 17:26:19.000000000 +0000
++++ modules/drm-trunk/Makefile.linux	2003-02-08 17:27:34.000000000 +0000
+@@ -38,7 +38,7 @@
+ 
+ # **** End of SMP/MODVERSIONS detection
+ 
+-MODS =		gamma.o tdfx.o r128.o radeon.o
++MODS =		r128.o radeon.o
+ LIBS =
+ 
+ DRMTEMPLATES =	drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h \
+@@ -148,12 +148,15 @@
+ ifeq ($(AGP),1)
+ MODCFLAGS += -DCONFIG_AGP -DCONFIG_AGP_MODULE
+ DRMTEMPLATES += drm_agpsupport.h
+-MODS += mga.o
+ ifeq ($(MACHINE),i386)
++MODS += mga.o
++MODS += sis.o
+ MODS += i810.o
+ MODS += i830.o
+ endif
+ ifeq ($(MACHINE),i686)
++MODS += mga.o
++MODS += sis.o
+ MODS += i810.o
+ MODS += i830.o
+ endif
+@@ -173,7 +176,6 @@
+ MODCFLAGS+=      -ffixed-8 -mno-fp-regs -mcpu=ev56 -Wa,-mev6 
+ endif
+ 
+-MODS += sis.o
+ 
+ SISOBJS=	sis_drv.o sis_mm.o sis_ds.o 
+ SISHEADERS=	sis_drv.h sis_drm.h $(DRMHEADERS)
+@@ -278,5 +280,12 @@
+ $(I830OBJS): $(I830HEADERS)
+ endif
+ 
++install: $(MODS)
++	install -d -m 0755 $(DESTDIR)/lib/modules/$(KV)/kernel/drivers/char/drm
++	@for i in $(MODS); do \
++		install -m 0755 $$i $(DESTDIR)/lib/modules/$(KV)/kernel/drivers/char/drm; \
++	done
++
++
+ clean cleandir::
+ 	rm -f *.o *.a *~ core
diff --git a/x11-base/xfree-drm/xfree-drm-4.2.99.4-r1.ebuild b/x11-base/xfree-drm/xfree-drm-4.2.99.4-r1.ebuild
new file mode 100644
index 000000000000..551333c35427
--- /dev/null
+++ b/x11-base/xfree-drm/xfree-drm-4.2.99.4-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2002 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.2.99.4-r1.ebuild,v 1.1 2003/02/08 21:17:16 gerk 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 ...
+
+# PPC is using such a tarball here now.  The fixes we need (read hacks) don't exist
+# in xfree trees (yet), and likely may not for a while due to the hackish nature
+# Gerk - Feb 07 2003
+
+IUSE=""
+
+inherit eutils
+
+# 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"
+
+DESCRIPTION="Xfree86 Kernel DRM modules"
+HOMEPAGE="http://www.xfree.org"
+LICENSE="X11"
+SLOT="0"
+KEYWORDS="~ppc"
+
+DEPEND=">=x11-base/xfree-${PV}"
+
+PROVIDE="virtual/drm"
+
+# different methods needed here for x86 + ppc, using pre-patched DRM tarball - Gerk
+if [ `use x86` ] ; then  
+	S="${WORKDIR}/xc"
+
+	# Are we using a snapshot ?
+	USE_SNAPSHOT="yes"
+
+	BASE_PV="${PV}"
+
+	SRC_PATH0="ftp://ftp.xfree.org/pub/XFree86/${BASE_PV}/source"
+	SRC_PATH1="ftp://ftp1.sourceforge.net/pub/mirrors/XFree86/${BASE_PV}/source"
+	# If we are using CVS snapshots made by Seemant ...
+	SRC_PATH_SS="http://www.ibiblio.org/gentoo/gentoo-sources"
+
+	if [ "${USE_SNAPSHOT}" = "yes" ]
+	then
+		SRC_URI="${SRC_PATH_SS}/X${BASE_PV}-1.tar.bz2
+			${SRC_PATH_SS}/X${BASE_PV}-2.tar.bz2
+			${SRC_PATH_SS}/X${BASE_PV}-3.tar.bz2
+			${SRC_PATH_SS}/X${BASE_PV}-4.tar.bz2"
+	else
+		SRC_URI="${SRC_PATH0}/X${MY_SV}src-1.tgz
+			${SRC_PATH0}/X${MY_SV}src-2.tgz
+			${SRC_PATH0}/X${MY_SV}src-3.tgz
+			${SRC_PATH1}/X${MY_SV}src-1.tgz
+			${SRC_PATH1}/X${MY_SV}src-2.tgz
+			${SRC_PATH1}/X${MY_SV}src-3.tgz"
+	fi
+	MY_S="${S}/programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
+	MY_MODULES=""  # can limit modules here or blank for all
+fi
+
+if [ `use ppc` ] ; then  
+	S="${WORKDIR}" 
+	SRC_URI="http://cvs.gentoo.org/~gerk/distfiles/drm-trunk.tar.gz"
+	MY_S="modules/drm-trunk"
+	#MY_MODULES="r128.o radeon.o"
+fi
+
+pkg_setup() {
+	
+	check_KV
+}
+
+src_unpack() {
+
+	if [ `use x86` ] ; then
+		if [ "${USE_SNAPSHOT}" = "yes" ]
+		then
+			unpack X${BASE_PV}-{1,2,3,4}.tar.bz2
+		else
+			unpack X${MY_SV}src-{1,2,3}.tgz
+		fi
+	
+		cd ${S}
+		epatch ${FILESDIR}/${P}-gentoo-Makefile-fixup.patch
+	fi
+
+	if [ `use ppc` ] ; then 
+		unpack drm-trunk.tar.gz
+		epatch ${FILESDIR}/${P}-gentoo-ppc-Makefile-fixup.patch
+	fi
+
+}
+
+src_compile() {
+
+	check_KV
+	einfo "Building DRM..."
+	cd ${MY_S}
+	make -f Makefile.linux ${MY_MODULES} \
+		TREE="/usr/src/linux/include" KV="${KV}" || die
+}
+
+src_install() {
+
+	einfo "installing DRM..."
+	cd ${MY_S}
+	make -f Makefile.linux ${MY_MODULES} \
+		TREE="/usr/src/linux/include" \
+		KV="${KV}" DESTDIR="${D}" \
+		install || die
+}
+
+pkg_postinst() {
+
+	if [ "${ROOT}" = "/" ]
+	then
+		/sbin/modules-update
+	fi
+}
+