Fix 3D apps running in Wine. (Bug #163973, riku)

(Portage version: 2.1.2-r9)

4 files changed, 453 insertions, 1 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index d4c24615eb80..b741188289dc 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.139 2007/02/19 21:24:35 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.140 2007/02/19 22:21:17 joshuabaergen Exp $
+
+*mesa-6.5.2-r1 (19 Feb 2007)
+
+  19 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/6.5.2-i965-wine-fix.patch, +mesa-6.5.2-r1.ebuild:
+  Fix 3D apps running in Wine.  (Bug #163973, riku)
 
   19 Feb 2007; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.5.2.ebuild:
   Re-add die to mesa if building +xcb when libX11 is -xcb. (Bug #163761, Petteri
diff --git a/media-libs/mesa/files/6.5.2-i965-wine-fix.patch b/media-libs/mesa/files/6.5.2-i965-wine-fix.patch
new file mode 100644
index 000000000000..63acd15806b9
--- /dev/null
+++ b/media-libs/mesa/files/6.5.2-i965-wine-fix.patch
@@ -0,0 +1,109 @@
+--- a/src/mesa/drivers/dri/i965/brw_context.h
++++ b/src/mesa/drivers/dri/i965/brw_context.h
+@@ -599,6 +599,7 @@ struct brw_context 
+ 
+    struct {
+       struct brw_wm_prog_data *prog_data;
++      struct brw_wm_compile *compile_data;
+ 
+       /* Input sizes, calculated from active vertex program:
+        */
+diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
+index 3e2f2d0..0f842d2 100644
+--- a/src/mesa/drivers/dri/i965/brw_wm.c
++++ b/src/mesa/drivers/dri/i965/brw_wm.c
+@@ -138,64 +138,75 @@ static void do_wm_prog( struct brw_conte
+ 			struct brw_fragment_program *fp, 
+ 			struct brw_wm_prog_key *key)
+ {
+-   struct brw_wm_compile c;
++   struct brw_wm_compile *c;
+    const GLuint *program;
+    GLuint program_size;
+ 
+-   memset(&c, 0, sizeof(c));
+-   memcpy(&c.key, key, sizeof(*key));
++   c = brw->wm.compile_data;
++   if (c == NULL) {
++     brw->wm.compile_data = calloc(1, sizeof(*brw->wm.compile_data));
++     c = brw->wm.compile_data;
++   } else {
++     memset(c, 0, sizeof(*brw->wm.compile_data));
++   }
++   memcpy(&c->key, key, sizeof(*key));
+ 
+-   c.fp = fp;
+-   c.env_param = brw->intel.ctx.FragmentProgram.Parameters;
++   c->fp = fp;
++   c->env_param = brw->intel.ctx.FragmentProgram.Parameters;
+ 
+ 
+    /* Augment fragment program.  Add instructions for pre- and
+     * post-fragment-program tasks such as interpolation and fogging.
+     */
+-   brw_wm_pass_fp(&c);
++   brw_wm_pass_fp(c);
+    
+    /* Translate to intermediate representation.  Build register usage
+     * chains.
+     */
+-   brw_wm_pass0(&c);
++   brw_wm_pass0(c);
+ 
+    /* Dead code removal.
+     */
+-   brw_wm_pass1(&c);
++   brw_wm_pass1(c);
+ 
+    /* Hal optimization
+     */
+-   brw_wm_pass_hal (&c);
++   brw_wm_pass_hal (c);
+    
+    /* Register allocation.
+     */
+-   c.grf_limit = BRW_WM_MAX_GRF/2;
++   c->grf_limit = BRW_WM_MAX_GRF/2;
+ 
+    /* This is where we start emitting gen4 code:
+     */
+-   brw_init_compile(&c.func);    
++   brw_init_compile(&c->func);    
+ 
+-   brw_wm_pass2(&c);
++   brw_wm_pass2(c);
+ 
+-   c.prog_data.total_grf = c.max_wm_grf;
+-   c.prog_data.total_scratch = c.last_scratch ? c.last_scratch + 0x40 : 0;
++   c->prog_data.total_grf = c->max_wm_grf;
++   if (c->last_scratch) {
++      c->prog_data.total_scratch =
++	 c->last_scratch + 0x40;
++   } else {
++      c->prog_data.total_scratch = 0;
++   }
+ 
+    /* Emit GEN4 code.
+     */
+-   brw_wm_emit(&c);
++   brw_wm_emit(c);
+ 
+    /* get the program
+     */
+-   program = brw_get_program(&c.func, &program_size);
++   program = brw_get_program(&c->func, &program_size);
+ 
+    /*
+     */
+    brw->wm.prog_gs_offset = brw_upload_cache( &brw->cache[BRW_WM_PROG],
+-					      &c.key,
+-					      sizeof(c.key),
++					      &c->key,
++					      sizeof(c->key),
+ 					      program,
+ 					      program_size,
+-					      &c.prog_data,
++					      &c->prog_data,
+ 					      &brw->wm.prog_data );
+ }
+
diff --git a/media-libs/mesa/files/digest-mesa-6.5.2-r1 b/media-libs/mesa/files/digest-mesa-6.5.2-r1
new file mode 100644
index 000000000000..ee5bf2382d08
--- /dev/null
+++ b/media-libs/mesa/files/digest-mesa-6.5.2-r1
@@ -0,0 +1,3 @@
+MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166
+RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166
+SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166
diff --git a/media-libs/mesa/mesa-6.5.2-r1.ebuild b/media-libs/mesa/mesa-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..90427943451a
--- /dev/null
+++ b/media-libs/mesa/mesa-6.5.2-r1.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.1 2007/02/19 22:21:17 joshuabaergen Exp $
+
+inherit eutils toolchain-funcs multilib flag-o-matic portability
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV}"
+MY_SRC_P="${MY_PN}Lib-${PV}"
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE_VIDEO_CARDS="
+	video_cards_i810
+	video_cards_mach64
+	video_cards_mga
+	video_cards_none
+	video_cards_r128
+	video_cards_radeon
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_sis
+	video_cards_sunffb
+	video_cards_tdfx
+	video_cards_trident
+	video_cards_via"
+IUSE="${IUSE_VIDEO_CARDS}
+	debug
+	doc
+	hardened
+	motif
+	nptl
+	xcb"
+
+RESTRICT="stricter"
+RDEPEND="dev-libs/expat
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/libXi
+	x11-libs/libXmu
+	>=x11-libs/libdrm-2.2
+	x11-libs/libICE
+	app-admin/eselect-opengl
+	motif? ( virtual/motif )
+	doc? ( app-doc/opengl-manpages )
+	!<=x11-base/xorg-x11-6.9
+	xcb? ( x11-libs/libxcb )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-misc/makedepend
+	x11-proto/inputproto
+	x11-proto/xextproto
+	!hppa? ( x11-proto/xf86driproto )
+	x11-proto/xf86vidmodeproto
+	>=x11-proto/glproto-1.4.8
+	motif? ( x11-proto/printproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+if use debug; then
+	if ! has splitdebug ${FEATURES}; then
+		RESTRICT="${RESTRICT} nostrip"
+	fi
+fi
+
+pkg_setup() {
+	if use xcb; then
+		if ! built_with_use x11-libs/libX11 xcb; then
+			msg="You must build libX11 with xcb enabled."
+			eerror ${msg}
+			die ${msg}
+		fi
+	fi
+
+	if use debug; then
+		strip-flags
+		append-flags -g
+	fi
+
+	append-flags -fno-strict-aliasing
+
+	if use x86-fbsd; then
+		CONFIG="freebsd-dri-x86"
+	elif use amd64-fbsd; then
+		CONFIG="freebsd-dri-amd64"
+	elif use kernel_FreeBSD; then
+		CONFIG="freebsd-dri"
+	elif use x86; then
+		CONFIG="linux-dri-x86"
+	elif use amd64; then
+		[[ ${ABI} == "amd64" ]] && CONFIG="linux-dri-x86-64"
+		[[ ${ABI} == "x86" ]] && CONFIG="linux-dri-x86"
+	elif use ppc; then
+		CONFIG="linux-dri-ppc"
+	else
+		CONFIG="linux-dri"
+	fi
+}
+
+src_unpack() {
+	HOSTCONF="${S}/configs/${CONFIG}"
+
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${PV}-i965-wine-fix.patch"
+
+	# FreeBSD 6.* doesn't have posix_memalign().
+	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
+
+	# Don't compile debug code with USE=-debug - bug #125004
+	if ! use debug; then
+	   einfo "Removing DO_DEBUG defs in dri drivers..."
+	   find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;
+	fi
+
+	# Set up libdir
+	echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+
+	# Set default dri drivers directory
+	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+
+	# Do we want thread-local storage (TLS)?
+	if use nptl; then
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+	fi
+
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+	if use xcb; then
+		echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
+		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
+		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
+	fi
+
+	# Configurable DRI drivers
+	if use video_cards_i810; then
+		add_drivers i810 i915 i915tex i965
+	fi
+	if use video_cards_mach64; then
+		add_drivers mach64
+	fi
+	if use video_cards_mga; then
+		add_drivers mga
+	fi
+	if use video_cards_r128; then
+		add_drivers r128
+	fi
+	if use video_cards_radeon; then
+		add_drivers radeon r200 r300
+	fi
+	if use video_cards_s3virge; then
+		add_drivers s3v
+	fi
+	if use video_cards_savage; then
+		add_drivers savage
+	fi
+	if use video_cards_sis; then
+		add_drivers sis
+	fi
+	if use video_cards_sunffb; then
+		add_drivers ffb
+	fi
+	if use video_cards_tdfx; then
+		add_drivers tdfx
+	fi
+	if use video_cards_trident; then
+		add_drivers trident
+	fi
+	if use video_cards_via; then
+		add_drivers unichrome
+	fi
+
+	# Set drivers to everything on which we ran add_drivers()
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+
+	if use hardened; then
+		einfo "Deactivating assembly code for hardened build"
+		echo "ASM_FLAGS =" >> ${HOSTCONF}
+		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_API =" >> ${HOSTCONF}
+	fi
+
+	if use sparc; then
+		einfo "Sparc assembly code is not working; deactivating"
+		echo "ASM_FLAGS =" >> ${HOSTCONF}
+		echo "ASM_SOURCES =" >> ${HOSTCONF}
+	fi
+
+	# Replace hardcoded /usr/X11R6 with this
+	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
+
+	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
+	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
+	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
+	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
+	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+
+	# Removed glut, since we have separate freeglut/glut ebuilds
+	# Remove EGL, since Brian Paul says it's not ready for a release
+	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+
+	# Get rid of glut includes
+	rm -f ${S}/include/GL/glut*h
+
+	# r200 breaks without this, since it's the only EGL-enabled driver so far
+	echo "USING_EGL = 0" >> ${HOSTCONF}
+
+	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
+	# circular dependency with glut.
+	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
+
+	# Documented in configs/default
+	if use motif; then
+		# Add -lXm
+		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+		# Add GLwMDrawA.c
+		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+	fi
+}
+
+src_compile() {
+	emake -j1 ${CONFIG} || die "Build failed"
+}
+
+src_install() {
+	dodir /usr
+	make \
+		INSTALL_DIR="${D}/usr" \
+		DRI_DRIVER_INSTALL_DIR="${D}/usr/\$(LIB_DIR)/dri" \
+		INCLUDE_DIR="${D}/usr/include" \
+		install || die "Installation failed"
+
+	if ! use motif; then
+		rm ${D}/usr/include/GL/GLwMDrawA.h
+	fi
+
+	# Don't install private headers
+	rm ${D}/usr/include/GL/GLw*P.h
+
+	fix_opengl_symlinks
+	dynamic_libgl_install
+
+	# Install libtool archives
+	insinto /usr/$(get_libdir)
+	# (#67729) Needs to be lib, not $(get_libdir)
+	doins ${FILESDIR}/lib/libGLU.la
+	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
+		> ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+	# On *BSD libcs dlopen() and similar functions are present directly in
+	# libc.so and does not require linking to libdl. portability eclass takes
+	# care of finding the needed library (if needed) witht the dlopen_lib
+	# function.
+	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
+		${D}/usr/$(get_libdir)/libGLU.la \
+		${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+	# Create the two-number versioned libs (.so.#.#), since only .so.# and
+	# .so.#.#.# were made
+	dosym libGLU.so.1.3.060502 /usr/$(get_libdir)/libGLU.so.1.3
+	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
+
+	# libGLU doesn't get the plain .so symlink either
+	dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
+
+	# Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
+	# as the default libGL.so.1
+}
+
+pkg_postinst() {
+	switch_opengl_implem
+}
+
+fix_opengl_symlinks() {
+	# Remove invalid symlinks
+	local LINK
+	for LINK in $(find ${D}/usr/$(get_libdir) \
+		-name libGL\.* -type l); do
+		rm -f ${LINK}
+	done
+	# Create required symlinks
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# FreeBSD doesn't use major.minor versioning, so the library is only
+		# libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
+		# libGL.so symlink and leave libGL.so.1 being the real thing
+		dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
+	else
+		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
+		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
+	fi
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving libGL and friends for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
+		local x=""
+		for x in ${D}/usr/$(get_libdir)/libGL.so* \
+			${D}/usr/$(get_libdir)/libGL.la \
+			${D}/usr/$(get_libdir)/libGL.a; do
+			if [ -f ${x} -o -L ${x} ]; then
+				# libGL.a cause problems with tuxracer, etc
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
+			fi
+		done
+		# glext.h added for #54984
+		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+			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}
+}
+
+add_drivers() {
+	DRI_DRIVERS="${DRI_DRIVERS} $@"
+}