From 8bffcb45aeff8806be36c5c12c50b04cbc84ba24 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Tue, 14 Oct 2003 22:43:53 +0000 Subject: Moving VIDEO_CARDS=sis to sis300 to make it more clear that it doesn't work on 315 series. Preventing xfree-drm from emerging on 2.6 kernels, it doesn't work yet so the kernel DRM must be used. Adding warning for SiS. --- x11-base/xfree-drm/ChangeLog | 8 +++++++- x11-base/xfree-drm/Manifest | 4 ++-- x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild | 21 ++++++++++++++++----- 3 files changed, 25 insertions(+), 8 deletions(-) (limited to 'x11-base/xfree-drm') diff --git a/x11-base/xfree-drm/ChangeLog b/x11-base/xfree-drm/ChangeLog index cf91412bde7c..b78de05146e1 100644 --- a/x11-base/xfree-drm/ChangeLog +++ b/x11-base/xfree-drm/ChangeLog @@ -1,6 +1,12 @@ # 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.39 2003/10/04 21:28:40 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/ChangeLog,v 1.40 2003/10/14 22:43:50 spyderous Exp $ + + 14 Oct 2003; Donnie Berkholz ; + xfree-drm-4.3.0-r6.ebuild: + Moving VIDEO_CARDS=sis to sis300 to make it more clear that it doesn't work on + 315 series. Preventing xfree-drm from emerging on 2.6 kernels, it doesn't work + yet so the kernel DRM must be used. Adding warning for SiS. 04 Oct 2003; Donnie Berkholz ; xfree-drm-4.3.0-r3.ebuild, xfree-drm-4.3.0-r4.ebuild, diff --git a/x11-base/xfree-drm/Manifest b/x11-base/xfree-drm/Manifest index bcd2fd257c93..08535e53c2ff 100644 --- a/x11-base/xfree-drm/Manifest +++ b/x11-base/xfree-drm/Manifest @@ -1,6 +1,6 @@ -MD5 f4ec99a5c1f4d0cb9809d644d3f4f199 ChangeLog 7690 +MD5 11a7ec87224c247986ef907307e58f6a ChangeLog 7999 MD5 cd0b06404869599fa61bb7976be237a2 metadata.xml 476 MD5 5841333d3b65fe40becb5a2561c209e5 xfree-drm-4.3.0-r2.ebuild 2648 -MD5 e8bf51ed323717d6f3cdc65028432154 xfree-drm-4.3.0-r6.ebuild 4947 +MD5 1c3942a1af0ac7bd7c120d1c53f7ccec xfree-drm-4.3.0-r6.ebuild 5324 MD5 b340ab262c964f235620a98d7626d6b9 files/digest-xfree-drm-4.3.0-r2 166 MD5 916b08e6047de0eeabce236b45a16b34 files/digest-xfree-drm-4.3.0-r6 169 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 index 30c34954b907..7371f7e7acfd 100644 --- a/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild +++ b/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild @@ -1,6 +1,6 @@ # 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.9 2003/09/29 17:39:42 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree-drm/xfree-drm-4.3.0-r6.ebuild,v 1.10 2003/10/14 22:43:50 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 @@ -67,7 +67,7 @@ if [ `use radeon || vcards radeon` ] then VIDCARDS="${VIDCARDS} radeon.o" fi -if [ `use sis || vcards sis` ] +if [ `use sis || vcards sis300` ] then VIDCARDS="${VIDCARDS} sis.o" fi @@ -84,13 +84,18 @@ vcards i810 && VIDCARDS="${VIDCARDS} i810.o" vcards i830 && VIDCARDS="${VIDCARDS} i830.o" src_unpack() { -# Is this necessary with the fixed Makefile? + # 2.6 kernels are broken for now + is_kernel "2" "6" && \ + die "Please link /usr/src/linux to 2.4 kernel sources." + + # Is this necessary with the fixed Makefile? if [ ! -f /usr/src/linux/include/config/MARKER ] ; then die "Please compile kernel sources." fi + # Require at least one video card. 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." + die "Please set at least one video card in VIDEO_CARDS in make.conf or the environment. USE is deprecated. Possible VIDEO_CARDS values are matrox, 3dfx, rage128, radeon, sis300, i810, i830, and gamma." fi unpack ${A} @@ -179,6 +184,12 @@ pkg_postinst() { 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." + einfo "Possible VIDEO_CARDS values are matrox, 3dfx, rage128, radeon, sis300, i810, i830, and gamma." + fi + + if vcards sis300 + then + einfo "SiS direct rendering only works on 300/305, 540, 630/S/ST, 730/S chipsets." + einfo "SiS framebuffer also needs to be enabled in the kernel." fi } -- cgit v1.2.3-65-gdbad