Add mesa-7.7.1_rc2 with i915kill patch.

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
new file mode 100644 (file)
index 0000000..1ff79bb
--- /dev/null
+++ b/media-libs/mesa/Manifest
@@ -0,0 +1,3 @@
+AUX 0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch 2137 RMD160 08118ad35fec06fa5aeb7ca828cf763178158fb5 SHA1 40f5a8767d87244880544a26c6b1cdbd02edef22 SHA256 7a9ab83d98fced49ae2668b7e1f9a01a3a865246e0599bba61a4288af5e92773
+DIST MesaLib-7.7.1-rc2.tar.bz2 4986416 RMD160 b25778ede49bb875ca91f105487352ff6d8494c2 SHA1 02853b3b8d9bc9c2f94bcb41e6e42baeeb0053f8 SHA256 40204770b192d0dd5a0e243cb5d8aff47f8c567e24a86f3b61810540b5d93669
+EBUILD mesa-7.7.1_rc2.ebuild 6058 RMD160 9134fe27ef6994534e4f934de2883579b455ed55 SHA1 ac09ee5d1d5aca88deab6288420ad6c9aa9d67b9 SHA256 180c1679c80ff47750b40cd3e60bb85c5e9dcfbd691e7914dd5ff2534a9ff8a0

diff --git a/media-libs/mesa/files/0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch b/media-libs/mesa/files/0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch
new file mode 100644 (file)
index 0000000..5aa9da2
--- /dev/null
+++ b/media-libs/mesa/files/0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch
@@ -0,0 +1,64 @@
+From 7ee4db50b10ab2d8fdfc4781f26b84041cf568d7 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <eric@anholt.net>
+Date: Wed, 10 Mar 2010 10:38:20 -0800
+Subject: [PATCH] i965: Fix the response len of masked sampler messages for 8-wide dispatch.
+
+The bad response length would hang the GPU with a masked sample in a
+shader using control flow.  For 8-wide, the response length is always
+4, and masked slots are just not written to.  brw_wm_glsl.c already
+allocates registers in the right locations.
+
+Fixes piglit glsl-fs-bug25902 (fd.o bug #25902).
+(cherry picked from commit f6d210c284751ac50a8d6358de7e75a1ff1e4ac7)
+(cherry picked from commit dc8c0359448cdae7b367552ba58783c04b199778)
+---
+ src/mesa/drivers/dri/i965/brw_eu_emit.c |   18 +++++++++++++++---
+ 1 files changed, 15 insertions(+), 3 deletions(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
+index f69d529..82f2fda 100644
+--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
++++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
+@@ -1290,7 +1290,7 @@ void brw_SAMPLE(struct brw_compile *p,
+               GLuint simd_mode)
+ {
+    GLboolean need_stall = 0;
+-   
++
+    if (writemask == 0) {
+       /*printf("%s: zero writemask??\n", __FUNCTION__); */
+       return;
+@@ -1327,8 +1327,14 @@ void brw_SAMPLE(struct brw_compile *p,
+          /* printf("need stall %x %x\n", newmask , writemask); */
+       }
+       else {
++       GLboolean dispatch_16 = GL_FALSE;
++
+        struct brw_reg m1 = brw_message_reg(msg_reg_nr);
+-       
++
++       guess_execution_size(p->current, dest);
++       if (p->current->header.execution_size == BRW_EXECUTE_16)
++          dispatch_16 = GL_TRUE;
++
+        newmask = ~newmask & WRITEMASK_XYZW;
+ 
+        brw_push_insn_state(p);
+@@ -1343,7 +1349,13 @@ void brw_SAMPLE(struct brw_compile *p,
+ 
+        src0 = retype(brw_null_reg(), BRW_REGISTER_TYPE_UW); 
+        dest = offset(dest, dst_offset);
+-       response_length = len * 2;
++
++       /* For 16-wide dispatch, masked channels are skipped in the
++        * response.  For 8-wide, masked channels still take up slots,
++        * and are just not written to.
++        */
++       if (dispatch_16)
++          response_length = len * 2;
+       }
+    }
+ 
+-- 
+1.6.4.4
+

diff --git a/media-libs/mesa/mesa-7.7.1_rc2.ebuild b/media-libs/mesa/mesa-7.7.1_rc2.ebuild
new file mode 100644 (file)
index 0000000..d59ae9e
--- /dev/null
+++ b/media-libs/mesa/mesa-7.7.1_rc2.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.1_rc2.ebuild,v 1.1 2010/03/23 11:20:10 scarabeus Exp $
+
+EAPI="2"
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+       GIT_ECLASS="git"
+       EXPERIMENTAL="true"
+fi
+
+inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability versionator
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MAJOR_MINOR=$(get_version_component_range 1-2)
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = 9999* ]]; then
+       SRC_URI="${SRC_PATCHES}"
+else
+       SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${MAJOR_MINOR}/RC/${MY_SRC_P}.tar.bz2
+               ${SRC_PATCHES}"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis sunffb svga tdfx via"
+for card in ${VIDEO_CARDS}; do
+       IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+       debug +gallium motif +nptl pic selinux +xcb kernel_FreeBSD"
+
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+       !<x11-base/xorg-server-1.7
+       !<=x11-proto/xf86driproto-2.0.3
+       >=app-admin/eselect-opengl-1.1.1-r2
+       dev-libs/expat
+       >=x11-libs/libdrm-2.4.17
+       x11-libs/libICE
+       x11-libs/libX11[xcb?]
+       x11-libs/libXdamage
+       x11-libs/libXext
+       x11-libs/libXi
+       x11-libs/libXmu
+       x11-libs/libXxf86vm
+       motif? ( x11-libs/openmotif )
+"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       x11-misc/makedepend
+       >=x11-proto/dri2proto-1.99.3
+       >=x11-proto/glproto-1.4.8
+       x11-proto/inputproto
+       >=x11-proto/xextproto-7.0.99.1
+       x11-proto/xf86driproto
+       x11-proto/xf86vidmodeproto
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+pkg_setup() {
+       # gcc 4.2 has buggy ivopts
+       if [[ $(gcc-version) = "4.2" ]]; then
+               append-flags -fno-ivopts
+       fi
+
+       # recommended by upstream
+       append-flags -ffast-math
+}
+
+src_unpack() {
+       [[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
+}
+
+src_prepare() {
+       # apply patches
+       if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+               EPATCH_FORCE="yes" \
+               EPATCH_SOURCE="${WORKDIR}/patches" \
+               EPATCH_SUFFIX="patch" \
+               epatch
+       fi
+       # FreeBSD 6.* doesn't have posix_memalign().
+       [[ ${CHOST} == *-freebsd6.* ]] && \
+               sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
+
+       epatch "${FILESDIR}/0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch"
+
+       eautoreconf
+}
+
+src_configure() {
+       local myconf r600
+
+       # Configurable DRI drivers
+       driver_enable swrast
+       driver_enable video_cards_intel i810 i915 i965
+       driver_enable video_cards_mach64 mach64
+       driver_enable video_cards_mga mga
+       driver_enable video_cards_r128 r128
+       # ATI has two implementations as video_cards
+       driver_enable video_cards_radeon radeon r200 r300 r600
+       driver_enable video_cards_radeonhd r300 r600
+       driver_enable video_cards_savage savage
+       driver_enable video_cards_sis sis
+       driver_enable video_cards_sunffb ffb
+       driver_enable video_cards_tdfx tdfx
+       driver_enable video_cards_via unichrome
+
+       myconf="${myconf} $(use_enable gallium)"
+       if use gallium; then
+               elog "You have enabled gallium infrastructure."
+               elog "This infrastructure currently support these drivers:"
+               elog "    Intel: driver not really functional, thus disabled."
+               elog "    Nouveau: only available implementation. Experimental Quality."
+               elog "    Radeon: implementation up to the r500. Testing Quality."
+               elog "    Svga: VMWare Virtual GPU driver. Hic sunt leones."
+               echo
+               myconf="${myconf}
+                       --disable-gallium-intel
+                       --with-state-trackers=glx,dri,egl
+                       $(use_enable video_cards_svga gallium-svga)
+                       $(use_enable video_cards_nouveau gallium-nouveau)"
+                       #$(use_enable video_cards_intel gallium-intel)"
+               if use video_cards_radeon || use video_cards_radeonhd; then
+                       myconf="${myconf} --enable-gallium-radeon"
+               else
+                       myconf="${myconf} --disable-gallium-radeon"
+               fi
+       else
+               if use video_cards_nouveau || use video_cards_svga; then
+                       elog "SVGA and nouveau drivers are available only via gallium interface."
+                       elog "Enable gallium useflag if you insist to use them."
+               fi
+       fi
+
+       # --with-driver=dri|xlib|osmesa || do we need osmesa?
+       econf \
+               --disable-option-checking \
+               --with-driver=dri \
+               --disable-glut \
+               --without-demos \
+               $(use_enable debug) \
+               $(use_enable motif glw) \
+               $(use_enable motif) \
+               $(use_enable nptl glx-tls) \
+               $(use_enable xcb) \
+               $(use_enable !pic asm) \
+               --with-dri-drivers=${DRI_DRIVERS} \
+               ${myconf}
+}
+
+src_install() {
+       dodir /usr
+       emake DESTDIR="${D}" install || die "Installation failed"
+
+       # Remove redundant headers
+       # GLUT thing
+       rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
+       # Glew includes
+       rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
+               || die "Removing glew includes failed."
+
+       # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+       # because user can eselect desired GL provider.
+       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.{la,a,so*}; do
+                       if [ -f ${x} -o -L ${x} ]; then
+                               mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+                                       || die "Failed to move ${x}"
+                       fi
+               done
+               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 \
+                                       || die "Failed to move ${x}"
+                       fi
+               done
+       eend $?
+}
+
+pkg_postinst() {
+       # Switch to the xorg implementation.
+       echo
+       eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+driver_enable() {
+       case $# in
+               # for enabling unconditionally
+               1)
+                       DRI_DRIVERS+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       DRI_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}