Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/kid3/kid3.install
	community/cherokee/PKGBUILD
	community/supercollider/supercollider.install
	core/libusb/PKGBUILD
	core/systemd/PKGBUILD
	core/udev/PKGBUILD
	extra/gimp-devel/PKGBUILD
	extra/maxima/PKGBUILD
	libre/kdenetwork-kopete-libre/PKGBUILD
	staging/kdebase-workspace/kdm
	staging/kdebindings-perlkde/PKGBUILD
	staging/kdebindings-perlqt/PKGBUILD
	staging/kdemultimedia/PKGBUILD
	staging/kdenetwork/PKGBUILD
	staging/kdeplasma-addons/kdeplasma-addons-applets.install

4 files changed, 94 insertions, 0 deletions

diff --git a/testing/libva-driver-intel/PKGBUILD b/testing/libva-driver-intel/PKGBUILD
new file mode 100644
index 000000000..f679e0615
--- /dev/null
+++ b/testing/libva-driver-intel/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 160980 2012-06-07 20:14:28Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+
+pkgname=libva-driver-intel
+pkgver=1.0.18
+pkgrel=1
+pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
+arch=('i686' 'x86_64')
+url="http://freedesktop.org/wiki/Software/vaapi"
+license=('MIT')
+depends=('libva')
+options=('!libtool')
+source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2)
+md5sums=('d8c52f07148dfb2e0407549b90300bc1')
+
+build() {
+  cd intel-driver-$pkgver
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd intel-driver-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/libva/PKGBUILD b/testing/libva/PKGBUILD
new file mode 100644
index 000000000..0e9740e73
--- /dev/null
+++ b/testing/libva/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 160974 2012-06-07 19:25:27Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+
+pkgname=libva
+pkgver=1.1.0
+pkgrel=1
+pkgdesc="Video Acceleration (VA) API for Linux"
+arch=('i686' 'x86_64')
+url="http://freedesktop.org/wiki/Software/vaapi"
+license=('MIT')
+depends=('libegl' 'libgl' 'libdrm' 'libxfixes')
+makedepends=('mesa')
+optdepends=('vdpau-video: vdpau back-end for nvidia'
+            'libva-driver-intel: back-end for intel cards')
+options=('!libtool')
+install=libva.install
+source=(http://cgit.freedesktop.org/libva/snapshot/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('b22179bd44137e91d5c77a43a0cb8063')
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./autogen.sh
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -m644 -D COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/testing/libva/libva.install b/testing/libva/libva.install
new file mode 100644
index 000000000..4d8b8e24a
--- /dev/null
+++ b/testing/libva/libva.install
@@ -0,0 +1,5 @@
+post_upgrade() { 
+    if  [ "$(vercmp $2 1.0.15-1)" -lt 0 ]; then
+        echo 'Starting with libva version 1.0.15, the intel back-end is now in libva-driver-intel.'
+    fi
+}
diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD
new file mode 100644
index 000000000..322fb881e
--- /dev/null
+++ b/testing/nilfs-utils/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 160972 2012-06-07 18:46:29Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
+pkgname=nilfs-utils
+pkgver=2.1.2
+pkgrel=1
+pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
+arch=('i686' 'x86_64')
+url="http://www.nilfs.org/"
+license=('GPL2' 'LGPL2.1')
+backup=('etc/nilfs_cleanerd.conf')
+depends=('util-linux')
+options=(!libtool)
+source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
+md5sums=('9a16a5ca459e64a903eac9c2fd456802')
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --enable-libmount
+  make
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
+}