Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/ibus-anthy/PKGBUILD
	community/libpaper/PKGBUILD
	community/plan9port/PKGBUILD
	extra/grantlee/PKGBUILD
	extra/vlc/PKGBUILD

2 files changed, 17 insertions, 15 deletions

diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index 1afc3ed0a..fd5284709 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -1,21 +1,19 @@
-# $Id: PKGBUILD 142010 2011-11-03 23:27:16Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 170108 2012-11-02 08:45:56Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=grantlee
-pkgver=0.2.0
-pkgrel=1.1
+pkgver=0.3.0
+pkgrel=1
 pkgdesc="A string template engine based on the Django template system and written in Qt"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gitorious.org/grantlee/pages/Home"
 license=('LGPL3')
 depends=('qt')
-makedepends=('cmake')
+makedepends=('cmake' 'doxygen')
 source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0622ed30630a44b5fac0bfa7e176d3fe')
+md5sums=('195763a3238f51f8885881fc8012cd83')
 
 build() {
-  cd "${srcdir}"
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -25,6 +23,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
-} 
+}
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 6f64a9ca8..5b5fab6f9 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169442 2012-10-21 09:07:49Z giovanni $
+# $Id: PKGBUILD 170110 2012-11-02 09:09:21Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
 pkgver=2.0.4
-pkgrel=2
+pkgrel=3
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.videolan.org/vlc/"
@@ -19,7 +19,7 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
              'fluidsynth' 'libdc1394' 'libavc1394'
              'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd'
              'twolame' 'aalib' 'libmtp' 'libdvdcss'
-             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus')
+             'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2')
 [ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss' 'projectm')
 optdepends=('avahi: for service discovery using bonjour protocol'
             'libnotify: for notification plugin'
@@ -28,8 +28,10 @@ optdepends=('avahi: for service discovery using bonjour protocol'
 [ "$CARCH" = "mips64el" ] || optdepends+=('lirc-utils: for lirc plugin')
 optdepends+=('libavc1394: for devices using the 1394ta AV/C'
             'libdc1394: for IEEE 1394 plugin'
+<<<<<<< HEAD
             'kdelibs: KDE Solid hardware integration')
-[ "$CARCH" = "mips64el" ] || optdepends+=('libva-driver-intel: back-end for intel cards')
+[ "$CARCH" = "mips64el" ] || optdepends+=('libva-vdpau-driver: vdpau back-end for nvidia'
+            'libva-driver-intel: back-end for intel cards')
 optdepends+=('libbluray: for Blu-Ray support'
             'flac: for Free Lossless Audio Codec plugin')
 [ "$CARCH" = "mips64el" ] || optdepends+=('oss: for OSS audio support')
@@ -50,7 +52,8 @@ optdepends+=('libcaca: for colored ASCII art video output'
             'libcdio: for audio CD playback support'
             'ttf-freefont: for subtitle font '
             'ttf-dejavu: for subtitle font'
-            'opus: for opus support')
+            'opus: for opus support'
+            'libssh2: for sftp support')
 conflicts=('vlc-plugin')
 replaces=('vlc-plugin')
 backup=('usr/share/vlc/lua/http/.hosts'
@@ -82,6 +85,7 @@ build() {
               --enable-vcdx \
               --enable-upnp \
               --enable-opus \
+              --enable-sftp \
               $extraconf
   make
 }