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

17 files changed, 368 insertions, 115 deletions

diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 4c8518ea3..ded81810d 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 179620 2013-03-08 20:34:20Z giovanni $
+# $Id: PKGBUILD 179753 2013-03-09 17:23:03Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
 pkgver=0.14.1
-pkgrel=2
+pkgrel=4
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gparted.sourceforge.net"
 license=('GPL')
-depends=('parted' 'gtkmm' 'hicolor-icon-theme')
+depends=('parted' 'gtkmm' 'hicolor-icon-theme' 'polkit-gnome')
 makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
 optdepends=('dosfstools: for FAT16 and FAT32 partitions'
             'jfsutils: for jfs partitions'
-            'ntfsprogs: for ntfs partitions'
+            'ntfs-3g: for ntfs partitions'
             'reiserfsprogs: for reiser partitions'
             'xfsprogs: for xfs partitions'
             'nilfs-utils: for nilfs2 support'
-            'polkit-gnome: to run gparted directly from menu'
             'gpart: for recovering corrupt partition tables'
-            'mtools')
+            'mtools: utilities to access MS-DOS disks')
 install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy')
 md5sums=('1ffe859c70e102a776dffb1ff0a2164a'
-         '27c264cfad8fa413d75954dda7a2dd50')
+         'c031d7d2b845ccb025b9f83e0ddd5653')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -42,6 +41,14 @@ package() {
   # Install policy file
   install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy"
 
+  # We need rename the original script
+  mv "${pkgdir}/usr/sbin/gparted" "${pkgdir}/usr/sbin/gparted.elf"
+
+  # Install launcher script
+  echo '#!/bin/sh' > ${pkgdir}/usr/sbin/gparted
+  echo 'pkexec "/usr/sbin/gparted.elf" "$@"' >> ${pkgdir}/usr/sbin/gparted
+  chmod 755 ${pkgdir}/usr/sbin/gparted
+
   # Modify desktop file
-  sed -i -e "s|^Exec=.*|Exec=pkexec --disable-internal-agent /usr/sbin/gparted|" "${pkgdir}/usr/share/applications/gparted.desktop"
+  sed -i -e "s|^Exec=.*|Exec=pkexec --disable-internal-agent /usr/sbin/gparted.elf|" "${pkgdir}/usr/share/applications/gparted.desktop"
 }
diff --git a/extra/gparted/gparted.install b/extra/gparted/gparted.install
index 21b79d2d4..e8f6bed8f 100644
--- a/extra/gparted/gparted.install
+++ b/extra/gparted/gparted.install
@@ -1,9 +1,12 @@
 post_install() {
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  echo 'If you use a lightweight windowmanager, remember to run'
+  echo '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 to enable'
+  echo 'graphical authentication, which may be needed for pkexec to work.'
 }
 
 post_upgrade() {
-  post_install $1
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_remove() {
diff --git a/extra/gparted/org.archlinux.pkexec.gparted.policy b/extra/gparted/org.archlinux.pkexec.gparted.policy
index 561cd7d1e..65894a0cc 100644
--- a/extra/gparted/org.archlinux.pkexec.gparted.policy
+++ b/extra/gparted/org.archlinux.pkexec.gparted.policy
@@ -12,7 +12,7 @@
       <allow_inactive>auth_admin</allow_inactive>
       <allow_active>auth_admin</allow_active>
     </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted.elf</annotate>
     <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
   </action>
 
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index a6bf59a3b..4bf3fb358 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179616 2013-03-08 19:33:49Z andyrtr $
+# $Id: PKGBUILD 179822 2013-03-09 21:04:13Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -21,7 +21,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.0.1.2
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -218,7 +218,6 @@ build() {
 		--with-system-mysql \
 		--without-fonts\
 		--without-afms\
-		--without-ppds\
 		--without-system-libwps\
 		--without-system-libcdr \
 		--without-system-mdds\
@@ -254,6 +253,8 @@ build() {
 		--with-system-clucene\
 		--without-system-servlet-api
 
+#		--without-ppds\
+
 #--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
 
 	touch src.downloaded
@@ -274,19 +275,18 @@ package_libreoffice-common() {
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' 'poppler>=0.20.5' 
+          'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=50.1" 'clucene' 'lcms2' "poppler>=0.20.5"
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') # 'orbit2')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
              'libcups:          adds printing support'
              'dbus-glib:        adds dbus support'
-             'nss:              adds support for signed files/macros'
              'pstoedit:         translates PostScript and PDF graphics into other vector formats'
              'libmythes:        for use in thesaurus'
              'beanshell:        interactive java -- good for prototyping /macros'
              'vigra:            C++ computer vision library, usable in Basebmp'
              'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
+             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
              'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
@@ -434,8 +434,7 @@ package_libreoffice-draw() {
 
 package_libreoffice-gnome() {
  pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gtk2' 'gtk3' 'gconf')
- optdepends=()
+ depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3
  backup=()
  groups=('libreoffice')
  
diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD
index dc71c6b8f..9f0e92d5f 100644
--- a/extra/libsecret/PKGBUILD
+++ b/extra/libsecret/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libsecret
-pkgver=0.12
-pkgrel=2
+pkgver=0.14
+pkgrel=1
 pkgdesc='library for storing and retrieving passwords and other secrets.'
 arch=('i686' 'x86_64' 'mips64el')
 license=('LGPL')
@@ -12,7 +12,7 @@ depends=('glib2' 'libgcrypt')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('323db75a5e73058d3eb95597d9f798fd715ec7d58f500be84628b8f9a0617c01')
+sha256sums=('58a5b9370c093a7a2788869ed59bc56351797a775e100a9644e637851f9713b5')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 7eaa19def..ea0060806 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179120 2013-03-03 20:01:04Z bpiotrowski $
+# $Id: PKGBUILD 179729 2013-03-09 15:29:21Z bpiotrowski $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
 pkgbase=mariadb
 pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
 pkgver=5.5.29
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
@@ -107,9 +107,10 @@ package_mariadb() {
   backup=('etc/mysql/my.cnf')
   install=mariadb.install
   depends=('mariadb-clients')
-  conflicts=('mysql')
-  provides=("mysql=$pkgver")
-  optdepends=('perl-dbi' 'perl-dbd-mysql')
+  conflicts=('mysql' 'mytop')
+  provides=("mysql=$pkgver" 'mytop')
+  optdepends=('perl-dbd-mysql: mytop dependency'
+              'perl-term-readkey: mytop dependency')
   options=('emptydirs')
 
   cd "$srcdir"/build
diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 105bee14d..1bef742f9 100644
--- a/extra/net-snmp/PKGBUILD
+++ b/extra/net-snmp/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 177956 2013-02-12 12:13:57Z thomas $
-# Maintainer: 
+# $Id: PKGBUILD 179640 2013-03-08 23:40:45Z foutrelis $
+# Maintainer:
 # Contributor: Dale Blount <dale@archlinux.org>
 
 pkgname=net-snmp
 pkgver=5.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.net-snmp.org/"
 license=('BSD')
 depends=('openssl' 'libnl' 'pciutils')
 makedepends=('python2-distribute')
-optdepends=('perl-term-readkey: for snmpcheck application' 
+optdepends=('perl-term-readkey: for snmpcheck application'
             'perl-tk: for snmpcheck and tkmib applications'
             'python2: for the python modules')
 provides=('ucd-snmp')
diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD
index 07894d957..615c7b6f1 100644
--- a/extra/networkmanager/PKGBUILD
+++ b/extra/networkmanager/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179568 2013-03-07 11:54:26Z foutrelis $
+# $Id: PKGBUILD 179641 2013-03-08 23:40:46Z foutrelis $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinxu.org>
 # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -9,7 +9,7 @@
 pkgname=networkmanager
 _pkgname=NetworkManager
 pkgver=0.9.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index 4f521c5a6..f2c70a45a 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179044 2013-03-01 21:25:10Z andrea $
+# $Id: PKGBUILD 179762 2013-03-09 17:47:45Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=phonon
 pkgver=4.6.0
-pkgrel=7
+pkgrel=8
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://phonon.kde.org/'
@@ -40,4 +40,11 @@ build() {
 package(){
   cd build
   make DESTDIR="${pkgdir}" install
+
+  # Install headers into the Qt4 dir
+  install -d "${pkgdir}"/usr/include/qt4
+  mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
+
+  sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
+    "${pkgdir}"/usr/lib/pkgconfig/phonon.pc
 }
diff --git a/extra/speech-dispatcher/PKGBUILD b/extra/speech-dispatcher/PKGBUILD
index b7c536a60..9eec7b513 100644
--- a/extra/speech-dispatcher/PKGBUILD
+++ b/extra/speech-dispatcher/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165252 2012-08-14 16:20:06Z andrea $
+# $Id: PKGBUILD 179645 2013-03-09 01:49:56Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Steve Holmes <steve.holmes88@gmail.com>
@@ -7,14 +7,14 @@
 # Contributor: Andreas Messer <andi@bupfen.de>
 
 pkgname=speech-dispatcher
-pkgver=0.7.1
-pkgrel=7.1
+pkgver=0.8
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 pkgdesc="High-level device independent layer for speech synthesis interface"
 url="http://www.freebsoft.org/speechd"
 license=('GPL2' 'FDL')
-depends=('glib2' 'python2' 'dotconf' 'texinfo' 'libpulse')
-makedepends=('pkgconfig' 'espeak')
+depends=('glib2' 'libltdl' 'python-xdg' 'dotconf' 'libpulse')
+makedepends=('intltool' 'espeak')
 optdepends=('festival: Speech output using Festival'
         'espeak: Speech output using ESpeak'
         'pulseaudio: PulseAudio support')
@@ -37,10 +37,9 @@ backup=(etc/speech-dispatcher/clients/gnome-speech.conf
 	etc/speech-dispatcher/speechd.conf)
 install="${pkgname}.install"
 source=("http://www.freebsoft.org/pub/projects/speechd/$pkgname-$pkgver.tar.gz"
-        'speechd.sh' 'speech-dispatcherd.service')
-md5sums=('ccfc30ac006673d36b4223eb760ed696'
-        '858293f464b83f03f3b6bb796291c71d'
-        'd26f52e2e95a30eaa83560f0e63faca5')
+        'speech-dispatcherd.service')
+md5sums=('d88691a64c676122f996230c107c392f'
+         'd26f52e2e95a30eaa83560f0e63faca5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -53,20 +52,8 @@ build() {
 
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 
-  install -Dm755 ${srcdir}/speechd.sh ${pkgdir}/etc/rc.d/speechd
-  install -d "${pkgdir}/usr/lib/systemd/system/"
-  install -m644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/"
-  install -d ${pkgdir}/var/log/speech-dispatcher
-
-  # Fix spd-conf to use python 2.7
-  sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' ${pkgdir}/usr/bin/spd-conf
-  sed -i -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/lib/python2.7/site-packages/speechd/_test.py
-  
-  rm -f ${pkgdir}/usr/share/info/dir
-  gzip -9nf ${pkgdir}/usr/share/info/*
-
-  # Remove conflicts with erlang (FS#21674)
-  rm -r ${pkgdir}/usr/bin/run_test
+  install -Dm644 "${srcdir}"/speech-dispatcherd.service "${pkgdir}/usr/lib/systemd/system/speech-dispatcherd.service"
+  install -d "${pkgdir}/var/log/speech-dispatcher"
 }
diff --git a/extra/speech-dispatcher/speech-dispatcher.install b/extra/speech-dispatcher/speech-dispatcher.install
index 93f4f9363..1565d3a31 100644
--- a/extra/speech-dispatcher/speech-dispatcher.install
+++ b/extra/speech-dispatcher/speech-dispatcher.install
@@ -1,10 +1,10 @@
 info_dir=usr/share/info
 info_files=('speech-dispatcher.info'
-    'speech-dispatcher-cs.info'
     'ssip.info'
     'spd-say.info')
 
 post_install() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
@@ -15,6 +15,7 @@ post_upgrade() {
 }
 
 pre_remove() {
+  [[ -x usr/bin/install-info ]] || return 0
   for f in ${info_files[@]}; do
     install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
diff --git a/extra/speech-dispatcher/speechd.sh b/extra/speech-dispatcher/speechd.sh
deleted file mode 100644
index eb44198cb..000000000
--- a/extra/speech-dispatcher/speechd.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/speech-dispatcher)
-case "$1" in
-  start)
-    stat_busy "Starting speech dispatcher Daemon"
-    [ -z "$PID" ] && /usr/bin/speech-dispatcher -d &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon speechd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping speech dispatcher Daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon speechd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-
-exit 0
diff --git a/extra/telepathy-qt/PKGBUILD b/extra/telepathy-qt/PKGBUILD
index 3b44e9c4f..d180d4143 100644
--- a/extra/telepathy-qt/PKGBUILD
+++ b/extra/telepathy-qt/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 179000 2013-03-01 10:26:12Z andrea $
+# $Id: PKGBUILD 179819 2013-03-09 18:32:21Z andrea $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-qt
 pkgver=0.9.3
-pkgrel=5
+pkgrel=6
 pkgdesc="A library for Qt-based Telepathy clients"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://telepathy.freedesktop.org/wiki/"
 license=('LGPL')
 options=('!libtool')
-depends=('qt4' 'telepathy-farstream' 'gstreamer0.10-base')
-makedepends=('libxslt' 'python2' 'cmake' 'doxygen')
+depends=('qt4')
+makedepends=('libxslt' 'python2' 'cmake' 'doxygen' 'telepathy-glib')
 conflicts=('telepathy-qt4')
 replaces=('telepathy-qt4')
 provides=('telepathy-qt4')
@@ -20,8 +20,6 @@ md5sums=('94ac93aedf5f6fff49837bc8368e5a37'
          'e1b851b08b159fca39596ff8395ca53a')
 
 build() {
-    . /etc/profile.d/qt4.sh
-
     mkdir build
     cd build
     cmake ../${pkgname}-${pkgver} \
diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD
index eb009e1ab..a224483cc 100644
--- a/extra/wireshark/PKGBUILD
+++ b/extra/wireshark/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176946 2013-02-02 21:34:52Z guillaume $
+# $Id: PKGBUILD 179713 2013-03-09 12:31:30Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
 pkgname=('wireshark-cli' 'wireshark-gtk')
 pkgbase=wireshark
-pkgver=1.8.5
+pkgver=1.8.6
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -14,13 +14,14 @@ options=(!libtool)
 source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
         01_patch-automake-1.13.diff
         02_enable-version.diff)
-sha256sums=('d4e4798216974a3c45e74b03644ee33b64481d2fe5c788c002266e5f141ee372'
+sha256sums=('2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea'
             '388a9cf4c924c32a0f7ee8ffeaae060cdbf0c712bcc0032d5dfaa5717b217b80'
             'dd71a9fc3443b5e586d9e50c31208d031f20d7b96cf72d9e4e0f02f2f175d00b')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
+# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8202
   patch -p0 < ${srcdir}/01_patch-automake-1.13.diff
   patch -p0 < ${srcdir}/02_enable-version.diff
 
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 0d4f6c233..014c31dbe 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 178143 2013-02-16 22:49:01Z ioni $
+# $Id: PKGBUILD 179685 2013-03-09 11:09:53Z foutrelis $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xine-lib
 pkgver=1.2.2
-pkgrel=6
+pkgrel=7
 pkgdesc="A multimedia playback engine"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xine-project.org"
 license=('LGPL' 'GPL')
 depends=('libxvmc' 'ffmpeg' 'libxinerama')
 makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'libmodplug'
-             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad' 
+             'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad'
              'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs')
-[ "$CARCH" = "mips64el" ] || makedepends+=('glu' 'libvdpau')
+[ "$CARCH" = "mips64el" ] || makedepends+=('mesa' 'glu' 'libvdpau')
 optdepends=('imagemagick: for using the imagemagick plugin' \
             'jack: for using the jack plugin' \
             'vcdimager: for using the vcd plugin')
@@ -32,15 +32,24 @@ optdepends+=('wavpack: for using the wavpack plugin' \
 [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz
+        xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
 	0001-fix-non-x86-build.patch)
 sha1sums=('a349cbb0b72256bb262377796a022dcf63829b4c'
+          '45500eca2aa40c133e1a6e8b23dbadc4b921b11f'
 	  '5f1a34c7bafa7ea96c0e4e14fbf6e31e53fe41e0')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # Fix audio decoding with newest FFmpeg
+  # https://bugs.archlinux.org/task/33818
+  patch -Np1 -i "$srcdir/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch"
+
   patch -Np1 -i ${srcdir}/0001-fix-non-x86-build.patch
+
   [ "$CARCH" = "mips64el" ] || extraconf=--enable-vdpau
-  ./configure --prefix=/usr --with-wavpack --disable-optimizations $extraconf
+
+  ./configure --prefix=/usr --with-wavpack --disable-optimizations $extra
   make
 }
 
diff --git a/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
new file mode 100644
index 000000000..255f56d0d
--- /dev/null
+++ b/extra/xine-lib/xine-lib-1.2.2-ffmpeg_audio_decoder-support-new-av_decode_audio4.patch
@@ -0,0 +1,277 @@
+From 679582503c8ba2f91a82e44c4a2938550306fd07 Mon Sep 17 00:00:00 2001
+From: Torsten Jager <t.jager@gmx.de>
+Date: Thu, 21 Feb 2013 22:35:00 +0200
+Subject: [PATCH 3/5] ffmpeg_audio_decoder: support new av_decode_audio4 ()
+
+---
+ src/combined/ffmpeg/ff_audio_decoder.c | 153 +++++++++++++++++++++++++++------
+ src/combined/ffmpeg/ffmpeg_compat.h    |   4 +-
+ 2 files changed, 131 insertions(+), 26 deletions(-)
+
+diff --git a/src/combined/ffmpeg/ff_audio_decoder.c b/src/combined/ffmpeg/ff_audio_decoder.c
+index 4e64378..34a7a9e 100644
+--- a/src/combined/ffmpeg/ff_audio_decoder.c
++++ b/src/combined/ffmpeg/ff_audio_decoder.c
+@@ -71,7 +71,9 @@ typedef struct ff_audio_decoder_s {
+   int               decoder_ok;
+ 
+   AVCodecParserContext *parser_context;
+-
++#if AVAUDIO > 3
++  AVFrame          *av_frame;
++#endif
+ } ff_audio_decoder_t;
+ 
+ 
+@@ -150,6 +152,9 @@ static void ff_audio_init_codec(ff_audio_decoder_t *this, unsigned int codec_typ
+     return;
+   }
+ 
++  /* Try to make the following true */
++  this->context->request_sample_fmt = AV_SAMPLE_FMT_S16;
++
+   /* Current ffmpeg audio decoders usually use 16 bits/sample
+    * buf->decoder_info[2] can't be used as it doesn't refer to the output
+    * bits/sample for some codecs (e.g. MS ADPCM) */
+@@ -358,25 +363,19 @@ static void ff_audio_output_close(ff_audio_decoder_t *this)
+   this->audio_channels = 0;
+ }
+ 
+-static int ff_audio_decode(xine_t *xine,
+-                           AVCodecContext *ctx,
+-                           AVCodecParserContext *parser_ctx,
+-                           int16_t *decode_buffer, int *decode_buffer_size,
+-                           uint8_t *buf, int size)
+-{
++static int ff_audio_decode (ff_audio_decoder_t *this,
++  int16_t *decode_buffer, int *decode_buffer_size, uint8_t *buf, int size) {
+   int consumed;
+   int parser_consumed = 0;
+ 
+ #if AVPARSE > 1
+-  if (parser_ctx) {
++  if (this->parser_context) {
+     uint8_t *outbuf;
+     int      outsize;
+ 
+     do {
+-      int ret = av_parser_parse2(parser_ctx, ctx,
+-                                 &outbuf, &outsize,
+-                                 buf, size,
+-                                 0, 0, 0); 
++      int ret = av_parser_parse2 (this->parser_context, this->context,
++        &outbuf, &outsize, buf, size, 0, 0, 0);
+       parser_consumed += ret;
+       buf             += ret;
+       size            -= ret;
+@@ -385,7 +384,7 @@ static int ff_audio_decode(xine_t *xine,
+     /* nothing to decode ? */
+     if (outsize <= 0) {
+       *decode_buffer_size = 0;
+-      xprintf (xine, XINE_VERBOSITY_DEBUG,
++      xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+                "ffmpeg_audio_dec: not enough data to decode\n");
+       return parser_consumed;
+     }
+@@ -402,21 +401,115 @@ static int ff_audio_decode(xine_t *xine,
+   avpkt.data = buf;
+   avpkt.size = size;
+   avpkt.flags = AV_PKT_FLAG_KEY;
+-  consumed = avcodec_decode_audio3 (ctx,
+-                                    decode_buffer, decode_buffer_size,
+-                                    &avpkt);
++#  if AVAUDIO > 3
++  int got_frame;
++  if (!this->av_frame)
++    this->av_frame = avcodec_alloc_frame ();
++
++  consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
++  if ((consumed >= 0) && got_frame) {
++    int16_t *q = decode_buffer;
++    int samples = this->av_frame->nb_samples;
++    int channels = this->context->channels;
++    int bytes, i, j;
++    /* limit buffer */
++    if (channels > 12)
++      channels = 12;
++    if (*decode_buffer_size < samples * channels * 2)
++      samples = *decode_buffer_size / (channels * 2);
++    bytes = samples * channels * 2;
++    *decode_buffer_size = bytes;
++    /* convert to packed int16_t. I guess there is something
++       in libavfilter but also another dependency... */
++    switch (this->context->sample_fmt) {
++      case AV_SAMPLE_FMT_U8P:
++        if (channels > 1) {
++          uint8_t *p[12];
++          for (i = 0; i < channels; i++)
++            p[i] = (uint8_t *)this->av_frame->extended_data[i];
++          for (i = samples; i; i--) {
++            for (j = 0; j < channels; j++)
++              *q++ = ((uint16_t)(*p[j]++) << 8) ^ 0x8000;
++          }
++          break;
++        }
++      case AV_SAMPLE_FMT_U8:
++        {
++          uint8_t *p = (uint8_t *)this->av_frame->extended_data[0];
++          for (i = samples * channels; i; i--)
++            *q++ = ((uint16_t)(*p++) << 8) ^ 0x8000;
++        }
++      break;
++      case AV_SAMPLE_FMT_S16P:
++        if (channels > 1) {
++          int16_t *p[12];
++          for (i = 0; i < channels; i++)
++            p[i] = (int16_t *)this->av_frame->extended_data[i];
++          for (i = samples; i; i--) {
++            for (j = 0; j < channels; j++)
++              *q++ = *p[j]++;
++          }
++          break;
++        }
++      case AV_SAMPLE_FMT_S16:
++        xine_fast_memcpy (q, this->av_frame->extended_data[0], bytes);
++      break;
++      case AV_SAMPLE_FMT_S32P:
++        if (channels > 1) {
++          int32_t *p[12];
++          for (i = 0; i < channels; i++)
++            p[i] = (int32_t *)this->av_frame->extended_data[i];
++          for (i = samples; i; i--) {
++            for (j = 0; j < channels; j++)
++              *q++ = *p[j]++ >> 16;
++          }
++          break;
++        }
++      case AV_SAMPLE_FMT_S32:
++        {
++          int32_t *p = (int32_t *)this->av_frame->extended_data[0];
++          for (i = samples * channels; i; i--)
++            *q++ = *p++ >> 16;
++        }
++      break;
++      case AV_SAMPLE_FMT_FLTP: /* the most popular one */
++        if (channels > 1) {
++          float *p[12];
++          for (i = 0; i < channels; i++)
++            p[i] = (float *)this->av_frame->extended_data[i];
++          for (i = samples; i; i--) {
++            for (j = 0; j < channels; j++) {
++              int v = *p[j]++ * (float)0x7fff;
++              *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v;
++            }
++          }
++          break;
++        }
++      case AV_SAMPLE_FMT_FLT:
++        {
++          float *p = (float *)this->av_frame->extended_data[0];
++          for (i = samples * channels; i; i--) {
++            int v = *p++ * (float)0x7fff;
++            *q++ = (v + 0x8000) & ~0xffff ? (v >> 31) ^ 0x7fff : v;
++          }
++        }
++      break;
++      default: ;
++    }
++  } else *decode_buffer_size = 0;
++#  else
++  consumed = avcodec_decode_audio3 (this->context, decode_buffer, decode_buffer_size, &avpkt);
++#  endif
+ #else
+-  consumed = avcodec_decode_audio2 (ctx,
+-                                    decode_buffer, decode_buffer_size,
+-                                    buf, size);
++  consumed = avcodec_decode_audio2 (this->context, decode_buffer, decode_buffer_size, buf, size);
+ #endif
+ 
+   if (consumed < 0) {
+-    xprintf (xine, XINE_VERBOSITY_DEBUG,
++    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+              "ffmpeg_audio_dec: error decompressing audio frame (%d)\n", consumed);
+   } else if (parser_consumed && consumed != size) {
+ 
+-    xprintf (xine, XINE_VERBOSITY_DEBUG,
++    xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+              "ffmpeg_audio_dec: decoder didn't consume all data\n");
+   }
+ 
+@@ -469,8 +562,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
+         decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+ 
+ 	bytes_consumed =
+-          ff_audio_decode(this->stream->xine, this->context,
+-                          this->parser_context,
++          ff_audio_decode(this,
+                           (int16_t *)this->decode_buffer, &decode_buffer_size,
+                           &this->buf[offset], this->size);
+ 
+@@ -539,6 +631,7 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
+           }
+ 
+           /* fill up this buffer */
++#if AVAUDIO < 4
+           if (codec_type == BUF_AUDIO_WMAPRO) {
+             /* the above codecs output float samples, not 16-bit integers */
+             int bytes_per_sample = sizeof(float);
+@@ -558,7 +651,9 @@ static void ff_audio_decode_data (audio_decoder_t *this_gen, buf_element_t *buf)
+             bytes_to_send = bytes_to_send * 2 / bytes_per_sample;
+             xine_fast_memcpy(audio_buffer->mem, int_buffer, bytes_to_send);
+             free(int_buffer);
+-          } else {
++          } else
++#endif
++          {
+             if ((decode_buffer_size - out) > audio_buffer->mem_size)
+               bytes_to_send = audio_buffer->mem_size;
+             else
+@@ -595,6 +690,9 @@ static void ff_audio_reset (audio_decoder_t *this_gen) {
+ 
+   /* try to reset the wma decoder */
+   if( this->decoder_ok ) {
++#if AVAUDIO > 3
++    avcodec_free_frame (&this->av_frame);
++#endif
+     pthread_mutex_lock (&ffmpeg_lock);
+     avcodec_close (this->context);
+     if (avcodec_open (this->context, this->codec) < 0)
+@@ -626,6 +724,9 @@ static void ff_audio_dispose (audio_decoder_t *this_gen) {
+   }
+ 
+   if( this->context && this->decoder_ok ) {
++#if AVAUDIO > 3
++    avcodec_free_frame (&this->av_frame);
++#endif
+     pthread_mutex_lock (&ffmpeg_lock);
+     avcodec_close (this->context);
+     pthread_mutex_unlock (&ffmpeg_lock);
+@@ -668,7 +769,9 @@ static audio_decoder_t *ff_audio_open_plugin (audio_decoder_class_t *class_gen,
+ 
+   this->context = avcodec_alloc_context();
+   this->decode_buffer = malloc16 (AVCODEC_MAX_AUDIO_FRAME_SIZE);
+-
++#if AVAUDIO > 3
++  this->av_frame = NULL;
++#endif
+   return &this->audio_decoder;
+ }
+ 
+diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
+index 0acead8..b567dc1 100644
+--- a/src/combined/ffmpeg/ffmpeg_compat.h
++++ b/src/combined/ffmpeg/ffmpeg_compat.h
+@@ -94,7 +94,9 @@
+ #endif
+ 
+ /* avcodec_decode_audio() */
+-#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
++#if LIBAVCODEC_VERSION_MAJOR >= 54
++#  define AVAUDIO 4
++#elif LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
+ #  define AVAUDIO 3
+ #else
+ #  define AVAUDIO 2
+-- 
+1.8.1.5
+
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 6a3af4d42..131e05bd5 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 178463 2013-02-23 11:12:22Z andyrtr $
+# $Id: PKGBUILD 179653 2013-03-09 07:55:34Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.2.901
+pkgver=1.13.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 url="http://xorg.freedesktop.org"
-makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
+makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto'
              'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess'
              'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros'
-             'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt')
+             'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') 
 options=('!libtool')
 source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         autoconfig-nvidia.patch
@@ -23,7 +23,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         10-quirks.conf
         loongson.patch
         use-pixman-glyph-cache.patch)
-sha256sums=('5351e2d18949f22c92350ffa037cfc49d3ac09f2ac4d3be6a3ea566d2052723c'
+sha256sums=('c9e38eb6404749cab9e3c4a4901d951d4d62958b11f002ce968225ef92902762'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'