Fri Mar 15 00:04:19 PDT 2013

9 files changed, 93 insertions, 81 deletions

diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 54bb750c6..3ce9e16f8 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166755 2012-09-18 13:55:25Z bisson $
+# $Id: PKGBUILD 180031 2013-03-14 21:45:11Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
-pkgver=0.97.6
+pkgver=0.97.7
 pkgrel=1
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
@@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver
         'logrotate'
         'tmpfiles.d'
         'config.patch')
-sha1sums=('528f774b14b95fdfb8b377f8b41859c48b165e34'
+sha1sums=('9b911c557e0b7b5079de86c65b5d83fa78fadfff'
           'c9d508c1e5972f0f849d8694c1872455fa9e74de'
           'cb116cdab49a810381a515cbcfb6a6c148547f07'
           'df522b0488f3901e491f148c9300f6bae348c605'
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index f36c06a8a..1ec455c62 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 177788 2013-02-08 18:59:53Z andrea $
+# $Id: PKGBUILD 180024 2013-03-14 20:15:45Z andrea $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
-pkgver=3.0.0
-pkgrel=2
+pkgver=3.1.0
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
              'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin'
-             'cmake' 'automoc4' 'doxygen' 'mesa' 'lensfun')
+             'cmake' 'automoc4' 'doxygen' 'lensfun')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('45a9490b2b10b7b42fa9f90b7389eeb248326718')
+sha1sums=('f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd')
 
 build() {
   mkdir build
@@ -24,7 +24,8 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
-    -DBUILD_tests=OFF
+    -DBUILD_tests=OFF \
+    -DDIGIKAMSC_USE_PRIVATE_KDEGRAPHICS=OFF
   make
 }
 
diff --git a/extra/ecasound/PKGBUILD b/extra/ecasound/PKGBUILD
deleted file mode 100644
index 60b4b177b..000000000
--- a/extra/ecasound/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 168410 2012-10-11 09:44:14Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=ecasound
-pkgver=2.9.0
-pkgrel=1
-pkgdesc="A software package designed for multitrack audio processing"
-arch=('i686' 'x86_64')
-url="http://www.eca.cx/ecasound/"
-license=('GPL' 'LGPL')
-depends=('audiofile' 'liblo'
-         'liboil' 'lilv')
-makedepends=('python2' 'ruby')
-optdepends=('python2: ecamonitor, ECI API'
-            'ruby: ECI API'
-            'mpg123: MP3 decoding'
-            'lame: MP3 encoding'
-            'vorbis-tools: Ogg Vorbis decoding/encoding'
-            'faad2: AAC decoding'
-            'faac: AAC encoding'
-            'timidity++: MIDI file input'
-            'libmikmod: tracker module')
-options=('!libtool')
-source=(http://ecasound.seul.org/download/$pkgname-$pkgver.tar.gz)
-md5sums=('05e7d4664cdf4c7a138c098e9506a551')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # use vendor_ruby for ruby files
-  sed -e 's/CONFIG\["sitedir"\]/CONFIG\["vendordir"\]/' -i configure
-
-  PYTHONPATH=/usr/bin/python2 ./configure \
-    --prefix=/usr \
-    --with-python-includes=/usr/include/python2.7 \
-    --with-python-modules=/usr/lib/python2.7
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-
-  # fix for python 2.7
-  sed -i 's:bin/env python:bin/env python2:' \
-    "$pkgdir/usr/bin/ecamonitor"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index f140498d6..536889028 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 179046 2013-03-01 22:51:09Z dan $
+# $Id: PKGBUILD 179999 2013-03-14 02:05:50Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.1.5
+pkgver=1.8.2
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64)
@@ -82,7 +82,11 @@ package() {
   sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
     $(find "$pkgdir" -name '*.py') \
     "$pkgdir"/usr/lib/git-core/git-p4 \
-    "$pkgdir"/usr/share/git/gitview/gitview
+    "$pkgdir"/usr/share/git/gitview/gitview \
+    "$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \
+    "$pkgdir"/usr/share/git/remote-helpers/git-remote-hg
+  sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \
+    "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
 
   # emacs interface
   cd contrib/emacs
@@ -103,7 +107,7 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('ce168861c23a700b40ffe94475bb1d9e'
-         '3ea0d73b2fa09558454279aad9039a3b'
+md5sums=('210834d73c857931c3da34a65eb3e597'
+         '425e9421a1b128cfb46fa46d94cad919'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/glamor-egl/PKGBUILD b/extra/glamor-egl/PKGBUILD
index 579f97b42..002ae2ace 100644
--- a/extra/glamor-egl/PKGBUILD
+++ b/extra/glamor-egl/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=glamor-egl
 pkgver=0.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc='OpenGL based 2D rendering acceleration library	'
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -40,10 +40,11 @@ build() {
 
   ./configure --prefix=/usr \
     --disable-static \
-    --enable-glamor-gles2 \
     --enable-glx-tls \
-    #--help
 
+
+    #--help
+    #--enable-glamor-gles2 \ https://bugs.archlinux.org/task/34284
   make
 }
 
diff --git a/extra/libdvdcss/PKGBUILD b/extra/libdvdcss/PKGBUILD
index c6b18078d..9e8edc9a8 100644
--- a/extra/libdvdcss/PKGBUILD
+++ b/extra/libdvdcss/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 160018 2012-05-28 02:15:20Z eric $
+# $Id: PKGBUILD 180007 2013-03-14 11:52:25Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: arjan <arjan@archlinux.org>
 # Contributor Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libdvdcss
-pkgver=1.2.12
+pkgver=1.2.13
 pkgrel=1
 pkgdesc="A portable abstraction library for DVD decryption"
 url="http://www.videolan.org/libdvdcss"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('glibc')
-options=('!libtool')
+options=('!libtool' '!docs' '!emptydirs')
 source=(http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('2218a193900e3203aa10dc24cdf54275')
+sha1sums=('1a4a5e55c7529da46386c1c333340eee2c325a77')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,5 +23,5 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index ea0060806..399be0add 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179729 2013-03-09 15:29:21Z bpiotrowski $
+# $Id: PKGBUILD 180012 2013-03-14 18:21:32Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
-pkgver=5.5.29
-pkgrel=6
+pkgver=5.5.30
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
@@ -14,7 +14,7 @@ source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunt
         mariadb.service
         mariadb-post.sh
         mariadb-tmpfile.conf)
-sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74'
+sha256sums=('64dba5f1819f1d4ebf7ed31d74e4106c981a24b88259995deba3734fb7c4635f'
             'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
             '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
             '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 51a0e0fe4..aeaff94ec 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178616 2013-02-25 20:44:59Z andyrtr $
+# $Id: PKGBUILD 180010 2013-03-14 16:21:55Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=9.1
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
              'libvdpau' 'wayland' 'llvm-amdgpu-snapshot')
@@ -14,13 +14,20 @@ license=('custom')
 options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
 	    #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing
+	    git-fixes.patch
         LICENSE)
 md5sums=('d3891e02215422e120271d976ff1947e'
+         'c3e45fe7287bbf8f620c209a872330dc'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
     cd ${srcdir}/?esa-*
 
+    # pick 2 commits from master to
+    # fix a nouveau crash: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17f1cb1d99e66227d1e05925ef937643f5c1089a
+    # and intel kwin slowness http://cgit.freedesktop.org/mesa/mesa/commit/?id=e062a4187d8ea518a39c913ae7562cf1d8ac3205
+    patch -Np1 -i ${srcdir}/git-fixes.patch
+
     autoreconf -vfi # our automake is far too new for their build system :)
 
     ./configure --prefix=/usr \
diff --git a/extra/mesa/git-fixes.patch b/extra/mesa/git-fixes.patch
new file mode 100644
index 000000000..84efe610e
--- /dev/null
+++ b/extra/mesa/git-fixes.patch
@@ -0,0 +1,52 @@
+From 17f1cb1d99e66227d1e05925ef937643f5c1089a Mon Sep 17 00:00:00 2001
+From: Jan de Groot <jan@jgc.homeip.net>
+Date: Thu, 07 Mar 2013 18:48:13 +0000
+Subject: dri/nouveau: fix crash in nouveau_flush
+
+https://bugs.freedesktop.org/show_bug.cgi?id=61947
+
+Note: this is a candidate for the stable branches
+---
+diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
+index f56b3b2..6c119d5 100644
+--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c
++++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
+@@ -69,7 +69,8 @@ nouveau_flush(struct gl_context *ctx)
+ 		__DRIdri2LoaderExtension *dri2 = screen->dri2.loader;
+ 		__DRIdrawable *drawable = nctx->dri_context->driDrawablePriv;
+ 
+-		dri2->flushFrontBuffer(drawable, drawable->loaderPrivate);
++		if (drawable && drawable->loaderPrivate)
++			dri2->flushFrontBuffer(drawable, drawable->loaderPrivate);
+ 	}
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From e062a4187d8ea518a39c913ae7562cf1d8ac3205 Mon Sep 17 00:00:00 2001
+From: Tapani Pälli <tapani.palli@intel.com>
+Date: Mon, 28 Jan 2013 06:53:56 +0000
+Subject: intel: Fix regression in intel_create_image_from_name stride handling
+
+Strangely, the DRIimage interface we have passes the pitch in pixels
+instead of bytes, which anholt missed in the change to using bytes for
+region pitch.
+
+Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
+Reviewed-by: Eric Anholt <eric@anholt.net>
+---
+diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
+index defcd73..d223a0b 100644
+--- a/src/mesa/drivers/dri/intel/intel_screen.c
++++ b/src/mesa/drivers/dri/intel/intel_screen.c
+@@ -377,7 +377,7 @@ intel_create_image_from_name(__DRIscreen *screen,
+        cpp = _mesa_get_format_bytes(image->format);
+     image->region = intel_region_alloc_for_handle(intelScreen,
+ 						  cpp, width, height,
+-						  pitch, name, "image");
++						  pitch * cpp, name, "image");
+     if (image->region == NULL) {
+        free(image);
+        return NULL;
+--
+cgit v0.9.0.2-2-gbebe