New snapshot, also installs nouveau now. No more kernel 2.4 support! Should fix bug #165553.

(Portage version: 2.1.2.2)

3 files changed, 361 insertions, 1 deletions

diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog
index dbf7fb834a37..7181aec98c74 100644
--- a/x11-base/x11-drm/ChangeLog
+++ b/x11-base/x11-drm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-base/x11-drm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.50 2007/01/04 07:31:03 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.51 2007/03/14 17:08:12 battousai Exp $
+
+*x11-drm-20070314 (14 Mar 2007)
+
+  14 Mar 2007; Bryan Stine <battousai@gentoo.org> +x11-drm-20070314.ebuild:
+  New snapshot of upstream git. Mesa upstream drm has removed support for 2.4
+  kernels, so this ebuild will die if the user attempts to build against such
+  sources. Most likely, this means we'll have to keep 20060608 around. The
+  nouveau module is now installed alongside nv, so users can load the one they
+  want (probably nouveau). The updated snapshot should fix bug #165553.
 
   04 Jan 2007; Bryan Stine <battousai@gentoo.org> x11-drm-20060608.ebuild,
   x11-drm-20060608-r1.ebuild:
diff --git a/x11-base/x11-drm/files/digest-x11-drm-20070314 b/x11-base/x11-drm/files/digest-x11-drm-20070314
new file mode 100644
index 000000000000..1cf9d3bf3b37
--- /dev/null
+++ b/x11-base/x11-drm/files/digest-x11-drm-20070314
@@ -0,0 +1,6 @@
+MD5 05d53089e0dcfb98623afd43511badcc linux-drm-20070314-kernelsource.tar.bz2 424009
+RMD160 649e007221b1a92e6604695f9467e065bc90e6b8 linux-drm-20070314-kernelsource.tar.bz2 424009
+SHA256 ff9b834426fdbcee24991c42acef823c8beab6c15baec0c39e66a5acb790fd69 linux-drm-20070314-kernelsource.tar.bz2 424009
+MD5 8861a4259d189dc0847e8e494c254fc6 x11-drm-20070314-gentoo-0.1.tar.bz2 980
+RMD160 af1d8089b70c62d0c650b25eab0a1bc129c48a7b x11-drm-20070314-gentoo-0.1.tar.bz2 980
+SHA256 8e17b5580993e0e42ab76a347ed6edcb561beb9f69ea4baed744add18a0a14f2 x11-drm-20070314-gentoo-0.1.tar.bz2 980
diff --git a/x11-base/x11-drm/x11-drm-20070314.ebuild b/x11-base/x11-drm/x11-drm-20070314.ebuild
new file mode 100644
index 000000000000..9857d53f7191
--- /dev/null
+++ b/x11-base/x11-drm/x11-drm-20070314.ebuild
@@ -0,0 +1,345 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.1 2007/03/14 17:08:12 battousai Exp $
+
+inherit eutils x11 linux-mod
+
+IUSE_VIDEO_CARDS="
+	video_cards_i810
+	video_cards_mach64
+	video_cards_mga
+	video_cards_nv
+	video_cards_r128
+	video_cards_radeon
+	video_cards_savage
+	video_cards_sis
+	video_cards_sunffb
+	video_cards_tdfx
+	video_cards_via"
+IUSE="${IUSE_VIDEO_CARDS} kernel_FreeBSD kernel_linux"
+
+# 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 ...
+RESTRICT="nostrip"
+
+S="${WORKDIR}/drm"
+PATCHVER="0.1"
+PATCHDIR="${WORKDIR}/patch"
+EXCLUDED="${WORKDIR}/excluded"
+
+DESCRIPTION="DRM Kernel Modules for X11"
+HOMEPAGE="http://dri.sf.net"
+SRC_URI="mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2
+	 mirror://gentoo/linux-drm-${PV}-kernelsource.tar.bz2"
+
+SLOT="0"
+LICENSE="X11"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86 ~x86-fbsd"
+
+DEPEND=">=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.59
+	>=sys-devel/libtool-1.5.14
+	>=sys-devel/m4-1.4
+	kernel_linux? ( virtual/linux-sources )
+	kernel_FreeBSD? ( sys-freebsd/freebsd-sources
+			sys-freebsd/freebsd-mk-defs )
+	>=sys-apps/portage-2.0.49-r13"
+
+pkg_setup() {
+	# Setup the kernel's stuff.
+	kernel_setup
+
+	# Set video cards to build for.
+	set_vidcards
+
+	# Determine which -core dir we build in.
+	get_drm_build_dir
+
+	return 0
+}
+
+src_unpack() {
+	unpack linux-drm-${PV}-kernelsource.tar.bz2
+	unpack ${P}-gentoo-${PATCHVER}.tar.bz2
+
+	cd ${S}
+
+	patch_prepare
+
+	# Apply patches
+	EPATCH_SUFFIX="patch" epatch ${PATCHDIR}
+
+	# Substitute new directory under /lib/modules/${KV_FULL}
+	cd ${SRC_BUILD}
+	sed -ie "s:/kernel/drivers/char/drm:/${PN}:g" Makefile
+
+	cp ${S}/tests/*.c ${SRC_BUILD}
+
+	src_unpack_os
+
+	cd ${S}
+	WANT_AUTOCONF="2.5" WANT_AUTOMAKE="1.7" autoreconf -v --install
+}
+
+src_compile() {
+	cd ${S}
+	# Building the programs. These are useful for developers and getting info from DRI and DRM.
+	#
+	# libdrm objects are needed for drmstat.
+	econf || die "libdrm configure failed."
+	emake || die "libdrm build failed."
+
+	einfo "Building DRM in ${SRC_BUILD}..."
+	src_compile_os
+	einfo "DRM build finished".
+}
+
+src_install() {
+	einfo "Installing DRM..."
+	cd ${SRC_BUILD}
+
+	src_install_os
+
+	dodoc "${S}/linux-core/README.drm"
+
+	dobin dristat
+	dobin drmstat
+}
+
+pkg_postinst() {
+	if use video_cards_sis
+	then
+		einfo "SiS direct rendering only works on 300 series chipsets."
+		einfo "SiS framebuffer also needs to be enabled in the kernel."
+	fi
+
+	if use video_cards_mach64
+	then
+		einfo "The Mach64 DRI driver is insecure."
+		einfo "Malicious clients can write to system memory."
+		einfo "For more information, see:"
+		einfo "http://dri.freedesktop.org/wiki/ATIMach64."
+	fi
+
+	pkg_postinst_os
+}
+
+# Functions used above are defined below:
+
+kernel_setup() {
+	if use kernel_FreeBSD
+	then
+		K_RV=${CHOST/*-freebsd/}
+	elif use kernel_linux
+	then
+		get_version
+
+		if kernel_is 2 4
+		then
+			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
+			eerror "longer support them."
+			die "Please use in-kernel DRM or switch to a 2.6 kernel."
+		fi
+
+		if linux_chkconfig_builtin "DRM"
+		then
+			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
+		fi
+
+		if ! linux_chkconfig_present "AGP"
+		then
+			einfo "AGP support is not enabled in your kernel config. This may be needed for DRM to"
+			einfo "work, so you might want to double-check that setting. (CONFIG_AGP)"
+			echo
+		fi
+	fi
+}
+
+set_vidcards() {
+	if use kernel_linux; then
+		set_kvobj
+		I810_VIDCARDS="i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}"
+	elif use kernel_FreeBSD; then
+		KV_OBJ="ko"
+		# bsd does not have i810/i830, only i915:
+		I810_VIDCARDS="i915.${KV_OBJ}"
+	fi
+
+	VIDCARDS=""
+
+	if [[ -n "${VIDEO_CARDS}" ]]; then
+		use video_cards_i810 && \
+			VIDCARDS="${VIDCARDS} ${I810_VIDCARDS}"
+		use video_cards_mach64 && \
+			VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}"
+		use video_cards_mga && \
+			VIDCARDS="${VIDCARDS} mga.${KV_OBJ}"
+		use video_cards_nv && \
+			VIDCARDS="${VIDCARDS} nv.${KV_OBJ} nouveau.${KV_OBJ}"
+		use video_cards_r128 && \
+			VIDCARDS="${VIDCARDS} r128.${KV_OBJ}"
+		use video_cards_radeon && \
+			VIDCARDS="${VIDCARDS} radeon.${KV_OBJ}"
+		use video_cards_savage && \
+			VIDCARDS="${VIDCARDS} savage.${KV_OBJ}"
+		use video_cards_sis && \
+			VIDCARDS="${VIDCARDS} sis.${KV_OBJ}"
+		use video_cards_via && \
+			VIDCARDS="${VIDCARDS} via.${KV_OBJ}"
+		use video_cards_sunffb && \
+			VIDCARDS="${VIDCARDS} ffb.${KV_OBJ}"
+		use video_cards_tdfx && \
+			VIDCARDS="${VIDCARDS} tdfx.${KV_OBJ}"
+	fi
+}
+
+get_drm_build_dir() {
+	if use kernel_FreeBSD
+	then
+		SRC_BUILD="${S}/bsd-core"
+	elif kernel_is 2 6
+	then
+		SRC_BUILD="${S}/linux-core"
+	fi
+}
+
+patch_prepare() {
+	# Handle exclusions based on the following...
+	#     All trees (0**), Standard only (1**), Others (none right now)
+	#     2.4 vs. 2.6 kernels
+	if use kernel_linux
+	then
+	    kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED}
+	fi
+
+	# There is only one tree being maintained now. No numeric exclusions need
+	# to be done based on DRM tree.
+}
+
+src_unpack_freebsd() {
+	# Do FreeBSD stuff.
+	if use kernel_FreeBSD
+	then
+		# Link in freebsd kernel.
+		ln -s "/usr/src/sys-${K_RV}" "${WORKDIR}/sys"
+		# SUBDIR variable gets to all Makefiles, we need it only in the main one.
+		SUBDIRS=${VIDCARDS//.ko}
+		sed -ie "s:SUBDIR\ =.*:SUBDIR\ =\ drm ${SUBDIRS}:" ${SRC_BUILD}/Makefile
+	fi
+}
+
+src_unpack_os() {
+	if use kernel_FreeBSD
+	then
+		src_unpack_freebsd
+	fi
+}
+
+src_compile_os() {
+	if use kernel_linux
+	then
+		src_compile_linux
+	elif use kernel_FreeBSD
+	then
+		src_compile_freebsd
+	fi
+}
+
+src_install_os() {
+	if use kernel_linux
+	then
+		src_install_linux
+	elif use kernel_FreeBSD
+	then
+		src_install_freebsd
+	fi
+}
+
+src_compile_linux() {
+	# This now uses an M= build system. Makefile does most of the work.
+	cd ${SRC_BUILD}
+	unset ARCH
+	emake M="${SRC_BUILD}" \
+		LINUXDIR="${KERNEL_DIR}" \
+		DRM_MODULES="${VIDCARDS}" \
+		modules || die_error
+
+	if linux_chkconfig_present DRM
+	then
+		echo "Please disable in-kernel DRM support to use this package."
+	fi
+
+	# LINUXDIR is needed to allow Makefiles to find kernel release.
+	cd ${SRC_BUILD}
+	emake LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed."
+	emake LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed."
+}
+
+src_compile_freebsd() {
+	cd ${SRC_BUILD}
+	# Environment CFLAGS overwrite kernel CFLAGS which is bad.
+	local svcflags=${CFLAGS}; local svldflags=${LDFLAGS}
+	unset CFLAGS; unset LDFLAGS
+	MAKE=make \
+		emake \
+		NO_WERROR= \
+		SYSDIR="${WORKDIR}/sys" \
+		KMODDIR="/boot/modules" \
+		|| die "pmake failed."
+	export CFLAGS=${svcflags}; export LDFLAGS=${svldflags}
+
+	cd "${S}/tests"
+	# -D_POSIX_SOURCE skips the definition of several stuff we need
+	# for these two to compile
+	sed -i -e "s/-D_POSIX_SOURCE//" Makefile
+	emake dristat || die "Building dristat failed."
+	emake drmstat || die "Building drmstat failed."
+	# Move these where the linux stuff expects them
+	mv dristat drmstat ${SRC_BUILD}
+}
+
+die_error() {
+	eerror "Portage could not build the DRM modules. If you see an ACCESS DENIED error,"
+	eerror "this could mean that you were using an unsupported kernel build system."
+	eerror "Only 2.6 kernels at least as new as 2.6.6 are supported."
+	die "Unable to build DRM modules."
+}
+
+src_install_linux() {
+	cd ${SRC_BUILD}
+	unset ARCH
+	kernel_is 2 6 && DRM_KMOD="drm.${KV_OBJ}"
+	emake KV="${KV_FULL}" \
+		LINUXDIR="${KERNEL_DIR}" \
+		DESTDIR="${D}" \
+		RUNNING_REL="${KV_FULL}" \
+		MODULE_LIST="${VIDCARDS} ${DRM_KMOD}" \
+		install || die "Install failed."
+
+	# Strip binaries, leaving /lib/modules untouched (bug #24415)
+	strip_bins \/lib\/modules
+
+	# Yoinked from the sys-apps/touchpad ebuild. Thanks to whoever made this.
+	keepdir /etc/modules.d
+	sed 's:%PN%:'${PN}':g' ${FILESDIR}/modules.d-${PN} > ${D}/etc/modules.d/${PN}
+	sed -i 's:%KV%:'${KV_FULL}':g' ${D}/etc/modules.d/${PN}
+}
+
+src_install_freebsd() {
+	cd ${SRC_BUILD}
+	dodir "/boot/modules"
+	MAKE=make \
+		emake \
+		install \
+		NO_WERROR= \
+		DESTDIR="${D}" \
+		KMODDIR="/boot/modules" \
+		|| die "Install failed."
+}
+
+pkg_postinst_os() {
+	if use kernel_linux
+	then
+		linux-mod_pkg_postinst
+	fi
+}