Added fix for OO/wine transparencies from bug #96053. Thanks to bartron for

both patches.
(Portage version: 2.0.51.22-r2)

5 files changed, 179 insertions, 2 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 701b58b0fb39..aa124f003fe3 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.47 2005/09/27 19:37:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.48 2005/10/04 01:27:12 joshuabaergen Exp $
+
+*xorg-server-0.99.1-r10 (04 Oct 2005)
+
+  04 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/fix-transparencies.patch, +xorg-server-0.99.1-r10.ebuild:
+  Added fix for OO/wine transparencies from bug #96053.  Thanks to bartron for
+  both patches.
 
   27 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-0.99.1-r9.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index e0dc2a81463f..c58ca9507dab 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,9 @@
-MD5 a510b050342ce0bd6a287119bfb5b42e ChangeLog 9644
+MD5 7a3f17d3d8113b61d39b5e89f43bf5d8 ChangeLog 9903
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 MD5 b2cfc03cadd9ae25eb5e83b44cdabeaf xorg-server-0.99.1-r9.ebuild 3852
+MD5 274f0acce38a83fb90aae3fc656943a1 xorg-server-0.99.1-r10.ebuild 3890
 MD5 5a445ea35d70ce20671a49049b406680 files/0.99.1-r9-check-for-glproto.patch 911
 MD5 54ab2c693d9e7e6e09b20bb8dd7db297 files/0.99.1-r9_CAN-2005-2495.patch 4387
 MD5 21ec9868da064e8a549db3d501373dea files/digest-xorg-server-0.99.1-r9 239
+MD5 21ec9868da064e8a549db3d501373dea files/digest-xorg-server-0.99.1-r10 239
+MD5 7fb68ff739074f0ee643388ee39e20f8 files/fix-transparencies.patch 310
diff --git a/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r10 b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r10
new file mode 100644
index 000000000000..df3d85104a58
--- /dev/null
+++ b/x11-base/xorg-server/files/digest-xorg-server-0.99.1-r10
@@ -0,0 +1,3 @@
+MD5 ae556a5fa66cb9871cd9eb93bcc908ad xorg-server-0.99.1.tar.bz2 3602415
+MD5 0df27701df0924d17ddf41185efa8ce1 MesaLib-6.3.2.tar.bz2 3012145
+MD5 663fffee2ca1db123595cf66caac928b xorg-server-0.99.1-update-to-CVS-HEAD-20050907.patch.gz 300366
diff --git a/x11-base/xorg-server/files/fix-transparencies.patch b/x11-base/xorg-server/files/fix-transparencies.patch
new file mode 100644
index 000000000000..05cfe5e08b95
--- /dev/null
+++ b/x11-base/xorg-server/files/fix-transparencies.patch
@@ -0,0 +1,11 @@
+--- xc/programs/Xserver/fb/fbcopy.c.ORIG
++++ xc/programs/Xserver/fb/fbcopy.c
+@@ -59,7 +59,7 @@
+     while (nbox--)
+     {
+ #ifdef USE_MMX
+-	if (!reverse && !upsidedown && fbHaveMMX())
++	if (alu == GXcopy && !reverse && !upsidedown && fbHaveMMX())
+ 	{
+ 	    if (!fbCopyAreammx (pSrcDrawable,
+ 				pDstDrawable,
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r10.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r10.ebuild
new file mode 100644
index 000000000000..0224b949b27d
--- /dev/null
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r10.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r10.ebuild,v 1.1 2005/10/04 01:27:12 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+# Hack to make sure autoreconf gets run
+SNAPSHOT="yes"
+
+inherit flag-o-matic x-modular multilib
+
+OPENGL_DIR="xorg-x11"
+
+MESA_PN="Mesa"
+MESA_PV="6.3.2"
+MESA_P="${MESA_PN}-${MESA_PV}"
+MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
+
+CVS_UPDATE_DATE="20050907"
+
+PATCHES="${WORKDIR}/${P}-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch
+	${FILESDIR}/${PVR}-check-for-glproto.patch
+	${FILESDIR}/${PVR}_CAN-2005-2495.patch
+	${FILESDIR}/fix-transparencies.patch"
+
+SRC_URI="${SRC_URI}
+	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
+	http://dev.gentoo.org/~spyderous/xorg-x11/xorg-server-0.99.1-update-to-CVS-HEAD-${CVS_UPDATE_DATE}.patch.gz"
+DESCRIPTION="X.Org X servers"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+#IUSE="dri ipv6 minimal xprint"
+IUSE="dri ipv6 minimal"
+RDEPEND="x11-libs/libXfont
+	x11-libs/xtrans
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libxkbfile
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+	x11-libs/libXrender
+	x11-libs/libXi
+	media-libs/freetype
+	>=media-libs/mesa-6
+	media-fonts/font-misc-misc
+	media-fonts/font-cursor-misc
+	x11-misc/xbitmaps
+	x11-misc/xkbdata
+	x11-apps/iceauth
+	x11-apps/rgb
+	x11-apps/xauth
+	x11-apps/xinit
+	app-admin/eselect-opengl"
+DEPEND="${RDEPEND}
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/fixesproto
+	x11-proto/damageproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xf86dgaproto
+	x11-proto/xf86miscproto
+	x11-proto/xf86rushproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xf86bigfontproto
+	x11-proto/compositeproto
+	x11-proto/recordproto
+	x11-proto/resourceproto
+	x11-proto/dmxproto
+	x11-proto/videoproto
+	x11-proto/scrnsaverproto
+	x11-proto/evieext
+	x11-proto/trapproto
+	>=x11-proto/xineramaproto-1.1-r1
+	x11-proto/fontsproto
+	>=x11-proto/kbproto-1.0-r1
+	x11-proto/inputproto
+	x11-proto/bigreqsproto
+	x11-proto/xcmiscproto
+	x11-proto/glproto
+	dri? ( x11-proto/xf86driproto
+		x11-libs/libdrm )"
+#	xprint? ( x11-proto/printproto
+#		x11-apps/mkfontdir
+#		x11-apps/mkfontscale )
+
+pkg_setup() {
+	# localstatedir is used for the log location; we need to override the default
+	# from ebuild.sh
+	# sysconfdir is used for the xorg.conf location; same applies
+	CONFIGURE_OPTIONS="
+		$(use_enable ipv6)
+		$(use_enable !minimal dmx)
+		$(use_enable !minimal xvfb)
+		$(use_enable !minimal xnest)
+		$(use_enable dri)
+		--disable-xprint
+		--enable-xcsecurity
+		--with-mesa-source=${WORKDIR}/${MESA_P}
+		--enable-xorg
+		--enable-xtrap
+		--enable-xevie
+		--sysconfdir=/etc/X11
+		--localstatedir=/var
+		--with-xkb-path=/usr/$(get_libdir)/X11/xkb
+		--disable-static"
+#		$(use_enable xprint)
+
+	# X won't start if -fomit-frame-pointer isn't filtered
+	filter-flags -fomit-frame-pointer
+}
+
+src_install() {
+	x-modular_src_install
+
+	dynamic_libgl_install
+
+	dosym Xorg /usr/bin/X
+	fperms 4711 /usr/bin/Xorg
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+}
+
+pkg_postrm() {
+	# Get rid of module dir to ensure opengl-update works properly
+	if ! has_version x11-base/xorg-server; then
+		if [ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]; then
+			rm -rf ${ROOT}/usr/$(get_libdir)/xorg/modules
+		fi
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+		local x=""
+		for x in ${D}/usr/$(get_libdir)/xorg/modules/libglx*; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions
+			fi
+		done
+	eend 0
+}
+
+switch_opengl_implem() {
+		# Switch to the xorg implementation.
+		# Use new opengl-update that will not reset user selected
+		# OpenGL interface ...
+		echo
+		eselect opengl set --use-old ${OPENGL_DIR}
+}