Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

libva-intel-driver/PKGBUILD

@@ -1,19 +1,18 @@
 # Platform Packages for Chakra
 
 pkgname=libva-intel-driver
-pkgver=1.2.0
+pkgver=1.3.2
 pkgrel=1
-pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
-arch=('i686' 'x86_64')
+pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
+arch=('x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
 license=('MIT')
 depends=('libva')
 replaces=('libva-driver-intel')
 conflicts=('libva-driver-intel')
 provides=('libva-driver-intel')
-options=('!libtool')
 source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2)
-md5sums=('3f501572581393f0a842c38104236ede')
+md5sums=('000e37911029dae5e851a30e99c00572')
 
 build() {
 	cd ${srcdir}/intel-driver-${pkgver}

libva/0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch

@@ -0,0 +1,38 @@
+From d4988142a3f2256e38c5c5cdcdfc1b4f5f3c1ea9 Mon Sep 17 00:00:00 2001
+From: "Xiang, Haihao" <haihao.xiang@intel.com>
+Date: Thu, 18 Jul 2013 13:13:31 +0800
+Subject: [PATCH] va: release VADisplayContext at the end of vaTerminate()
+
+Otherwise it will result in invalid reading in va_TraceEnd()
+
+Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+---
+ va/va.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/va/va.c b/va/va.c
+index 6cb17ef..0ba595b 100644
+--- a/va/va.c
++++ b/va/va.c
+@@ -515,15 +515,15 @@ VAStatus vaTerminate (
+   free(old_ctx->vtable_vpp);
+   old_ctx->vtable_vpp = NULL;
+ 
+-  if (VA_STATUS_SUCCESS == vaStatus)
+-      pDisplayContext->vaDestroy(pDisplayContext);
+-
+   VA_TRACE_LOG(va_TraceTerminate, dpy);
+ 
+   va_TraceEnd(dpy);
+ 
+   va_FoolEnd(dpy);
+ 
++  if (VA_STATUS_SUCCESS == vaStatus)
++      pDisplayContext->vaDestroy(pDisplayContext);
++
+   return vaStatus;
+ }
+ 
+-- 
+2.0.0
+

libva/PKGBUILD

@@ -1,25 +1,33 @@
 #
-# Chakra Packages for Chakra, part of chakra-project.org
+# Chakra Packages for Chakra, part of chakraos.org
 #
-# maintainer abveritas@chakra-project.org
+# maintainer almack@chakraos.org
+# contributor abveritas@chakra-project.org
 
 pkgname=libva
-pkgver=1.2.1
-pkgrel=4
-pkgdesc="libva with patches to extend VA API with data needed for VDPAU and XvBA backends."
+pkgver=1.3.1
+pkgrel=2
+pkgdesc='Video Acceleration (VA) API for Linux'
 arch=('x86_64')
 url="http://freedesktop.org/wiki/Software/vaapi"
 license=('MIT')
 depends=('libgl' 'libdrm' 'libxfixes')
 makedepends=('mesa')
-optdepends=('vdpau-video: VDPAU backend for VA API'
+optdepends=('libva-vdpau-driver: VDPAU backend for VA API'
             'libva-driver-intel: back-end for intel cards')
-source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a979a2531a08a24fdfda8bfc8c4b2629')
+source=(http://freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2
+        0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch)
+md5sums=('eb4db967f068854444b597071c66b480'
+         'e564ae7c20962c821ac2b5cb1693e1a2')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # backport patch fixing flashplugin and firefox segfaults (FS#40914, FS#40807)
+  patch -p1 -i ../0001-va-release-VADisplayContext-at-the-end-of-vaTerminat.patch
+}
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./autogen.sh
   ./configure --prefix=/usr  
   make
 }

python2-pysqlite/PKGBUILD

@@ -8,14 +8,15 @@
 
 pkgname=python2-pysqlite
 pkgver=2.6.3
-pkgrel=4
+pkgrel=5
 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine"
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://pypi.python.org/pypi/pysqlite"
 depends=('python2' 'sqlite3')
 replaces=('pysqlite2' 'python-pysqlite')
 conflicts=('pysqlite2' 'python-pysqlite')
+provides=('pysqlite2' 'python-pysqlite')
 source=("https://pypi.python.org/packages/source/p/pysqlite/pysqlite-$pkgver.tar.gz" \
         "setup.cfg")
 sha512sums=('1b8ce3b5300c1d8568ef59d4967ccd06c5e80ea45c2ffdb9d6744712f12b0b2649ade646f926562bf59b660d6d56bfc478780f22577c96cb758f1de7259570a2'

xf86-video-intel/PKGBUILD

@@ -3,8 +3,8 @@
 # Maintainer: Neophytos Kolokotronis <tetris4 AT gmail DOT com>
 
 pkgname=xf86-video-intel
-pkgver=2.99.912
-pkgrel=3
+pkgver=2.21.15 # WARINING, tried with version 2.99.912 but seems that with sna the rendering is corrupted (http://chakraos.org/forum/viewtopic.php?pid=81925#p81925)
+pkgrel=2
 arch=('x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -26,14 +26,18 @@ conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERS
            'xf86-video-i810' 
            'xf86-video-intel-legacy')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501')
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
+intel-2.21.15-xserver-1.15-compat.patch)
+sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc'
+            'fbf8fa35974dbf758b095c390d79f542b97993482ae3b63ec6542bffa87ba09f')
 
 build() {
   cd ${pkgname}-${pkgver}
+  # fix build with Xorg 1.15
+  patch -Np1 -i ${srcdir}/intel-2.21.15-xserver-1.15-compat.patch
   ./configure --prefix=/usr \
     --libexecdir=/usr/lib \
-    --enable-glamor
+    --enable-dri
   make
 }
 

xf86-video-intel/intel-2.21.15-xserver-1.15-compat.patch

@@ -0,0 +1,13 @@
+diff -up xf86-video-intel-2.21.15/src/compat-api.h.jx xf86-video-intel-2.21.15/src/compat-api.h
+--- xf86-video-intel-2.21.15/src/compat-api.h.jx	2013-05-21 06:15:11.000000000 -0400
++++ xf86-video-intel-2.21.15/src/compat-api.h	2013-10-24 15:30:52.291337300 -0400
+@@ -158,4 +158,8 @@ static inline void FreePixmap(PixmapPtr
+ 	if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h)
+ #endif
+ 
++#if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(1,14,99,3,0)
++#define DamageUnregister(a, b) DamageUnregister(a)
++#endif
++
+ #endif
+