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

Conflicts:
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/geda-gaf/PKGBUILD
	community/mplayer2/PKGBUILD
	community/parcellite/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	core/kbd/PKGBUILD
	core/systemd/PKGBUILD
	extra/calligra/PKGBUILD
	extra/dmapi/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/libcdio/PKGBUILD
	extra/libtorrent-rasterbar/PKGBUILD
	extra/llvm/PKGBUILD
	extra/nx/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/php-xcache/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/vcdimager/PKGBUILD
	extra/w3m/PKGBUILD
	extra/xorg-bdftopcf/PKGBUILD
	extra/xorg-xcalc/PKGBUILD
	extra/xorg-xconsole/PKGBUILD
	extra/xorg-xedit/PKGBUILD
	extra/xorg-xmag/PKGBUILD
	extra/xorg-xmessage/PKGBUILD
	extra/xorg-xvidtune/PKGBUILD
	libre/unzip-libre/PKGBUILD
	social/opentracker/PKGBUILD

2 files changed, 60 insertions, 7 deletions

diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
index 5a1236e10..018c8470a 100644
--- a/community/mplayer2/PKGBUILD
+++ b/community/mplayer2/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 81010 2012-12-09 18:03:32Z bpiotrowski $
+# $Id: PKGBUILD 82332 2013-01-15 11:35:04Z allan $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Martin Panter <vadmium+aur@gmail.com>
 # Contributor: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=mplayer2
 pkgver=20121128
-pkgrel=1
+pkgrel=2
 pkgdesc='Advanced general-purpose media player. A fork of the original MPlayer project'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.mplayer2.org/"
 install=$pkgname.install
 depends=('a52dec' 'aalib' 'cdparanoia' 'desktop-file-utils' 'enca' 'faad2' 'ffmpeg' 'fontconfig'
-         'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio' 'libdca' 'libdvdcss'
+         'freetype2' 'jack' 'ladspa' 'lame' 'libass' 'libbluray' 'libcaca' 'libcdio-paranoia' 'libdca' 'libdvdcss'
          'libdvdnav' 'libdvdread' 'libjpeg' 'libmad' 'libpulse' 'libquvi' 'libtheora'
          'libxinerama' 'libxss' 'libxv' 'libxxf86dga' 'libxxf86vm' 'mpg123' 'ncurses' 'sdl' 'ttf-dejavu')
 if [ "$CARCH" != "mips64el" ]; then
 depends+=('libgl' 'libvdpau' 'lirc-utils')
 fi
-makedepends=('mesa' 'unzip' 'python' 'python-docutils')
-[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
+makedepends=('mesa' 'unzip' 'yasm' 'python' 'python-docutils')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 provides=('mplayer')
 conflicts=('mplayer')
 options=(!emptydirs)
-source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('696adb2503b2202fe39de6c98b573cd6')
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz
+        cdio-api-fixes.patch)
+md5sums=('696adb2503b2202fe39de6c98b573cd6'
+         '5ff5fa9d0fd50239ed3a1756b31e6a9d')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -35,6 +36,8 @@ build() {
 
   [ "$CARCH" != "mips64el" ] && extra="--enable-runtime-cpudetection"
 
+  patch -Np1 -i $srcdir/cdio-api-fixes.patch
+
   ./configure --prefix=/usr --confdir=/etc/mplayer \
               --enable-translation --language=all \
               --enable-joystick \
diff --git a/community/mplayer2/cdio-api-fixes.patch b/community/mplayer2/cdio-api-fixes.patch
new file mode 100644
index 000000000..eeb9f0589
--- /dev/null
+++ b/community/mplayer2/cdio-api-fixes.patch
@@ -0,0 +1,50 @@
+diff -upr mplayer2-20121128.orig/stream/stream_cdda.c mplayer2-20121128/stream/stream_cdda.c
+--- mplayer2-20121128.orig/stream/stream_cdda.c	2013-01-10 19:37:31.000000000 +0200
++++ mplayer2-20121128/stream/stream_cdda.c	2013-01-10 20:23:25.000000000 +0200
+@@ -17,8 +17,8 @@
+  */
+ 
+ #include "config.h"
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #include <cdio/cdio.h>
+ 
+ #include <stdio.h>
+@@ -116,25 +116,25 @@ const m_option_t cdda_opts[] = {
+ };
+ 
+ static const char *cdtext_name[] = {
+-    [CDTEXT_ARRANGER] = "Arranger",
+-    [CDTEXT_COMPOSER] = "Composer",
+-    [CDTEXT_MESSAGE]  =  "Message",
+-    [CDTEXT_ISRC] =  "ISRC",
+-    [CDTEXT_PERFORMER] = "Performer",
+-    [CDTEXT_SONGWRITER] =  "Songwriter",
+-    [CDTEXT_TITLE] =  "Title",
+-    [CDTEXT_UPC_EAN] = "UPC_EAN",
++    [CDTEXT_FIELD_ARRANGER] = "Arranger",
++    [CDTEXT_FIELD_COMPOSER] = "Composer",
++    [CDTEXT_FIELD_MESSAGE]  =  "Message",
++    [CDTEXT_FIELD_ISRC] =  "ISRC",
++    [CDTEXT_FIELD_PERFORMER] = "Performer",
++    [CDTEXT_FIELD_SONGWRITER] =  "Songwriter",
++    [CDTEXT_FIELD_TITLE] =  "Title",
++    [CDTEXT_FIELD_UPC_EAN] = "UPC_EAN",
+ };
+ 
+ static bool print_cdtext(stream_t *s, int track)
+ {
+     cdda_priv* p = (cdda_priv*)s->priv;
+-    cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio, track);
++    cdtext_t *text = cdio_get_cdtext(p->cd->p_cdio);
+     if (text) {
+         mp_msg(MSGT_SEEK, MSGL_INFO, "CD-Text (%s):\n", track ? "track" : "CD");
+         for (int i = 0; i < sizeof(cdtext_name) / sizeof(cdtext_name[0]); i++) {
+             const char *name = cdtext_name[i];
+-            const char *value = cdtext_get_const(i, text);
++            const char *value = cdtext_get_const(text, i, track);
+             if (name && value)
+                 mp_msg(MSGT_SEEK, MSGL_INFO, "  %s: '%s'\n", name, value);
+         }