From 3ebb3ea5aa6425baf69265899fcccdcc8db05e2f Mon Sep 17 00:00:00 2001 From: Bryan Stine Date: Thu, 8 Jun 2006 22:51:33 +0000 Subject: [PATCH] Bump to new snapshot. Package-Manager: portage-2.1_rc1-r3 --- x11-base/x11-drm/ChangeLog | 7 +- x11-base/x11-drm/Manifest | 71 ++++-- .../x11-drm/files/digest-x11-drm-20051223 | 4 + .../x11-drm/files/digest-x11-drm-20060608 | 6 + x11-base/x11-drm/x11-drm-20060608.ebuild | 237 ++++++++++++++++++ 5 files changed, 303 insertions(+), 22 deletions(-) create mode 100644 x11-base/x11-drm/files/digest-x11-drm-20060608 create mode 100644 x11-base/x11-drm/x11-drm-20060608.ebuild diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog index 244557dafccb..b31c661a323e 100644 --- a/x11-base/x11-drm/ChangeLog +++ b/x11-base/x11-drm/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-base/x11-drm # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.32 2006/04/16 20:21:34 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.33 2006/06/08 22:51:33 battousai Exp $ + +*x11-drm-20060608 (08 Jun 2006) + + 08 Jun 2006; Bryan Stine +x11-drm-20060608.ebuild: + Bump to new snapshot. 16 Apr 2006; Donnie Berkholz ; x11-drm-20051223.ebuild: diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest index 04fac96c53b2..b6cf73dab830 100644 --- a/x11-base/x11-drm/Manifest +++ b/x11-base/x11-drm/Manifest @@ -1,39 +1,68 @@ -MD5 ad2dec77ae1de2e12f922a3bd6826528 ChangeLog 19653 -RMD160 63f2ff8d14933c0d1c6f5df9df9946660453976e ChangeLog 19653 -SHA256 3c12085b9383b9a5f72b7bfcdb5029c155311425cdf3d78b6906e057aff43c0a ChangeLog 19653 -MD5 528f707ef73b50376334dd2a7abbdb83 files/digest-x11-drm-20050502 162 -RMD160 ea497471e28acdf15ec51d86b20b59b19ce52767 files/digest-x11-drm-20050502 162 -SHA256 71387b8d2686d28f16826fa31b3f4dfa7b4092c39b494231e9faac9006835c7b files/digest-x11-drm-20050502 162 -MD5 05c0def6e3725175239b158187f61774 files/digest-x11-drm-20050807 162 -RMD160 7549496fcff6cc13d47867b7b657c749d5a8d358 files/digest-x11-drm-20050807 162 -SHA256 76f352c1f771f85202ad233579691d94d041de9b4e6d600a9d67811952298094 files/digest-x11-drm-20050807 162 -MD5 79ba7dd6f31beecd88dbf0836d41070e files/digest-x11-drm-20051028 162 -RMD160 10f518a7f1c033f19479e337036d279292910a83 files/digest-x11-drm-20051028 162 -SHA256 fd898eb260ad50cade3f7cf9f81c8748680e14f7dd111475fcbf0805734b3c22 files/digest-x11-drm-20051028 162 -MD5 c52709fea56242bf2be71ca739be53de files/digest-x11-drm-20051223 162 -RMD160 941b5a1055a7d5213907d5b83ef4abfce6b83dde files/digest-x11-drm-20051223 162 -SHA256 805bd296ddd61eccef308018162b1ab98d1d4ccb789fe5ee84e3121616e8efdc files/digest-x11-drm-20051223 162 -MD5 db87006ec48bc9579dcdc989c5ed86d6 files/digest-x11-drm-4.3.0-r7 363 -RMD160 fb090eee55f87cb2a83cded1fdcd42c82d7f040d files/digest-x11-drm-4.3.0-r7 363 -SHA256 e25f7f22669877ab1a0b524b42acf09b30a2f4bdb61ca152d6c0e3736c190bbb files/digest-x11-drm-4.3.0-r7 363 +AUX modules.d-x11-drm 40 RMD160 7bdcba81be1a55311e31ec4ef88dc9c1b7ec85c8 SHA1 1e3f21939861925967dfba152e2309fb3fa65f26 SHA256 97fb08b2c529d65b415dec23dc7130721be9850129100e4b7063baa1060641e2 size 40 MD5 88b8c90e440b3db246a7d06cf53640ae files/modules.d-x11-drm 40 RMD160 7bdcba81be1a55311e31ec4ef88dc9c1b7ec85c8 files/modules.d-x11-drm 40 SHA256 97fb08b2c529d65b415dec23dc7130721be9850129100e4b7063baa1060641e2 files/modules.d-x11-drm 40 -MD5 782be9470cf76716a15aa5a70f4b8af7 metadata.xml 368 -RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 metadata.xml 368 -SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1 metadata.xml 368 +DIST linux-drm-20050502-kernelsource.tar.bz2 518178 size 518178 +DIST linux-drm-20050807-kernelsource.tar.bz2 549703 size 549703 +DIST linux-drm-20051028-kernelsource.tar.bz2 565711 size 565711 +DIST linux-drm-20051223-kernelsource.tar.bz2 560381 RMD160 4f5707a9de908eb1bab44162588d6f29241a9df4 SHA256 cdf54b79d06a92afb3d3f68550c5f4864544d03464b3fc1cc0d954eb18cac2ef size 560381 +DIST linux-drm-20060608-kernelsource.tar.bz2 568004 RMD160 253608313539a651ad6724bcb67b5f4ab28eaf4f SHA256 5f2346f3eba114c4d5655325f3fd51e0b74f6f627bf0c4e435103c8972f52731 size 568004 +DIST linux-drm-4.3.0-kernelsource-20031202.tar.bz2 440304 size 440304 +DIST linux-drm-gatos-4.3.0-kernelsource-20031202.tar.bz2 154684 size 154684 +DIST linux-drm-mach64-4.3.0-kernelsource-20031202.tar.bz2 429549 size 429549 +DIST x11-drm-20050502-gentoo-0.2.tar.bz2 3319 size 3319 +DIST x11-drm-20050807-gentoo-0.1.tar.bz2 2095 size 2095 +DIST x11-drm-20051028-gentoo-0.1.tar.bz2 2106 size 2106 +DIST x11-drm-20051223-gentoo-0.1.tar.bz2 2106 RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 size 2106 +DIST x11-drm-20060608-gentoo-0.1.tar.bz2 2106 RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 size 2106 +DIST xfree-drm-4.3.0-r7-gentoo-0.4.tar.bz2 8143 size 8143 +EBUILD x11-drm-20050502.ebuild 6047 RMD160 383cf58d5afdff4d09ba711f76cadd5b15d88b1a SHA1 fb035d79c94b722c2d6af377012bc2480bc90fc1 SHA256 48374431345cf6426863ebb860624183a359bca8d26cbcca9b65aa8ae1ed27b0 size 6047 MD5 47b8884fab3a0fef1391ebb58b64aafb x11-drm-20050502.ebuild 6047 RMD160 383cf58d5afdff4d09ba711f76cadd5b15d88b1a x11-drm-20050502.ebuild 6047 SHA256 48374431345cf6426863ebb860624183a359bca8d26cbcca9b65aa8ae1ed27b0 x11-drm-20050502.ebuild 6047 +EBUILD x11-drm-20050807.ebuild 6242 RMD160 3d027803ae280bff6576679708fc40647dbfe702 SHA1 b36defb229c534c183adb6221c211b9ad7e1e62a SHA256 d393a13f3e7a6b32fe91bc500b7277536b8b24b49320eca5c868a7fd7ca29119 size 6242 MD5 fa05fd5ef45015c697d3741d5cc5a1e4 x11-drm-20050807.ebuild 6242 RMD160 3d027803ae280bff6576679708fc40647dbfe702 x11-drm-20050807.ebuild 6242 SHA256 d393a13f3e7a6b32fe91bc500b7277536b8b24b49320eca5c868a7fd7ca29119 x11-drm-20050807.ebuild 6242 +EBUILD x11-drm-20051028.ebuild 6308 RMD160 ea291c0ca0befb7a7c1c503c6c350e7bfb7e0f5b SHA1 3a34486a97ffb3dc6f4a2c2cbd7ee04586a628e6 SHA256 49cfd034dfeadb6aa40fff52f0f21863115d2c74af60234a778f9f70186405c1 size 6308 MD5 db585c7498f5b59d6cad1424d35af376 x11-drm-20051028.ebuild 6308 RMD160 ea291c0ca0befb7a7c1c503c6c350e7bfb7e0f5b x11-drm-20051028.ebuild 6308 SHA256 49cfd034dfeadb6aa40fff52f0f21863115d2c74af60234a778f9f70186405c1 x11-drm-20051028.ebuild 6308 +EBUILD x11-drm-20051223.ebuild 6186 RMD160 848aa80942886eaf20bfb03d7dbe4046f5e19bc6 SHA1 bbd231dc6746877351d505cd66d9389ced101d24 SHA256 46bc90153e6bede9135d0537e3ee1e418842d30df5ccf8d7c1f314fb662c84a3 size 6186 MD5 89bf59dd27f8df6bdab75d87418c1c9b x11-drm-20051223.ebuild 6186 RMD160 848aa80942886eaf20bfb03d7dbe4046f5e19bc6 x11-drm-20051223.ebuild 6186 SHA256 46bc90153e6bede9135d0537e3ee1e418842d30df5ccf8d7c1f314fb662c84a3 x11-drm-20051223.ebuild 6186 +EBUILD x11-drm-20060608.ebuild 6186 RMD160 4e8f498ded12f7a639beb254cc09254a44dbfd88 SHA1 d29ca3374b75b30231a0cb2d87d008a34967a1e8 SHA256 fdd3ebdefb7eaa70408223dd1e0cfc4f7ee81b70b6cb8d8f7c52b4194785ab2a size 6186 +MD5 a54085247865b20136bec1460b12f19e x11-drm-20060608.ebuild 6186 +RMD160 4e8f498ded12f7a639beb254cc09254a44dbfd88 x11-drm-20060608.ebuild 6186 +SHA256 fdd3ebdefb7eaa70408223dd1e0cfc4f7ee81b70b6cb8d8f7c52b4194785ab2a x11-drm-20060608.ebuild 6186 +EBUILD x11-drm-4.3.0-r7.ebuild 6983 RMD160 34eabe5596ed5609ef978dadc850431b61b3c6c8 SHA1 a17c1d315a881c18a95d0f2962b3fb54b49634ba SHA256 049580786153610b31973b4e041656da1189ebedbdee5cd2ae3f728b32be0fac size 6983 MD5 7a519793ef2ad0ff85a9f90d59bb2ab9 x11-drm-4.3.0-r7.ebuild 6983 RMD160 34eabe5596ed5609ef978dadc850431b61b3c6c8 x11-drm-4.3.0-r7.ebuild 6983 SHA256 049580786153610b31973b4e041656da1189ebedbdee5cd2ae3f728b32be0fac x11-drm-4.3.0-r7.ebuild 6983 +MISC ChangeLog 19787 RMD160 791d86ed2b3b14b3a8dadb3b6be0a4c518383e21 SHA1 b99877587744a78cfa7316d2b093f82b9c243ea6 SHA256 80a1278d707f496cb4648418c9be10ebe016eecfd9ef5f540d502d67f7c33d74 size 19787 +MD5 0dd9b95d7fcdbc6455eb7b028435fc84 ChangeLog 19787 +RMD160 791d86ed2b3b14b3a8dadb3b6be0a4c518383e21 ChangeLog 19787 +SHA256 80a1278d707f496cb4648418c9be10ebe016eecfd9ef5f540d502d67f7c33d74 ChangeLog 19787 +MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1 size 368 +MD5 782be9470cf76716a15aa5a70f4b8af7 metadata.xml 368 +RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 metadata.xml 368 +SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1 metadata.xml 368 +MD5 528f707ef73b50376334dd2a7abbdb83 files/digest-x11-drm-20050502 162 +RMD160 ea497471e28acdf15ec51d86b20b59b19ce52767 files/digest-x11-drm-20050502 162 +SHA256 71387b8d2686d28f16826fa31b3f4dfa7b4092c39b494231e9faac9006835c7b files/digest-x11-drm-20050502 162 +MD5 05c0def6e3725175239b158187f61774 files/digest-x11-drm-20050807 162 +RMD160 7549496fcff6cc13d47867b7b657c749d5a8d358 files/digest-x11-drm-20050807 162 +SHA256 76f352c1f771f85202ad233579691d94d041de9b4e6d600a9d67811952298094 files/digest-x11-drm-20050807 162 +MD5 79ba7dd6f31beecd88dbf0836d41070e files/digest-x11-drm-20051028 162 +RMD160 10f518a7f1c033f19479e337036d279292910a83 files/digest-x11-drm-20051028 162 +SHA256 fd898eb260ad50cade3f7cf9f81c8748680e14f7dd111475fcbf0805734b3c22 files/digest-x11-drm-20051028 162 +MD5 f186c4e05a1d317d5d9f296498685d3e files/digest-x11-drm-20051223 578 +RMD160 0b1942534bbaca3a6b336ddba27fa07252bf0f2b files/digest-x11-drm-20051223 578 +SHA256 6e415afaf2811d1483ba7384e55de32ef669a9c9e2ebe6be185ef074e95afbcc files/digest-x11-drm-20051223 578 +MD5 7b64d777176450a72c719800307f6274 files/digest-x11-drm-20060608 578 +RMD160 4da41cad762f404895183cd9d8d2207260cd1748 files/digest-x11-drm-20060608 578 +SHA256 efa37f00325b071099870fa8d0d6d443c65b26330d350ec47fb9d7dbf1fb54f6 files/digest-x11-drm-20060608 578 +MD5 db87006ec48bc9579dcdc989c5ed86d6 files/digest-x11-drm-4.3.0-r7 363 +RMD160 fb090eee55f87cb2a83cded1fdcd42c82d7f040d files/digest-x11-drm-4.3.0-r7 363 +SHA256 e25f7f22669877ab1a0b524b42acf09b30a2f4bdb61ca152d6c0e3736c190bbb files/digest-x11-drm-4.3.0-r7 363 diff --git a/x11-base/x11-drm/files/digest-x11-drm-20051223 b/x11-base/x11-drm/files/digest-x11-drm-20051223 index 411ef258aee1..6d48f511b5dc 100644 --- a/x11-base/x11-drm/files/digest-x11-drm-20051223 +++ b/x11-base/x11-drm/files/digest-x11-drm-20051223 @@ -1,2 +1,6 @@ MD5 e3586c43652beda09e68558528929d9e linux-drm-20051223-kernelsource.tar.bz2 560381 +RMD160 4f5707a9de908eb1bab44162588d6f29241a9df4 linux-drm-20051223-kernelsource.tar.bz2 560381 +SHA256 cdf54b79d06a92afb3d3f68550c5f4864544d03464b3fc1cc0d954eb18cac2ef linux-drm-20051223-kernelsource.tar.bz2 560381 MD5 0831381f1bfccba6fc80e5c1551dafb8 x11-drm-20051223-gentoo-0.1.tar.bz2 2106 +RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab x11-drm-20051223-gentoo-0.1.tar.bz2 2106 +SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 x11-drm-20051223-gentoo-0.1.tar.bz2 2106 diff --git a/x11-base/x11-drm/files/digest-x11-drm-20060608 b/x11-base/x11-drm/files/digest-x11-drm-20060608 new file mode 100644 index 000000000000..6f48ada3a256 --- /dev/null +++ b/x11-base/x11-drm/files/digest-x11-drm-20060608 @@ -0,0 +1,6 @@ +MD5 b43b229f76a38ae31fd35c69733d00cb linux-drm-20060608-kernelsource.tar.bz2 568004 +RMD160 253608313539a651ad6724bcb67b5f4ab28eaf4f linux-drm-20060608-kernelsource.tar.bz2 568004 +SHA256 5f2346f3eba114c4d5655325f3fd51e0b74f6f627bf0c4e435103c8972f52731 linux-drm-20060608-kernelsource.tar.bz2 568004 +MD5 0831381f1bfccba6fc80e5c1551dafb8 x11-drm-20060608-gentoo-0.1.tar.bz2 2106 +RMD160 2eb369902c7071b9beb3c0fc0c111b697b6493ab x11-drm-20060608-gentoo-0.1.tar.bz2 2106 +SHA256 0e51f4331b41dd1ed912bea924631a1681b30617a87b500a12a589b93372d639 x11-drm-20060608-gentoo-0.1.tar.bz2 2106 diff --git a/x11-base/x11-drm/x11-drm-20060608.ebuild b/x11-base/x11-drm/x11-drm-20060608.ebuild new file mode 100644 index 000000000000..a0b6482c78b5 --- /dev/null +++ b/x11-base/x11-drm/x11-drm-20060608.ebuild @@ -0,0 +1,237 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608.ebuild,v 1.1 2006/06/08 22:51:33 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}" + +# 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="~x86 ~alpha ~ia64 ~ppc ~amd64" + +DEPEND=">=sys-devel/automake-1.7 + >=sys-devel/autoconf-2.59 + >=sys-devel/libtool-1.5.14 + >=sys-devel/m4-1.4 + virtual/linux-sources + >=sys-apps/portage-2.0.49-r13" + +pkg_setup() { + get_version + + 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 + + # Set video cards to build for. + set_vidcards + + # DRM CVS is undergoing changes which require splitting source to support both 2.4 + # and 2.6 kernels. This determines which to use. + 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} + + cd ${S} + WANT_AUTOCONF="2.59" WANT_AUTOMAKE="1.7" autoreconf -v --install +} + +src_compile() { + einfo "Building DRM in ${SRC_BUILD}..." + cd ${SRC_BUILD} + + # This now uses an M= build system. Makefile does most of the work. + unset ARCH + make M="${SRC_BUILD}" \ + LINUXDIR="${KERNEL_DIR}" \ + DRM_MODULES="${VIDCARDS}" \ + modules || die_error + + # Building the programs. These are useful for developers and getting info from DRI and DRM. + # + # libdrm objects are needed for drmstat. + cd ${S} + econf || die "libdrm configure failed." + emake || die "libdrm build failed." + + if linux_chkconfig_present DRM + then + echo "Please disable in-kernel DRM support to use this package." + fi + + cd ${SRC_BUILD} + # LINUXDIR is needed to allow Makefiles to find kernel release. + make LINUXDIR="${KERNEL_DIR}" dristat || die "Building dristat failed." + make LINUXDIR="${KERNEL_DIR}" drmstat || die "Building drmstat failed." +} + +src_install() { + einfo "Installing DRM..." + cd ${SRC_BUILD} + + unset ARCH + make KV="${KV_FULL}" \ + LINUXDIR="${KERNEL_DIR}" \ + DESTDIR="${D}" \ + RUNNING_REL="${KV_FULL}" \ + MODULE_LIST="${VIDCARDS} drm.${KV_OBJ}" \ + install || die "Install failed." + + dodoc README.drm + + dobin dristat + dobin drmstat + + # 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} +} + +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 + + einfo "Checking kernel module dependencies" + update_modules + update_depmod +} + +# Functions used above are defined below: + +set_vidcards() { + set_kvobj + + POSSIBLE_VIDCARDS="mga tdfx r128 radeon i810 i830 i915 mach64 nv savage + sis via" + if use sparc; then + POSSIBLE_VIDCARDS="${POSSIBLE_VIDCARDS} ffb" + fi + VIDCARDS="" + + if [[ -n "${VIDEO_CARDS}" ]]; then + use video_cards_i810 && \ + VIDCARDS="${VIDCARDS} i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}" + 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}" + 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}" + else + for card in ${POSSIBLE_VIDCARDS}; do + VIDCARDS="${VIDCARDS} ${card}.${KV_OBJ}" + done + 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 + + kernel_is 2 4 && mv -f ${PATCHDIR}/*kernel-2.6* ${EXCLUDED} + kernel_is 2 6 && mv -f ${PATCHDIR}/*kernel-2.4* ${EXCLUDED} + + # There is only one tree being maintained now. No numeric exclusions need + # to be done based on DRM tree. +} + +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. All" + eerror "2.4 kernels are supported, but only 2.6 kernels at least as new as 2.6.6" + eerror "are supported." + die "Unable to build DRM modules." +} + +get_drm_build_dir() { + if kernel_is 2 4 + then + SRC_BUILD="${S}/linux" + elif kernel_is 2 6 + then + SRC_BUILD="${S}/linux-core" + fi +} -- 2.26.2