From 30ff411db3dea517fa0b9b26e57849f4aaaa972d Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Sat, 20 Nov 2004 21:43:23 +0000 Subject: [PATCH] Reduce USE=minimal x86 drivers to: vmware vesa vga dummy fbdev v4l. --- x11-base/xorg-x11/ChangeLog | 6 +++- x11-base/xorg-x11/Manifest | 14 ++++----- x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild | 33 ++++++++++++++++------ 3 files changed, 37 insertions(+), 16 deletions(-) diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog index 5bd8f27f370f..049824697655 100644 --- a/x11-base/xorg-x11/ChangeLog +++ b/x11-base/xorg-x11/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/xorg-x11 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.214 2004/11/20 03:24:47 tgall Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.215 2004/11/20 21:43:23 spyderous Exp $ + + 20 Nov 2004; Donnie Berkholz ; + xorg-x11-6.8.0-r4.ebuild: + Reduce USE=minimal x86 drivers to: vmware vesa vga dummy fbdev v4l. 19 Nov 2004; Tom Gall xorg-x11-6.8.0-r3.ebuild: revert to ~ppc64, needs work diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest index be52e21a18c8..9fabde9fe31f 100644 --- a/x11-base/xorg-x11/Manifest +++ b/x11-base/xorg-x11/Manifest @@ -1,15 +1,15 @@ -MD5 3261a165317d572cb269f54074b09fa7 ChangeLog 48253 MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230 -MD5 71c0c4d6c6042712ace52ffa727857e8 xorg-x11-6.8.0-r3.ebuild 39789 MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086 +MD5 6ebaf0954dc02b95d2102bec0cd6bc43 xorg-x11-6.8.0-r1.ebuild 41340 +MD5 d0befbfd5152107628a093e35fde94b2 ChangeLog 48411 MD5 cb102f4f4368c4b252805362396cde47 xorg-x11-6.8.0-r2.ebuild 50246 MD5 223a7a19eeeceddfe21fc50e9de60db1 xorg-x11-6.7.0-r3.ebuild 38098 -MD5 6ebaf0954dc02b95d2102bec0cd6bc43 xorg-x11-6.8.0-r1.ebuild 41340 -MD5 7c325d84664d398bb67970a0f6d57cff xorg-x11-6.8.0-r4.ebuild 50681 -MD5 d9a6c2ccdb525a489e8850cce8728dc3 files/digest-xorg-x11-6.8.0-r2 908 +MD5 71c0c4d6c6042712ace52ffa727857e8 xorg-x11-6.8.0-r3.ebuild 39789 +MD5 9675d57eadb63d0804c3ce11f613816b xorg-x11-6.8.0-r4.ebuild 51526 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904 +MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908 +MD5 d9a6c2ccdb525a489e8850cce8728dc3 files/digest-xorg-x11-6.8.0-r2 908 +MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r3 904 MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r3 908 MD5 1d7aad3b2625e446e07ae5255ae64163 files/digest-xorg-x11-6.8.0-r4 908 -MD5 f14e22fa0891e99c1000c0d61d7e8a0c files/xpm-secfix-thomas.diff 55674 -MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908 diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild index 563b4a706faf..83b3d2ba9428 100644 --- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild +++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.5 2004/11/18 17:24:04 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.6 2004/11/20 21:43:23 spyderous Exp $ # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory # voodoo3 cards. @@ -862,21 +862,38 @@ host_def_setup() { if use minimal; then echo "#define BuildClients NO" >> ${HOSTCONF} - echo "#define BuildFonts NO" >> ${HOSTCONF} + + # Without nls, truetype-fonts, type1-fonts, we only build misc + # Now let's try to reduce what gets built in misc + # iso8859-1 has the "fixed" font + echo "#define BuildISO8859_2Fonts NO" >> ${HOSTCONF} + echo "#define BuildISO8859_3Fonts NO" >> ${HOSTCONF} + echo "#define BuildISO8859_4Fonts NO" >> ${HOSTCONF} + # 5 is cyrillic, 6 isn't in misc, 7 is greek, 8 is hebrew + echo "#define BuildISO8859_9Fonts NO" >> ${HOSTCONF} + echo "#define BuildISO8859_10Fonts NO" >> ${HOSTCONF} + # 11 is thai, 12 isn't in misc + echo "#define BuildISO8859_13Fonts NO" >> ${HOSTCONF} + echo "#define BuildISO8859_14Fonts NO" >> ${HOSTCONF} + echo "#define BuildISO8859_15Fonts NO" >> ${HOSTCONF} + echo "#define BuildISO8859_16Fonts NO" >> ${HOSTCONF} + echo "#define XnestServer NO" >> ${HOSTCONF} echo "#define XVirtualFramebufferServer NO" >> ${HOSTCONF} echo "#define XInputDrivers mouse keyboard" >> ${HOSTCONF} # Don't want to add to defaults for other archs, set above if use x86; then - # Removed nsc - echo "#define i386Drivers i810" >> ${HOSTCONF} # If you want more drivers built with minimal, file a bug # -Donnie Berkholz - # Removed glint, tga, s3, s3virge, rendition, neomagic, i740, + # Remove glint, tga, s3, s3virge, rendition, neomagic, i740, # cirrus, tseng, trident, chips, apm, ark, cyrix, siliconmotion - echo "#define XF86CardDrivers mga nv sis tdfx savage vmware \ - GlideDriver i386Drivers ati DevelDrivers via vesa vga \ - dummy XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF} + # mga, nv, sis, tdfx, savage, GlideDriver, i386Drivers + # (nsc, i810), ati, DevelDrivers, via + # Leave vmware driver for testing minimal setups using VMWare + # XF86OSCardDrivers includes v4l and fbdev on linux + # DevelDrivers includes imstt and newport on x86 + echo "#define XF86CardDrivers vmware vesa vga dummy \ + XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF} fi fi -- 2.26.2