Wed Oct 10 00:43:09 PDT 2012

5 files changed, 113 insertions, 16 deletions

diff --git a/testing/dnsutils/PKGBUILD b/testing/dnsutils/PKGBUILD
index ca628457a..d563d0b31 100644
--- a/testing/dnsutils/PKGBUILD
+++ b/testing/dnsutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166602 2012-09-12 22:38:22Z bisson $
+# $Id: PKGBUILD 168390 2012-10-09 22:10:12Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: mario <mario_vazq@hotmail.com>
 
 pkgname=dnsutils
-_pkgver=9.9.1-P3
+_pkgver=9.9.2
 pkgver=${_pkgver//-/.}
 pkgrel=1
 pkgdesc='DNS utilities: dig host nslookup'
@@ -15,8 +15,8 @@ options=('!makeflags')
 depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'remove-bind.patch')
-sha1sums=('1c890f69f627ffbc76460c766bafefde408ed799'
-          'b465ef6160b004838f04de9978fe1be8422af777')
+sha1sums=('eb9fa7b497d67ce61a120cb96c302381bc385324'
+          'bb13bd54134e4d787469be25461a3cc3f5cb57f4')
 
 replaces=('bind-tools' 'host')
 
diff --git a/testing/dnsutils/remove-bind.patch b/testing/dnsutils/remove-bind.patch
index 19d650964..8d4b49848 100644
--- a/testing/dnsutils/remove-bind.patch
+++ b/testing/dnsutils/remove-bind.patch
@@ -6,7 +6,7 @@ diff -aur old/bin/Makefile.in new/bin/Makefile.in
  top_srcdir =	@top_srcdir@
  
 -SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
--		check confgen @PKCS11_TOOLS@
+-		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
 +SUBDIRS =	dig
  TARGETS =
  
diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD
index d4516ea73..22bb0c339 100644
--- a/testing/mesa/PKGBUILD
+++ b/testing/mesa/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 168203 2012-10-06 20:05:41Z andyrtr $
+# $Id: PKGBUILD 168375 2012-10-09 16:09:24Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
 
-_git=true
-_gitdate=20121006
-#_git=false
+#_git=true
+#_gitdate=20121006
+_git=false
 
 if [ "${_git}" = "true" ]; then
     pkgver=8.99.git_$_gitdate
   else
-    pkgver=8.0.4
+    pkgver=9.0
 fi
 pkgrel=1
 arch=('i686' 'x86_64')
@@ -21,7 +21,8 @@ makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 options=('!libtool')
-source=(LICENSE)
+source=(LICENSE
+        git_fixes.diff)
 if [ "${_git}" = "true" ]; then
 	# mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
 	#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
@@ -32,11 +33,14 @@ if [ "${_git}" = "true" ]; then
 )
 fi
 md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
-         '87039abd49bc7ada45f98cf752b9f45b')
+         '2ebce12196dbb7b69bdf7ef53b8afdee'
+         '60e557ce407be3732711da484ab3db6c')
 
 build() {
     cd ${srcdir}/?esa-*
 
+    patch -Np1 -i ${srcdir}/git_fixes.diff
+
     COMMONOPTS="--prefix=/usr \
     --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
diff --git a/testing/mesa/git_fixes.diff b/testing/mesa/git_fixes.diff
new file mode 100644
index 000000000..8132d1d10
--- /dev/null
+++ b/testing/mesa/git_fixes.diff
@@ -0,0 +1,93 @@
+From 161aababc659e23c4a8523366a31f63b3d14e280 Mon Sep 17 00:00:00 2001
+From: Ian Romanick <ian.d.romanick@intel.com>
+Date: Mon, 08 Oct 2012 22:07:10 +0000
+Subject: docs: Add 9.0 release md5sums
+
+Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+---
+diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html
+index d72c5bb..02b7324 100644
+--- a/docs/relnotes-9.0.html
++++ b/docs/relnotes-9.0.html
+@@ -26,7 +26,9 @@ because GL_ARB_compatibility is not supported.
+ 
+ <h2>MD5 checksums</h2>
+ <pre>
+-tbd
++be4cd34c6599a7cb9d254b05c48bdb1f  MesaLib-9.0.tar.gz
++60e557ce407be3732711da484ab3db6c  MesaLib-9.0.tar.bz2
++16b128544cd3f7e237927bb9f8aab7ce  MesaLib-9.0.zip
+ </pre>
+ 
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 32faf7ab0de8b88bb15a2cb262a73c411dce9d0d Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:47:40 +0000
+Subject: mesa: don't call TexImage driver hooks for zero-sized images
+
+This simply avoids some failed assertions but there's no reason to
+call the driver hooks for storing a tex image if its size is zero.
+
+Note: This is a candidate for the stable branches.
+(cherry picked from commit 91d84096497ff538f55591f7e6bb0b563726db8d)
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 21646cc..8004876 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3034,13 +3034,15 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
+                                           border, internalFormat, texFormat);
+ 
+                /* Give the texture to the driver.  <pixels> may be null. */
+-               if (compressed) {
+-                  ctx->Driver.CompressedTexImage(ctx, dims, texImage,
+-                                                 imageSize, pixels);
+-               }
+-               else {
+-                  ctx->Driver.TexImage(ctx, dims, texImage, format,
+-                                       type, pixels, unpack);
++               if (width > 0 && height > 0 && depth > 0) {
++                  if (compressed) {
++                     ctx->Driver.CompressedTexImage(ctx, dims, texImage,
++                                                    imageSize, pixels);
++                  }
++                  else {
++                     ctx->Driver.TexImage(ctx, dims, texImage, format,
++                                          type, pixels, unpack);
++                  }
+                }
+ 
+                check_gen_mipmap(ctx, target, texObj, level);
+--
+cgit v0.9.0.2-2-gbebe
+From e75051d1967350ceff0209dde24ae42696b13b5c Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Fri, 05 Oct 2012 22:59:27 +0000
+Subject: mesa: fix error check for zero-sized compressed subtexture
+
+For glCompressedTexSubImage, width or height = 0 is legal.
+Fixes a failure in piglit's s3tc-errors test.
+
+This is for the 9.0 and 8.0 branches.  Already fixed on master.
+---
+diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
+index 8004876..38fa9fa 100644
+--- a/src/mesa/main/teximage.c
++++ b/src/mesa/main/teximage.c
+@@ -3598,10 +3598,10 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dimensions,
+    if (!_mesa_is_compressed_format(ctx, format))
+       return GL_INVALID_ENUM;
+ 
+-   if (width < 1 || width > maxTextureSize)
++   if (width < 0 || width > maxTextureSize)
+       return GL_INVALID_VALUE;
+ 
+-   if ((height < 1 || height > maxTextureSize)
++   if ((height < 0 || height > maxTextureSize)
+        && dimensions > 1)
+       return GL_INVALID_VALUE;
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD
index 6c5931c19..608580da8 100644
--- a/testing/subversion/PKGBUILD
+++ b/testing/subversion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165314 2012-08-15 13:09:50Z stephane $
+# $Id: PKGBUILD 168385 2012-10-09 20:09:57Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=subversion
-pkgver=1.7.6
+pkgver=1.7.7
 pkgrel=1
 pkgdesc="A Modern Concurrent Version Control System"
 arch=('i686' 'x86_64')
@@ -26,8 +26,8 @@ source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
         svnserve.service
         subversion-1.7.6-kwallet-gcc47.patch        
         subversion.rpath.fix.patch)
-sha1sums=('5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068'
-          'd8d99c01c49b189047389816b720923f1d9dbf2a'
+sha1sums=('c9fc0c5992eda36ba9affd93a15929e25958a951'
+          '3df83e46277f0f08868236a6b6e6c0f0d7ef9278'
           '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
           '73b36c046c09cec2093354911c89e3ba8056af6c'
           'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'