PATCH_VER 2.1.22. Most significant changes are fixing the Mesa patch to work on 2.4 and 2.6 as well as changing ucs2any Perl script to a C program, which is much faster. Add 9145_all_4.3.0-RandR-refresh-rate-rounding-error-fix-from-CVSHEAD.patch. Add 9146_all_4.3.0-vidmode-SEGV-fix-from-CVS-HEAD.patch to fix SEGV in vidmode extension. Add 1701_all_4.3.0-rendition-complete-driver-backport-CVS20031031.patch, full backport of rendition driver. Obsoletes 5500_all_4.3.0-rendition-disable-cause-of-SEGV.patch. Update to 9132_all_4.3.0-Mesa-SSE-fixes-from-MesaCVS-v2.patch, which doesn't break 2.6 kernels. Remove big warning for previous patch #9132. Add 9142_all_4.3.0-ucs2any-C-implementation.patch and a little bit in ebuild to compile it. It's faster than the previous Perl script. Thanks Mike Harris for some wonderful patches. Update ebuild to only build static for USE=static and not USE=debug. Add incompatibility warning for static and sdk. Update ebuild to build support for later adding mga HAL lib but not to build or expect the lib.

4 files changed, 46 insertions, 38 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 38a1132bebc7..7a02541ddb11 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.234 2003/11/02 22:05:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.235 2003/11/05 00:10:38 spyderous Exp $
+
+  04 Nov 2003; Donnie Berkholz <spyderous@gentoo.org>; xfree-4.3.0-r3.ebuild:
+  PATCH_VER 2.1.22. Most significant changes are fixing the Mesa patch to work
+  on 2.4 and 2.6 as well as changing ucs2any Perl script to a C program, which
+  is much faster. Add
+  9145_all_4.3.0-RandR-refresh-rate-rounding-error-fix-from-CVSHEAD.patch. Add
+  9146_all_4.3.0-vidmode-SEGV-fix-from-CVS-HEAD.patch to fix SEGV in vidmode
+  extension. Add
+  1701_all_4.3.0-rendition-complete-driver-backport-CVS20031031.patch, full
+  backport of rendition driver. Obsoletes
+  5500_all_4.3.0-rendition-disable-cause-of-SEGV.patch. Update to
+  9132_all_4.3.0-Mesa-SSE-fixes-from-MesaCVS-v2.patch, which doesn't break 2.6
+  kernels. Remove big warning for previous patch #9132. Add
+  9142_all_4.3.0-ucs2any-C-implementation.patch and a little bit in ebuild to
+  compile it. It's faster than the previous Perl script. Thanks Mike Harris for
+  some wonderful patches. Update ebuild to only build static for USE=static and
+  not USE=debug. Add incompatibility warning for static and sdk. Update ebuild
+  to build support for later adding mga HAL lib but not to build or expect the
+  lib.
 
 *xfree-4.3.99.15 (02 Nov 2003)
 
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index e262c3ad54dd..fa6cfc9f571a 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -4,9 +4,9 @@ MD5 2e730b1127a59eabfc864b23049418d6 xfree-4.2.0-r12.ebuild 10299
 MD5 e169e0fe0574ecb23f62d4787abe3dcb xfree-4.2.1-r2.ebuild 24144
 MD5 841ad6ce6bc0dd92186fa29e6b813c34 xfree-4.3.99.15.ebuild 32675
 MD5 049549e84c67068017dcb7a4028fdec1 xfree-4.3.0-r2.ebuild 31516
-MD5 dcb6491d809c11affa54f190f56b71d9 xfree-4.3.0-r3.ebuild 34909
+MD5 16b90182f78dd0b425424bc7f93f9b6a xfree-4.3.0-r3.ebuild 34202
 MD5 095515724692343cdef7b917bee9c10f xfree-4.3.99.14.ebuild 32062
-MD5 9dca078979d19559d4481299ab869ec8 ChangeLog 51389
+MD5 5d72f9c5719b4e6fd59d5dec483849c7 ChangeLog 52547
 MD5 db524c4605805eef089fd8ddda1cb456 xfree-4.3.99.13.ebuild 32129
 MD5 a9371704cf72bcb8d1aa713ca4b27546 files/XFree86-4.2.1-Xft11-Imakefile.patch 341
 MD5 bc3aad4b056a41f47d427c036edcef9f files/XFree86-4.2.1-Xft11-hack.patch 1163
@@ -15,7 +15,7 @@ MD5 21d5f7a63f9dbf1948cc7df8b2bf67fc files/digest-xfree-4.2.0-r12 576
 MD5 f37019cb2d1cac6358077bda58d062ed files/digest-xfree-4.2.1-r2 1267
 MD5 6e34a55b7eef6f68b5e4773bef1120d4 files/digest-xfree-4.3.99.15 1323
 MD5 6a542004d031451f668989af76b28a0f files/digest-xfree-4.3.0-r2 1928
-MD5 dd3dfcdc0b7385a5df67587446aa29fc files/digest-xfree-4.3.0-r3 2000
+MD5 09517e3c1bb4b843c855c6ec0d564d18 files/digest-xfree-4.3.0-r3 2000
 MD5 680b72b971833fcc2f9e02155af1a178 files/digest-xfree-4.3.99.13 1392
 MD5 b1c3b92899e835bb00959062aa2271fd files/digest-xfree-4.3.99.14 1392
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r3 b/x11-base/xfree/files/digest-xfree-4.3.0-r3
index 5f3538275ff2..4200e1b5afb9 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.0-r3
+++ b/x11-base/xfree/files/digest-xfree-4.3.0-r3
@@ -5,7 +5,7 @@ MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091
 MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018
 MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919
 MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241
-MD5 0872c3542c7276253261a43bfad6596c XFree86-4.3.0-patches-2.1.21.tar.bz2 423895
+MD5 3c660763b4da0a1578afd9b29c572bd6 XFree86-4.3.0-patches-2.1.22.tar.bz2 444292
 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index 46184d05d624..034b13102bd3 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r3.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/xfree-4.3.0-r3.ebuild,v 1.81 2003/11/02 21:42:46 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.82 2003/11/05 00:10:39 spyderous Exp $
 
 # 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 ...
@@ -37,7 +37,7 @@ strip-flags
 # Are we using a snapshot ?
 USE_SNAPSHOT="no"
 
-PATCH_VER="2.1.21"
+PATCH_VER="2.1.22"
 FT2_VER="2.1.3"
 XCUR_VER="0.3.1"
 SISDRV_VER="311003-1"
@@ -142,24 +142,14 @@ DESCRIPTION="Xfree86: famous and free X server"
 PATCH_DIR=${WORKDIR}/patch
 
 pkg_setup() {
-	# Hack for patch 9132.
-	if [ ! -e "/usr/src/linux" ] || \
-		( [ -e "/usr/src/linux" ] && \
-		is_kernel "2" "4" ) ; then
-			ewarn "If you compile this against a 2.4 kernel and later switch"
-			ewarn "to a 2.6 kernel, you must recompile xfree or OpenGL"
-			ewarn "applications will segfault."
-			ewarn "It compiles for 2.4 if no /usr/src/linux exists."
-			echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-			echo -ne "\a" ; sleep 1
-			echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-			echo -ne "\a" ; sleep 1
-			echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-			echo -ne "\a" ; sleep 1
-			echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-			echo -ne "\a" ; sleep 1
-			echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
-			echo -ne "\a" ; sleep 1
+	# A static build disallows building the SDK.
+	# See config/xf86.rules.
+	if use static
+	then
+		if use sdk || use gatos
+		then
+			die "The static USE flag is incompatible with gatos and sdk USE flags."
+		fi
 	fi
 }
 
@@ -250,8 +240,6 @@ src_unpack() {
 	if use debug
 	then
 		mv -f ${PATCH_DIR}/5901* ${PATCH_DIR}/excluded
-	else
-		mv -f ${PATCH_DIR}/0127* ${PATCH_DIR}/excluded
 	fi
 # FIXME: bug #19812, 075 should be deprecated by 076, left as
 # TDFX_RISKY for feedback (put in -r3 if no problems)
@@ -272,15 +260,6 @@ src_unpack() {
 		fi
 	fi
 
-	# Bug #30541, workaround
-	# Default to using patch, to avoid issues with tcltk
-	# on initial install, emerge system whines about no kernel
-	# Do -e instead of -h for hand-rolled kernels
-	if [ -e "/usr/src/linux" ] ; then
-		is_kernel "2" "4" || \
-		mv -f ${PATCH_DIR}/9132* ${PATCH_DIR}/excluded
-	fi
-
 	# Various Patches from all over
 	EPATCH_SUFFIX="patch" epatch ${PATCH_DIR}
 
@@ -361,7 +340,7 @@ src_unpack() {
 	echo "#define OptimizedCDebugFlags ${CFLAGS}" >> config/cf/host.def
 	echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS}" >> config/cf/host.def
 
-	if [ -n "`use debug`" -o -n "`use static`" ]
+	if use static
 	then
 		echo "#define DoLoadableServer	NO" >>config/cf/host.def
 	fi
@@ -523,7 +502,7 @@ src_unpack() {
 
 #	# Build with the binary MatroxHAL driver
 #	echo "#define HaveMatroxHal YES" >> config/cf/host.def
-#	echo "#define UseMatroxHal YES" >> config/cf/host.def
+	echo "#define UseMatroxHal YES" >> config/cf/host.def
 
 # Will uncomment this after kde, qt, and *box ebuilds are alterered to use
 # it
@@ -563,6 +542,16 @@ src_compile() {
 	# Set MAKEOPTS to have proper -j? option ..
 	get_number_of_jobs
 
+	# Compile ucs2any C implementation (patch #9142)
+	ebegin "Compiling ucs2any C implementation"
+		cd ${S}/fonts/util
+		gcc -Wall -o ucs2any ucs2any.c
+		[ ! -d ../../exports/bin/ ] && mkdir -p ../../exports/bin/
+		mv ucs2any ../../exports/bin/
+		ls ${S}/exports/bin/
+		cd ${S}
+	eend 0
+
 	# If a user defines the MAKE_OPTS variable in /etc/make.conf instead of
 	# MAKEOPTS, they'll redefine an internal XFree86 Makefile variable and the
 	# xfree build will silently die. This is tricky to track down, so I'm