PATCH_VER 0.2.9. Add 1110_all_6.8.0-force-build-font-utils-if-needed.patch. USE=minimal will now start successfully, because enough fonts are built. When BuildClients is off and BuildFonts is on, mkfontscale and mkfontdir aren't built. But mkfontscale is used during the build process and mkfontdir is needed later, so we should build them anyway if UseInstalled isn't on. This fixes the USE=minimal build. Also, build the RGB database and xinit for a couple of non-essential but nearly always desired things. We require bdftopcf too. Also add xauth so startx works nicely. Problems still remain with switching back to the console using the ctrl-alt-Fn sequence, probably because of us not doing something with xkb. Don't worry about changing definition of i386Drivers because we don't use it anymore in USE=minimal. Only add i810 for amd64, rather than for everyone. GLU depends on GL being built, so fix that. XF86Rush similarly depends on XV.

3 files changed, 45 insertions, 8 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 675517157b99..8f095883b7a2 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,22 @@
 # 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.217 2004/11/20 22:11:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.218 2004/11/21 07:43:00 spyderous Exp $
+
+  20 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  PATCH_VER 0.2.9. Add 1110_all_6.8.0-force-build-font-utils-if-needed.patch.
+  USE=minimal will now start successfully, because enough fonts are built.
+  When BuildClients is off and BuildFonts is on, mkfontscale and mkfontdir
+  aren't built. But mkfontscale is used during the build process and mkfontdir
+  is needed later, so we should build them anyway if UseInstalled isn't on.
+  This fixes the USE=minimal build. Also, build the RGB database and xinit for
+  a couple of non-essential but nearly always desired things. We require
+  bdftopcf too. Also add xauth so startx works nicely. Problems still remain
+  with switching back to the console using the ctrl-alt-Fn sequence, probably
+  because of us not doing something with xkb. Don't worry about changing
+  definition of i386Drivers because we don't use it anymore in USE=minimal.
+  Only add i810 for amd64, rather than for everyone. GLU depends on GL being
+  built, so fix that. XF86Rush similarly depends on XV.
 
   20 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.8.0-r4.ebuild:
diff --git a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4 b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4
index 286bcbb7e351..f1dafb32527c 100644
--- a/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4
+++ b/x11-base/xorg-x11/files/digest-xorg-x11-6.8.0-r4
@@ -3,7 +3,7 @@ MD5 01a21c248e5ac4ba02cbbea994fc774a xfsft-encodings-0.1.tar.bz2 11892
 MD5 d0fab996daf97adf095e2dad0bd9012e gentoo-cursors-tad-0.3.1.tar.bz2 1196991
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
 MD5 8e8905cf6863546481ec52f1101b6984 xorg-x11-6.8.0-files-0.6.tar.bz2 10139
-MD5 ed4813ca793516f5ee6a95403a9fbd54 xorg-x11-6.8.0-patches-0.2.8.tar.bz2 150004
+MD5 707f36ff4452ffc5187b2b91330eef50 xorg-x11-6.8.0-patches-0.2.9.tar.bz2 150924
 MD5 c31a2e1c226e659c2ff29abfe55386e3 X11R6.8.0-src1.tar.gz 30560275
 MD5 4089bb6efb6c5bc73fbcfc23fafcb0c8 X11R6.8.0-src2.tar.gz 5808901
 MD5 488a5ebbbdf48d974efbc3a0bde92bf4 X11R6.8.0-src3.tar.gz 10014266
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 bcf3e1f7da1d..68bcb9cf06ac 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.8 2004/11/20 22:11:32 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.9 2004/11/21 07:43:00 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -40,7 +40,7 @@ IUSE="3dfx 3dnow bitmap-fonts cjk debug dlloader dmx doc font-server hardened
 # IUSE_INPUT_DEVICES="synaptics wacom"
 
 FILES_VER="0.6"
-PATCH_VER="0.2.8"
+PATCH_VER="0.2.9"
 XCUR_VER="0.3.1"
 #MGADRV_VER="1_3_0beta"
 #VIADRV_VER="0.1"
@@ -588,7 +588,9 @@ host_def_setup() {
 		#	>> ${HOSTCONF}
 
 		# Enable i810 on x86_64 (RH #126687)
-		echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF}
+		if use amd64; then
+			echo "#define XF86ExtraCardDrivers i810" >> ${HOSTCONF}
+		fi
 
 		# FHS install locations
 		echo "#define ManDirectoryRoot /usr/share/man" >> ${HOSTCONF}
@@ -749,6 +751,9 @@ host_def_setup() {
 		use_build opengl BuildGlxExt
 		use_build opengl BuildGLXLibrary
 		use_build opengl BuildXF86DRI
+		# Needs GL headers
+		use_build opengl BuildGLULibrary
+
 
 		if use hppa; then
 			echo "#define DoLoadableServer NO" >> ${HOSTCONF}
@@ -760,6 +765,9 @@ host_def_setup() {
 		# Make xv optional for more minimal builds
 		use_build xv BuildXvLibrary
 		use_build xv BuildXvExt
+		# Depends on X11/extensions/Xv.h
+		use_build xv BuildXF86RushExt
+		use_build xv BuildXF86RushLibrary
 
 		if use alpha; then
 			echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \
@@ -862,14 +870,27 @@ 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 <spyderous@gentoo.org>
 				# Remove glint, tga, s3, s3virge, rendition, neomagic, i740,