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

Conflicts:
	community/luajit/PKGBUILD
	extra/speech-dispatcher/PKGBUILD
	extra/xine-lib/PKGBUILD
	libre/cups-filters-libre/PKGBUILD
	libre/file-roller-libre/PKGBUILD

16 files changed, 124 insertions, 42 deletions

diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index ce4c8d209..9f6dd5dab 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 85558 2013-03-03 05:39:31Z bgyorgy $
+# $Id: PKGBUILD 85928 2013-03-09 00:52:51Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.7.1
-pkgrel=4
+pkgver=1.7.2
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
@@ -28,7 +28,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/
         "gnome-autogen.sh"
         "keyboard_applet.patch"
         "fix-control-center-check.patch")
-md5sums=('13daa8fde1480bbee25eddc2e2630319'
+md5sums=('d136978607d2584ea1ca29db436f96df'
          'a925691c9b57a6a884dcf07da057fd1f'
          '2b1ece84416c3e4de030be15f1774d82'
          'fd429779aa986ffb3f481149f19a0baf')
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index 34d54730a..995b7e1ab 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 79120 2012-10-30 23:06:26Z heftig $
+# $Id: PKGBUILD 85932 2013-03-09 04:07:22Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 
 pkgname=gnome-packagekit
-pkgver=3.6.0
+pkgver=3.6.2
 pkgrel=1
 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('polkit-gnome: required for privileged actions'
 options=('!emptydirs' '!libtool')
 install="$pkgname.install"
 source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('9f096ec72fb81a78c426d9747145405a8b99e1d8418978828796768c8532d676')
+sha256sums=('2db1069324cb85d8704bd1ffbbea3c29d57ba7b0d710f45f6563fd963517ef40')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/hostapd/PKGBUILD b/community/hostapd/PKGBUILD
index b4b131f04..5c00b8aac 100644
--- a/community/hostapd/PKGBUILD
+++ b/community/hostapd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84159 2013-02-12 12:14:09Z thomas $
+# $Id: PKGBUILD 85915 2013-03-08 23:40:40Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=hostapd
 pkgver=2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://w1.fi/hostapd/"
diff --git a/community/knemo/PKGBUILD b/community/knemo/PKGBUILD
index 0f5a49602..4cd33a88f 100644
--- a/community/knemo/PKGBUILD
+++ b/community/knemo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84160 2013-02-12 12:14:10Z thomas $
+# $Id: PKGBUILD 85916 2013-03-08 23:40:41Z foutrelis $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=knemo
 pkgver=0.7.6
-pkgrel=2
+pkgrel=3
 pkgdesc="The KDE Network Monitor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.kde-apps.org/content/show.php?content=12956"
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 7884fb418..0f002a8d5 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85657 2013-03-04 13:08:37Z spupykin $
+# $Id: PKGBUILD 85917 2013-03-08 23:40:42Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
 pkgver=1.0.3
-pkgrel=2rc2
+pkgrel=3rc2
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -12,7 +12,7 @@ license=('LGPL')
 depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2'
 	 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap'
 	 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs'
-	 'iproute2' 'libnl' 'libx11' 'audit' '')
+	 'iproute2' 'libnl' 'libx11' 'audit')
 makedepends=('pkgconfig' 'lvm2' 'linux-api-headers')
 optdepends=('bridge-utils: for briged networking (default)'
 	    'dnsmasq: for NAT/DHCP for guests'
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index 9b0fbd0f9..708c4736e 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84574 2013-02-20 04:52:41Z bpiotrowski $
+# $Id: PKGBUILD 85940 2013-03-09 14:50:34Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Chris Brannon <chris@the-brannons.com>
 # Contributor: Paulo Matias <matiasΘarchlinux-br·org>
@@ -6,20 +6,23 @@
 
 pkgname=luajit
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://luajit.org/'
 license=('MIT')
 depends=('gcc-libs') 
-source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz)
-sha256sums=('2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0')
+source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz
+        http://luajit.org/download/v2.0.1_hotfix1.patch)
+sha256sums=('2371cceb53453d8a7b36451e6a0ccdb66236924545d6042ddd4c34e9668990c0'
+            '143898de3fe84455684fddb92947d36c1a51c6a6e3884813fe5e025bd4652368')
 
 build() { 
   cd $srcdir/LuaJIT-$pkgver
 
   [ "$CARCH" = "mips64el" ] && extra="XCFLAGS=-DLUAJIT_DISABLE_JIT"
 
+  patch -Np1 -i $srcdir//v2.0.1_hotfix1.patch
   make amalg PREFIX=/usr $extra
 }
 
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index 7a58eb6a8..e77f3c76d 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84756 2013-02-24 11:50:35Z faidoc $
+# $Id: PKGBUILD 85924 2013-03-09 00:51:47Z faidoc $
 # Contributor: Adam Hani Schakaki <adam@schakaki.net>
 # Contributor: Ner0
 
 pkgname=muffin
-pkgver=1.7.1
+pkgver=1.7.2
 pkgrel=1
 pkgdesc="Cinnamon window manager based on Mutter"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=('muffin-wm')
 options=('!libtool' '!emptydirs')
 install=$pkgname.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver")
-md5sums=('688ac16937bcaa286566d47764bf33a7')
+md5sums=('c39cd212959c7de8f834abe9e3fee8da')
 
 build() {
   cd linuxmint-muffin-*
diff --git a/community/netcf/PKGBUILD b/community/netcf/PKGBUILD
index ae4605000..f15ac8178 100644
--- a/community/netcf/PKGBUILD
+++ b/community/netcf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84162 2013-02-12 12:14:12Z thomas $
+# $Id: PKGBUILD 85918 2013-03-08 23:40:43Z foutrelis $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Aurélien Wailly <aurelien.wailly@gmail.com>
 
 pkgname=netcf
 pkgver=0.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A library for configuring network interfaces"
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index d1e27f150..cc67d65d8 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84163 2013-02-12 12:14:14Z thomas $
+# $Id: PKGBUILD 85919 2013-03-08 23:40:44Z foutrelis $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Xilon <xilonmu@gmail.com>
 
 pkgname=powertop
 pkgver=2.2
-pkgrel=2
+pkgrel=3
 pkgdesc='A tool to diagnose issues with power consumption and power management'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://01.org/powertop/'
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index 7a4bf4878..f7ba1d50d 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85401 2013-03-01 10:39:04Z andrea $
+# $Id: PKGBUILD 85927 2013-03-09 00:52:24Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,9 +7,9 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname=qtcreator
-pkgver=2.6.2
-_pkgver=2.6.2
-pkgrel=2
+pkgver=2.7.0rc
+_pkgver=2.7.0-rc
+pkgrel=1
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt-project.org'
@@ -29,7 +29,7 @@ install=qtcreator.install
 source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
         'qtcreator.desktop'
         'fix-build.patch')
-md5sums=('4700deb89e8cf92239015d7d70f0dcdd'
+md5sums=('5c4baef738b00cfdf53739ffd1434234'
          '82888d4be900e7833d768050a135cd37'
          '4087c00d853addf97ca329d304e9a0a5')
 
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index b976cc754..d1f865183 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 84732 2013-02-23 20:56:41Z seblu $
+# $Id: PKGBUILD 85920 2013-03-08 23:40:45Z foutrelis $
 # Maintainer: Sébastien Luttringer
 
 pkgname=quagga
 pkgver=0.99.22
-pkgrel=1
+pkgrel=2
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.quagga.net'
 license=('GPL2')
-depends=('libcap' 'net-snmp' 'readline' 'ncurses')
+depends=('libcap' 'libnl' 'net-snmp' 'readline' 'ncurses')
 options=('!libtool' '!buildflags')
 install=quagga.install
 source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 29387d510..3db52df43 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84689 2013-02-22 09:36:08Z svenstaro $
+# $Id: PKGBUILD 85914 2013-03-08 23:19:52Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Arkham <arkham at archlinux dot us>
 # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
 
 pkgname=spring
-pkgver=0.92.0
-_pkgver=92.0
+pkgver=0.93.0
+_pkgver=93.0
 pkgrel=1
 pkgdesc='A free 3D real-time-strategy (RTS) game engine'
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ optdepends=('python2: python-based bots'
             'java-runtime: java-based bots')
 install=spring.install
 source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
-md5sums=('6dcf665cfe7d6eaf0e287086685c6709')
+md5sums=('770b2f1aefddb9752d3a5bb70ba76cca')
 
 build() {
   bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
@@ -27,7 +27,8 @@ build() {
 
   cmake	. \
     -DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES
+	-DDATADIR=share/spring \
+    -DCMAKE_SKIP_RPATH=YES
   make
 }
 
diff --git a/community/xvba-video-open/PKGBUILD b/community/xvba-video-open/PKGBUILD
index b676215f2..22ea8ca2b 100644
--- a/community/xvba-video-open/PKGBUILD
+++ b/community/xvba-video-open/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77096 2012-10-04 19:43:11Z lcarlier $
+# $Id: PKGBUILD 85947 2013-03-09 21:11:01Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Jesse Jaara <gmail.com: jesse.jaara>
 
 pkgname=xvba-video-open
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="OSS version of xvba-video lib to enable hw video acceleration on AMD's HD series of GFX cards"
 arch=('i686' 'x86_64')
 url="http://www.splitted-desktop.com/~gbeauchesne/xvba-video/"
@@ -13,13 +13,24 @@ depends=('catalyst-utils' 'libva')
 makedepends=('mesa')
 options=(!libtool)
 source=(ftp://ftp.archlinux.org/other/community/xvba-video-open/xvba-video-${pkgver}.tar.gz
-        http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz)
+        http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
+        xvba-video-h264-level51.patch
+        xvba-video-0.8.0-glx-fix.patch
+        fix-build-with-glext.h-version-85.patch)
 md5sums=('d9ddec2e7f02c1fa533773918e88e311'
-         'b8f56bc55aa70cb19dd12857fdc184cc')
+         'b8f56bc55aa70cb19dd12857fdc184cc'
+         'bce1de0a8b274049568453a53e8fce6a'
+         '5dc283eab46418eeef8e8be7c028a2ba')
 
 build() {
   cd "${srcdir}/xvba-video-${pkgver}"
 
+  # patch from opensuse (thanks vi0l0!)
+  patch -Np1 -i ../xvba-video-h264-level51.patch
+  patch -Np1 -i ../xvba-video-0.8.0-glx-fix.patch
+  
+  patch -Np1 -i ../fix-build-with-glext.h-version-85.patch
+
   export CPPFLAGS="${CPPFLAGS} -I${srcdir}/include"
   
   ./configure --disable-debug --enable-libxvba-dlopen --prefix=/usr
@@ -31,3 +42,8 @@ package() {
 
   make DESTDIR="${pkgdir}" install
 }
+md5sums=('d9ddec2e7f02c1fa533773918e88e311'
+         'b8f56bc55aa70cb19dd12857fdc184cc'
+         'bce1de0a8b274049568453a53e8fce6a'
+         '5dc283eab46418eeef8e8be7c028a2ba'
+         '69e8a9027affbaf7066e35bc97b3a984')
diff --git a/community/xvba-video-open/fix-build-with-glext.h-version-85.patch b/community/xvba-video-open/fix-build-with-glext.h-version-85.patch
new file mode 100644
index 000000000..f3cabce50
--- /dev/null
+++ b/community/xvba-video-open/fix-build-with-glext.h-version-85.patch
@@ -0,0 +1,17 @@
+diff -ru xvba-video-0.8.0/src/utils_glx.h xvba-video-0.8.0.patched/src/utils_glx.h
+--- xvba-video-0.8.0/src/utils_glx.h	2011-06-14 13:07:13.000000000 +0200
++++ xvba-video-0.8.0.patched/src/utils_glx.h	2013-02-17 10:53:34.589818821 +0100
+@@ -25,6 +25,13 @@
+ #include <GL/glext.h>
+ #include <GL/glx.h>
+ 
++#if GL_GLEXT_VERSION >= 85
++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
++   block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
++   Redefine the type here as an interim solution */
++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
++#endif
++
+ #ifndef GL_FRAMEBUFFER_BINDING
+ #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
+ #endif
diff --git a/community/xvba-video-open/xvba-video-0.8.0-glx-fix.patch b/community/xvba-video-open/xvba-video-0.8.0-glx-fix.patch
new file mode 100644
index 000000000..7cb249a16
--- /dev/null
+++ b/community/xvba-video-open/xvba-video-0.8.0-glx-fix.patch
@@ -0,0 +1,12 @@
+diff -ur xvba-video-0.8.0/src/xvba_image.c xvba-video-0.8.0-patched/src/xvba_image.c
+--- xvba-video-0.8.0/src/xvba_image.c	2011-06-14 13:07:13.000000000 +0200
++++ xvba-video-0.8.0-patched/src/xvba_image.c	2012-07-22 14:55:14.186667413 +0200
+@@ -423,7 +423,7 @@
+ }
+ 
+ #if USE_GLX
+-const HWImageHooks hw_image_hooks_glx attribute_hidden;
++extern const HWImageHooks hw_image_hooks_glx attribute_hidden;
+ #endif
+ 
+ // Commit image to the HW
diff --git a/community/xvba-video-open/xvba-video-h264-level51.patch b/community/xvba-video-open/xvba-video-h264-level51.patch
new file mode 100644
index 000000000..a617a90ab
--- /dev/null
+++ b/community/xvba-video-open/xvba-video-h264-level51.patch
@@ -0,0 +1,33 @@
+diff -rup xvba-video.orig/src/xvba_buffer.c xvba-video/src/xvba_buffer.c
+--- xvba-video.orig/src/xvba_buffer.c	2011-09-08 03:17:28.000000000 +0200
++++ xvba-video/src/xvba_buffer.c	2012-07-03 21:38:04.851465348 +0200
+@@ -368,23 +368,18 @@ translate_VAPictureParameterBufferH264(
+         obj_context->picture_height
+     );
+ 
+-    /* Check for H.264 content over HP@L4.1 */
++    /* Check for wrongly coded H264 Level 41
++       adjust profile to Level 51 when reframes are too many
++    */
+     unsigned int num_ref_frames = pic_param->num_ref_frames;
+-    if (profile == XVBA_H264_HIGH && level > 41) {
+-        if (!driver_data->warn_h264_over_hp_l41) {
+-            driver_data->warn_h264_over_hp_l41 = 1;
+-            xvba_information_message(
+-                "driver does not support H.264 content over HP@L4.1. "
+-                "Please upgrade.\n"
+-            );
+-        }
++    if (profile == XVBA_H264_HIGH && level == 41) {
+ 
+-        /* Use fail-safe values (lower ref frames) */
++        /* Increase Level to decode pseudo Level 41 as Level 51 */
+         const unsigned int mbw = pic_param->picture_width_in_mbs_minus1 + 1;
+         const unsigned int mbh = (obj_context->picture_height + 15) / 16;
+         const unsigned int max_ref_frames = 12288 * 1024 / (mbw * mbh * 384);
+         if (max_ref_frames < num_ref_frames)
+-            num_ref_frames = max_ref_frames;
++            level = 51;
+     }
+ 
+     XVBABufferDescriptor * const xvba_buffer = obj_surface->pic_desc_buffer;