[arch-commits] Commit in mesa/trunk (PKGBUILD git-fixes.patch)

Jan de Groot jgc at archlinux.org
Fri Sep 4 14:55:29 UTC 2009


    Date: Friday, September 4, 2009 @ 10:55:29
  Author: jgc
Revision: 51022

upgpkg: mesa 7.5.1-1
    Update to 7.5.1
Remove git-fixes.patch

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/git-fixes.patch

-----------------+
 PKGBUILD        |   25 +++----
 git-fixes.patch |  179 ------------------------------------------------------
 2 files changed, 11 insertions(+), 193 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-04 14:09:01 UTC (rev 51021)
+++ PKGBUILD	2009-09-04 14:55:29 UTC (rev 51022)
@@ -3,32 +3,29 @@
 
 pkgbase="mesa"
 pkgname=('mesa' 'libgl' 'ati-dri' 'intel-dri' 'unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri' 'trident-dri')
-pkgver=7.5
-pkgrel=2
+pkgver=7.5.1
+pkgrel=1
 arch=(i686 x86_64)
-makedepends=('glproto' 'pkgconfig' 'libdrm>=2.4.12' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1' 'libx11>=1.2.2' 'libxt' 'gcc-libs' 'dri2proto=2.1')
+makedepends=('glproto>=1.4.10' 'pkgconfig' 'libdrm>=2.4.13' 'libxxf86vm>=1.0.99.1' 'libxdamage>=1.1.1' 'expat>=2.0.1' 'libx11>=1.2.2' 'libxt>=1.0.6' 'gcc-libs>=4.4.1' 'dri2proto=2.1')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=(!makeflags)
-source=(http://downloads.sourceforge.net/mesa3d/MesaLib-${pkgver}.tar.bz2
-        http://downloads.sourceforge.net/mesa3d/MesaDemos-${pkgver}.tar.bz2
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+        ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaDemos-${pkgver}.tar.bz2
         ftp://ftp.archlinux.org/other/mesa/gl-manpages-1.0.1.tar.bz2
         mesa-7.1-link-shared.patch
         intel-revert-vbl.patch
-        LICENSE
-        git-fixes.patch)
-md5sums=('459f332551f6ebb86f384d21dd15e1f0'
-         '398ee8801814a00e47f6c2314e3dfddc'
+        LICENSE)
+md5sums=('877d6a4b24efc2b1d02aa553f262cba8'
+         '785402e3b9f0e335538fcc6bf19f6987'
          '6ae05158e678f4594343f32c2ca50515'
          '9eddc02e23ec08295822911e726ae89a'
          'a111f4dc82e894f8801bc3fa129af7af'
-         '5c65a0fe315dd347e09b1f2826a1df5a'
-         'dcfc0a49080ea6ad8b848b5ad92e1a2d')
+         '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
   cd "${srcdir}/Mesa-${pkgver}"
   patch -Np1 -i "${srcdir}/mesa-7.1-link-shared.patch" || return 1
-  patch -Np1 -i "${srcdir}/git-fixes.patch" || return 1
   patch -Np1 -i "${srcdir}/intel-revert-vbl.patch" || return 1
   ./configure --prefix=/usr \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
@@ -45,7 +42,7 @@
 }
 
 package_libgl() {
-  depends=('libdrm>=2.4.12' 'libxxf86vm' 'libxdamage' 'expat>=2.0.1')
+  depends=('libdrm>=2.4.13' 'libxxf86vm>=1.0.99.1' 'libxdamage>=1.1.1' 'expat>=2.0.1')
   pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
 
   cd "${srcdir}/Mesa-${pkgver}" || return 1
@@ -64,7 +61,7 @@
 }
 
 package_mesa() {
-  depends=('libgl' 'libx11>=1.2.2' 'libxt' 'gcc-libs>=4.4.1' 'dri2proto=2.1' 'libdrm>=2.4.12')
+  depends=('libgl' 'libx11>=1.2.2' 'libxt' 'gcc-libs>=4.4.1' 'dri2proto=2.1' 'libdrm>=2.4.13')
   pkgdesc="Mesa 3-D graphics libraries and include files"
 
   cd "${srcdir}/Mesa-${pkgver}" || return 1

Deleted: git-fixes.patch
===================================================================
--- git-fixes.patch	2009-09-04 14:09:01 UTC (rev 51021)
+++ git-fixes.patch	2009-09-04 14:55:29 UTC (rev 51022)
@@ -1,179 +0,0 @@
-From 5ed440400573631f540701f3efd479d8c1592007 Mon Sep 17 00:00:00 2001
-From: Michel Dänzer <daenzer at vmware.com>
-Date: Mon, 20 Jul 2009 18:26:28 +0000
-Subject: radeon: With DRI1, if we have HW stencil, only expose fbconfigs with stencil.
-
-Otherwise simple apps like glxgears pick up a DirectColor visual since the X
-server mixes the depth 32 visual in with the other GLX visuals, and this seems
-to result in a (mostly) black screen due to a bad ColorMap for a lot of people.
-
-The bad ColorMap may be a bug in the apps, the X server or X driver, and
-regardless of that I think the X server should ideally make the depth 32 GLX
-visual separate from the rest again, but in the meantime this makes us cope.
-
-(depth_bits is either 16 or 24, never 0)
----
-diff --git a/src/mesa/drivers/dri/radeon/radeon_screen.c b/src/mesa/drivers/dri/radeon/radeon_screen.c
-index 791f598..a977bed 100644
---- a/src/mesa/drivers/dri/radeon/radeon_screen.c
-+++ b/src/mesa/drivers/dri/radeon/radeon_screen.c
-@@ -283,12 +283,12 @@ radeonFillInModes( __DRIscreenPrivate *psp,
-      * with a stencil buffer.  It will be a sw fallback, but some apps won't
-      * care about that.
-      */
--    stencil_bits_array[0] = 0;
-+    stencil_bits_array[0] = stencil_bits;
-     stencil_bits_array[1] = (stencil_bits == 0) ? 8 : stencil_bits;
- 
-     msaa_samples_array[0] = 0;
- 
--    depth_buffer_factor = ((depth_bits != 0) || (stencil_bits != 0)) ? 2 : 1;
-+    depth_buffer_factor = (stencil_bits == 0) ? 2 : 1;
-     back_buffer_factor  = (have_back_buffer) ? 2 : 1;
- 
-     if (pixel_bits == 16) {
---
-cgit v0.8.2
-From 1b445f96737cf5a1a28e81ff94a2e07b2cac3a96 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric at anholt.net>
-Date: Tue, 21 Jul 2009 00:58:12 +0000
-Subject: i965: Don't clip everything if FRONT_AND_BACK culling while culling disabled.
-
-Fixes everything-black with meta_clear_tris on quake4-mpdemo and doom3-demo.
-
-Bug #18844, 22077.
-(cherry picked from commit 81d555068408d4343d7627c8bedda5675f09bd21)
----
-diff --git a/src/mesa/drivers/dri/i965/brw_clip.c b/src/mesa/drivers/dri/i965/brw_clip.c
-index 5cffceb..8fc9f89 100644
---- a/src/mesa/drivers/dri/i965/brw_clip.c
-+++ b/src/mesa/drivers/dri/i965/brw_clip.c
-@@ -152,7 +152,8 @@ static void upload_clip_prog(struct brw_context *brw)
- 
-    /* _NEW_POLYGON */
-    if (key.primitive == GL_TRIANGLES) {
--      if (ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK) 
-+      if (ctx->Polygon.CullFlag &&
-+	  ctx->Polygon.CullFaceMode == GL_FRONT_AND_BACK)
- 	 key.clip_mode = BRW_CLIPMODE_REJECT_ALL;
-       else {
- 	 GLuint fill_front = CLIP_CULL;
---
-cgit v0.8.2
-From a6b314150c141f4c73e408b114181e57237540d9 Mon Sep 17 00:00:00 2001
-From: Eric Anholt <eric at anholt.net>
-Date: Fri, 03 Jul 2009 02:21:22 +0000
-Subject: intel: Fall back on glBitmap with fog enabled.
-
-We would have to build the program with the appropriate fog mode, and
-also supply the fog coordinate if appropriate.
-
-Bug #19413.
-(cherry picked from commit 8ae02a3919bf31bd33f86208472e100eedb58497)
----
-diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
-index a2ccae1..d137aef 100644
---- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
-+++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
-@@ -409,6 +409,12 @@ intel_texture_bitmap(GLcontext * ctx,
-       return GL_FALSE;
-    }
- 
-+   if (ctx->Fog.Enabled) {
-+      if (INTEL_DEBUG & DEBUG_FALLBACKS)
-+	 fprintf(stderr, "glBitmap() fallback: fog\n");
-+      return GL_FALSE;
-+   }
-+
-    /* Check that we can load in a texture this big. */
-    if (width > (1 << (ctx->Const.MaxTextureLevels - 1)) ||
-        height > (1 << (ctx->Const.MaxTextureLevels - 1))) {
---
-cgit v0.8.2
-From 722d136f7bd3390c72bca175831647d93393e92d Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp at vmware.com>
-Date: Mon, 27 Jul 2009 21:28:49 +0000
-Subject: intel: Clean up leak of driver context structure on context destroy.
-
-(cherry picked from commit ddef7dc87b2001fbe117ee5f24a0c645ee95a03c)
----
-diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
-index cfd983d..9db5b54 100644
---- a/src/mesa/drivers/dri/intel/intel_context.c
-+++ b/src/mesa/drivers/dri/intel/intel_context.c
-@@ -804,6 +804,9 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
- 
-       /* free the Mesa context */
-       _mesa_free_context_data(&intel->ctx);
-+
-+      FREE(intel);
-+      driContextPriv->driverPrivate = NULL;
-    }
- }
- 
---
-cgit v0.8.2
-From 3dbaf68bdc1f7427a60bdcc8da635ae7a27aa3cd Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp at vmware.com>
-Date: Mon, 27 Jul 2009 21:32:50 +0000
-Subject: intel: Fix leak of DRI option info due to using the wrong free routine.
-
-(cherry picked from commit 6d66f23c50ebe8f973757b6fd1b81c9b7920c447)
----
-diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
-index 2c6e264..f810850 100644
---- a/src/mesa/drivers/dri/intel/intel_screen.c
-+++ b/src/mesa/drivers/dri/intel/intel_screen.c
-@@ -305,7 +305,7 @@ intelDestroyScreen(__DRIscreenPrivate * sPriv)
- 
-    dri_bufmgr_destroy(intelScreen->bufmgr);
-    intelUnmapScreenRegions(intelScreen);
--   driDestroyOptionCache(&intelScreen->optionCache);
-+   driDestroyOptionInfo(&intelScreen->optionCache);
- 
-    FREE(intelScreen);
-    sPriv->private = NULL;
---
-From 7d93f817c9c5222e2bdbaa9fa9f03fc502bfe878 Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp at vmware.com>
-Date: Thu, 30 Jul 2009 14:20:01 +0000
-Subject: mesa: add missing return after catching program error
-
----
-diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
-index 0d4f13c..1089792 100644
---- a/src/mesa/shader/arbprogparse.c
-+++ b/src/mesa/shader/arbprogparse.c
-@@ -2008,6 +2008,7 @@ parse_param (GLcontext * ctx, const GLubyte ** inst, struct var_cache **vc_head,
-          program_error(ctx, Program->Position,
-               "Declared parameter array length does not match parameter list");
-       }
-+      return 1;
-    }
- 
-    (*inst)++;
---
-cgit v0.8.2
-From 35e3449ad7a01c63219249b37886d59e93cbf7ac Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp at vmware.com>
-Date: Thu, 30 Jul 2009 15:02:27 +0000
-Subject: mesa: move misplaced return statement
-
-Fixes regression from commit 7d93f817c9c5222e2bdbaa9fa9f03fc502bfe878
----
-diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
-index 1089792..8607940 100644
---- a/src/mesa/shader/arbprogparse.c
-+++ b/src/mesa/shader/arbprogparse.c
-@@ -2007,8 +2007,8 @@ parse_param (GLcontext * ctx, const GLubyte ** inst, struct var_cache **vc_head,
-       if (specified_length != (int)param_var->param_binding_length) {
-          program_error(ctx, Program->Position,
-               "Declared parameter array length does not match parameter list");
-+         return 1;
-       }
--      return 1;
-    }
- 
-    (*inst)++;
---
-cgit v0.8.2




More information about the arch-commits mailing list