[gentoo-commits] gentoo-x86 commit in x11-base/x11-drm: ChangeLog x11-drm-20070314.ebuild x11-drm-20080710.ebuild

[Bryan Stine (battousai)]

battousai    08/09/12 05:15:23

  Modified:             ChangeLog x11-drm-20070314.ebuild
                        x11-drm-20080710.ebuild
  Log:
  20070314 patchball 0.4, 20080710 ebuild reworked a bit, patchball 0.2
  (Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc4 x86_64)

Revision  Changes    Path
1.59                 x11-base/x11-drm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/ChangeLog?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/ChangeLog?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/ChangeLog?r1=1.58&r2=1.59

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- ChangeLog	11 Jul 2008 05:29:05 -0000	1.58
+++ ChangeLog	12 Sep 2008 05:15:22 -0000	1.59
@@ -1,6 +1,12 @@
 # ChangeLog for x11-base/x11-drm
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.58 2008/07/11 05:29:05 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.59 2008/09/12 05:15:22 battousai Exp $
+
+  12 Sep 2008; Bryan D. Stine <battousai@g.o>
+  x11-drm-20070314.ebuild, x11-drm-20080710.ebuild:
+  Bump 20070314 to patchball 0.4, with FreeBSD fix. Bump masked 20080710 to
+  patchball 0.2 with numerous fixes and an initial Changelog, removed
+  modprobe.d, and better linux-mod functionality.
 
   11 Jul 2008; Bryan Stine <battousai@g.o> x11-drm-20070314.ebuild:
   20070314 patchball update for updated kernel compatibility.



1.6                  x11-base/x11-drm/x11-drm-20070314.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild?r1=1.5&r2=1.6

Index: x11-drm-20070314.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- x11-drm-20070314.ebuild	11 Jul 2008 05:29:05 -0000	1.5
+++ x11-drm-20070314.ebuild	12 Sep 2008 05:15:22 -0000	1.6
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.5 2008/07/11 05:29:05 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20070314.ebuild,v 1.6 2008/09/12 05:15:22 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -26,7 +26,7 @@
 RESTRICT="strip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.3"
+PATCHVER="0.4"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 



1.2                  x11-base/x11-drm/x11-drm-20080710.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild?r1=1.1&r2=1.2

Index: x11-drm-20080710.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x11-drm-20080710.ebuild	11 Jul 2008 04:57:43 -0000	1.1
+++ x11-drm-20080710.ebuild	12 Sep 2008 05:15:22 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v 1.1 2008/07/11 04:57:43 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20080710.ebuild,v 1.2 2008/09/12 05:15:22 battousai Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.7"
@@ -27,7 +27,7 @@
 RESTRICT="strip"
 
 S="${WORKDIR}/drm"
-PATCHVER="0.1"
+PATCHVER="0.2"
 PATCHDIR="${WORKDIR}/patch"
 EXCLUDED="${WORKDIR}/excluded"
 
@@ -49,12 +49,12 @@
 	# 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
 
+	# Set video cards to build for.
+	set_vidcards
+
 	return 0
 }
 
@@ -129,8 +129,6 @@
 		K_RV=${CHOST/*-freebsd/}
 	elif use kernel_linux
 	then
-		linux-mod_pkg_setup
-
 		if kernel_is 2 4
 		then
 			eerror "Upstream support for 2.4 kernels has been removed, so this package will no"
@@ -138,11 +136,12 @@
 			die "Please use in-kernel DRM or switch to a 2.6 kernel."
 		fi
 
-		linux_chkconfig_builtin "DRM" && \
-			die "Please disable or modularize DRM in the kernel config. (CONFIG_DRM = n or m)"
+		CONFIG_CHECK="!DRM ~AGP"
+		ERROR_DRM="Please disable DRM in the kernel config. (CONFIG_DRM = n)"
+		ERROR_AGP="AGPGART support is not enabled in your kernel config (CONFIG_AGP).
+			This will probably be essential for direct rendering."
 
-		CONFIG_CHECK="AGP"
-		ERROR_AGP="AGP support is not enabled in your kernel config (CONFIG_AGP)"
+		linux-mod_pkg_setup
 	fi
 }
 
@@ -184,6 +183,19 @@
 		use video_cards_xgi && \
 			VIDCARDS="${VIDCARDS} xgi.${KV_OBJ}"
 	fi
+
+	MODULE_NAMES=""
+	if use kernel_linux
+	then
+		LIBDIR="x11-drm"
+		for VIDCARD in ${VIDCARDS}
+		do
+			MODULE_NAMES="${MODULE_NAMES} ${VIDCARD/\.${KV_OBJ}/(${LIBDIR}:${SRC_BUILD})}"
+		done
+		MODULE_NAMES="${MODULE_NAMES} drm(${LIBDIR}:${SRC_BUILD})"
+		BUILD_PARAMS="LINUXDIR=\"${KERNEL_DIR}\" DRM_MODULES=\"${VIDCARDS}\""
+		BUILD_TARGETS="modules"
+	fi
 }
 
 get_drm_build_dir() {
@@ -250,17 +262,7 @@
 
 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
+	linux-mod_src_compile
 
 	# LINUXDIR is needed to allow Makefiles to find kernel release.
 	cd "${SRC_BUILD}"
@@ -300,15 +302,7 @@
 
 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}" \
-		O="${KBUILD_OUTPUT}" \
-		install || die "Install failed."
+	linux-mod_src_install
 
 	# Strip binaries, leaving /lib/modules untouched (bug #24415)
 	strip_bins \/lib\/modules