PATCH_VER 0.2.11. (fd.o #1934, #47922) Add the highly demanded fix for DPMS problems: 9830_all_6.8.0-fix-random-dpms-blanks.patch. Fix 0455_all_6.8.0-prevent-keyboard-hardware-repeat-v2.patch with new code from upstream (fd.o #1651 comment #9). Add three sparc patches: (#fd.o #1114, #61063) 0485_all_6.8.0-afb-cfb-dlloader-fixes.patch, which allows sunffb+cfb to work with dlloader; (fd.o #2072, #61063) 0490_all_6.8.0-sparc-dlloader-cflags.patch, which defines LargePositionIndependentCflags when Mesa is built for the dlloader; and (fd.o #2073, #61063) 0495_all_6.8.0-sunffb-imake.patch, which prevents the incompatible CFLAGS combination of '-mcpu=ultrasparc -mv8' because Xorg wrongly tries to not build a 64-bit version when it shouldn't be doing this. Also, fix the ebuild to work with new sparc patches and to respect that dlloader+sdk has worked for quite a while.

3 files changed, 24 insertions, 10 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index da7cfb51a206..04fcd58a7dba 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.242 2004/12/13 00:42:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.243 2004/12/13 17:03:28 spyderous Exp $
+
+  13 Dec 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.8.0-r4.ebuild:
+  PATCH_VER 0.2.11. (fd.o #1934, #47922) Add the highly demanded fix for DPMS
+  problems: 9830_all_6.8.0-fix-random-dpms-blanks.patch. Fix
+  0455_all_6.8.0-prevent-keyboard-hardware-repeat-v2.patch with new code from
+  upstream (fd.o #1651 comment #9). Add three sparc patches: (#fd.o #1114,
+  #61063) 0485_all_6.8.0-afb-cfb-dlloader-fixes.patch, which allows sunffb+cfb
+  to work with dlloader; (fd.o #2072, #61063)
+  0490_all_6.8.0-sparc-dlloader-cflags.patch, which defines
+  LargePositionIndependentCflags when Mesa is built for the dlloader; and
+  (fd.o #2073, #61063) 0495_all_6.8.0-sunffb-imake.patch, which prevents the
+  incompatible CFLAGS combination of '-mcpu=ultrasparc -mv8' because Xorg
+  wrongly tries to not build a 64-bit version when it shouldn't be doing this.
+  Also, fix the ebuild to work with new sparc patches and to respect that
+  dlloader+sdk has worked for quite a while.
 
   12 Dec 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 28d20612bd77..cca74737d3e2 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 823e5092514c90241d46e6b0b70244af xorg-x11-6.8.0-patches-0.2.10.tar.bz2 161799
+MD5 433943a64400f11437226da4585d9285 xorg-x11-6.8.0-patches-0.2.11.tar.bz2 169686
 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 08d582af8894..851e905d8c24 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.29 2004/12/13 00:42:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.30 2004/12/13 17:03:28 spyderous Exp $
 
 # Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
 # voodoo3 cards.
@@ -44,7 +44,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.10"
+PATCH_VER="0.2.11"
 XCUR_VER="0.3.1"
 #MGADRV_VER="1_3_0beta"
 #VIADRV_VER="0.1"
@@ -493,7 +493,7 @@ cflag_setup() {
 		# according to ciaranm
 		# And hardened compiler must be softened. -- fmccor, 20.viii.04
 		sparc)	filter-flags "-fomit-frame-pointer"
-			if use hardened; then
+			if use hardened && ! use dlloader; then
 				einfo "Softening gcc for sparc"
 				ALLOWED_FLAGS="${ALLOWED_FLAGS} -fno-pie -fno-PIE"
 				append-flags "-fno-pie -fno-PIE"
@@ -540,13 +540,11 @@ check_pam() {
 }
 
 check_use_combos() {
-	if use static || use dlloader; then
+	if use static; then
 		# A static build disallows building the SDK.
 		# See config/xf86.rules.
-		# So does a DllModules YES (use dlloader) build (#50562)
-		# The latter is pending a potential patch.
 		if use sdk; then
-			die "The static and dlloader USE flags are currently incompatible with the sdk USE flag."
+			die "The static USE flag is incompatible with the sdk USE flag."
 		fi
 	fi
 
@@ -788,7 +786,7 @@ host_def_setup() {
 			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
 			XF86OSCardDrivers XF86ExtraCardDrivers \
 			DevelDrivers" >> ${HOSTCONF}
-			if use hardened; then
+			if use hardened && ! use dlloader; then
 				einfo "Softening the assembler so cfb modules will play nice with sunffb"
 				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
 				echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}