[arch-commits] Commit in mesa/trunk (PKGBUILD git_fixes.patch linking_fix.patch)

[Ionut Biru]

    Date: Monday, August 1, 2011 @ 08:57:59
  Author: ibiru
Revision: 134098

update to 7.11 final

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/git_fixes.patch
  mesa/trunk/linking_fix.patch

-------------------+
 PKGBUILD          |   15 +++++----------
 git_fixes.patch   |   36 ------------------------------------
 linking_fix.patch |   22 ----------------------
 3 files changed, 5 insertions(+), 68 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-01 11:25:34 UTC (rev 134097)
+++ PKGBUILD	2011-08-01 12:57:59 UTC (rev 134098)
@@ -10,9 +10,9 @@
 
 if [ "${_git}" = "true" ]; then
     #pkgver=7.10.99.git20110709
-    pkgver=7.11rc4
+    pkgver=7.11
   else
-    pkgver=7.11rc4
+    pkgver=7.11
 fi
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -20,27 +20,22 @@
              'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=(LICENSE 
-	#git_fixes.patch
-	linking_fix.patch)
+source=(LICENSE)
 if [ "${_git}" = "true" ]; then
 	# mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
 	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
 	source=(${source[@]} "MesaLib-${pkgver}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
   else
-	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver/rc4/}/MesaLib-${pkgver/rc/-rc}.tar.bz2"
+	source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
 )
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '887be83c01d126c2a4cb372af7d3b067'
-         '1236827baf4b274233341e8651ece8fd')
+         'ff03aca82d0560009a076a87c888cf13')
 
 build() {
     cd ${srcdir}/?esa-*
 
 if [ "${_git}" = "true" ]; then
-    #patch -Np1 -i ${srcdir}/git_fixes.patch
-    patch -Np1 -i ${srcdir}/linking_fix.patch
     autoreconf -vfi
     ./autogen.sh --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \

Deleted: git_fixes.patch
===================================================================
--- git_fixes.patch	2011-08-01 11:25:34 UTC (rev 134097)
+++ git_fixes.patch	2011-08-01 12:57:59 UTC (rev 134098)
@@ -1,36 +0,0 @@
-From 804995807dfea9cbdbd676e52b95d42715101913 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric at anholt.net>
-Date: Fri, 08 Jul 2011 22:30:48 +0000
-Subject: i965/gen4: Fix GPU hangs since the program streaming change.
-
-This was tricky.  We were doing a use-before-initialize of
-grf_reg_count, but the value usually got overwritten anyway -- when we
-didn't have to do a relocation (typical), or on gen5 when we didn't
-have relocations at all.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=38771
-Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
-(cherry picked from commit d03fdc4cdefdfdc5b59547945704c6037a5061c7)
----
-diff --git a/src/mesa/drivers/dri/i965/brw_vs_state.c b/src/mesa/drivers/dri/i965/brw_vs_state.c
-index d5010a2..179ca19 100644
---- a/src/mesa/drivers/dri/i965/brw_vs_state.c
-+++ b/src/mesa/drivers/dri/i965/brw_vs_state.c
-@@ -47,6 +47,7 @@ brw_prepare_vs_unit(struct brw_context *brw)
-    memset(vs, 0, sizeof(*vs));
- 
-    /* BRW_NEW_PROGRAM_CACHE | CACHE_NEW_VS_PROG */
-+   vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1;
-    vs->thread0.kernel_start_pointer =
-       brw_program_reloc(brw,
- 			brw->vs.state_offset +
-@@ -54,7 +55,6 @@ brw_prepare_vs_unit(struct brw_context *brw)
- 			brw->vs.prog_offset +
- 			(vs->thread0.grf_reg_count << 1)) >> 6;
- 
--   vs->thread0.grf_reg_count = ALIGN(brw->vs.prog_data->total_grf, 16) / 16 - 1;
-    vs->thread1.floating_point_mode = BRW_FLOATING_POINT_NON_IEEE_754;
-    /* Choosing multiple program flow means that we may get 2-vertex threads,
-     * which will have the channel mask for dwords 4-7 enabled in the thread,
---
-cgit v0.8.3-6-g21f6

Deleted: linking_fix.patch
===================================================================
--- linking_fix.patch	2011-08-01 11:25:34 UTC (rev 134097)
+++ linking_fix.patch	2011-08-01 12:57:59 UTC (rev 134098)
@@ -1,22 +0,0 @@
-From 5fe5d236c26b3b2428bc7395304e40cf21d3d3e1 Mon Sep 17 00:00:00 2001
-From: Chia-I Wu <olv at lunarg.com>
-Date: Wed, 13 Jul 2011 07:25:46 +0000
-Subject: targets/egl-static: fix a linking error
-
-rbug is always linked in and it needs libpthread.
----
-diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
-index 832d7ba..69e7eec 100644
---- a/src/gallium/targets/egl-static/Makefile
-+++ b/src/gallium/targets/egl-static/Makefile
-@@ -42,7 +42,7 @@ egl_CPPFLAGS += \
- 	-I$(TOP)/src/egl/main \
- 	-D_EGL_MAIN=_eglMain
- egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a
--egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm
-+egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -lpthread
- 
- # EGL platforms
- ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
---
-cgit v0.8.3-6-g21f6