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, 115 insertions, 6 deletions

diff --git a/community/gmerlin/PKGBUILD b/community/gmerlin/PKGBUILD
index 6256f16eb..bc20723c3 100644
--- a/community/gmerlin/PKGBUILD
+++ b/community/gmerlin/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 76142 2012-09-12 05:13:57Z ebelanger $
+# $Id: PKGBUILD 82329 2013-01-15 11:35:00Z allan $
 # Maintainer: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=gmerlin
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Multimedia architecture for Linux"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://openmovieeditor.sourceforge.net/HomePage"
 license=('GPL')
-depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio>=0.82' 'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl')
+depends=('gavl' 'libxml2' 'gtk2' 'libxv' 'libvisual' 'libcdio-paranoia'
+         'musicbrainz' 'mjpegtools' 'hicolor-icon-theme' 'libgl')
 makedepends=('alsa-lib' 'jack' 'libquicktime' 'pulseaudio' 'v4l-utils' 'mesa')
 optdepends=('alsa-lib: for ALSA support'
 	    'jack: for JACK support'
 	    'libquicktime: for movie encoding'
 	    'pulseaudio: for PulseAudio support'
 	    'v4l-utils: for video conversion')
-options=('!libtool' '!makeflags')
+options=('!libtool')
 install=gmerlin.install
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2f2a0880e738e71486f04c929ba067f4')
+source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+        cdio-api-fixes.patch)
+md5sums=('2f2a0880e738e71486f04c929ba067f4'
+         'd0e407f01435394a0cfe04acb3c1a4cc')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  patch -Np1 -i "$srcdir/cdio-api-fixes.patch"
+
   rm -rf cpuinfo.sh
 
   ./configure --prefix=/usr --without-doxygen
diff --git a/community/gmerlin/cdio-api-fixes.patch b/community/gmerlin/cdio-api-fixes.patch
new file mode 100644
index 000000000..14c934b16
--- /dev/null
+++ b/community/gmerlin/cdio-api-fixes.patch
@@ -0,0 +1,104 @@
+diff -upr gmerlin-1.2.0.orig/plugins/cdaudio/cdparanoia.c gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c
+--- gmerlin-1.2.0.orig/plugins/cdaudio/cdparanoia.c	2013-01-10 21:16:27.000000000 +0200
++++ gmerlin-1.2.0/plugins/cdaudio/cdparanoia.c	2013-01-10 21:25:59.000000000 +0200
+@@ -28,8 +28,8 @@
+ 
+ #include "cdaudio.h"
+ #define DO_NOT_WANT_PARANOIA_COMPATIBILITY
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ 
+ /*
+  *  Ripping support
+diff -upr gmerlin-1.2.0.orig/plugins/cdaudio/cdtext.c gmerlin-1.2.0/plugins/cdaudio/cdtext.c
+--- gmerlin-1.2.0.orig/plugins/cdaudio/cdtext.c	2013-01-10 21:16:27.000000000 +0200
++++ gmerlin-1.2.0/plugins/cdaudio/cdtext.c	2013-01-10 21:25:27.000000000 +0200
+@@ -34,7 +34,7 @@
+ #include "cdaudio.h"
+ 
+ #define GET_FIELD(dst, key) \
+-  field = cdtext_get_const(key, cdtext);
++  field = cdtext_get_const(cdtext, key, i+1);
+ 
+ #define GET_FIELD_DEFAULT(dst,key)                                      \
+   field = cdtext_get_const(key, cdtext);                                \
+@@ -64,30 +64,26 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+ 
+   /* Get information for the whole disc */
+   
+-  cdtext = cdio_get_cdtext (cdio, 0);
++  cdtext = cdio_get_cdtext (cdio);
+ 
+   if(!cdtext)
+     return 0;
+   
+-  artist  = cdtext_get_const(CDTEXT_PERFORMER, cdtext);
+-  author  = cdtext_get_const(CDTEXT_COMPOSER, cdtext); /* Composer overwrites songwriter */
++  artist  = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, 0);
++  author  = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, 0); /* Composer overwrites songwriter */
+ 
+   if(!author)
+-    author  = cdtext_get_const(CDTEXT_SONGWRITER, cdtext);
++    author  = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, 0);
+   
+-  album  = cdtext_get_const(CDTEXT_TITLE, cdtext);
+-  genre  = cdtext_get_const(CDTEXT_GENRE, cdtext);
+-  comment  = cdtext_get_const(CDTEXT_MESSAGE, cdtext);
++  album  = cdtext_get_const(cdtext, CDTEXT_FIELD_TITLE, 0);
++  genre  = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, 0);
++  comment  = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, 0);
+   
+   for(i = 0; i < idx->num_tracks; i++)
+     {
+     if(idx->tracks[i].is_audio)
+       {
+-      cdtext = cdio_get_cdtext (cdio, i+1);
+-      if(!cdtext)
+-        return 0;
+-      
+-      GET_FIELD(title, CDTEXT_TITLE);
++      GET_FIELD(title, CDTEXT_FIELD_TITLE);
+       
+       if(!title)
+         return 0;
+@@ -95,7 +91,7 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+       gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                         GAVL_META_TITLE, title);
+ 
+-      if((field = cdtext_get_const(CDTEXT_PERFORMER, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_ARTIST, field);
+       else
+@@ -103,10 +99,10 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+                           GAVL_META_ARTIST, artist);
+ 
+ 
+-      if((field = cdtext_get_const(CDTEXT_COMPOSER, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_AUTHOR, field);
+-      else if((field = cdtext_get_const(CDTEXT_SONGWRITER, cdtext)))
++      else if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_AUTHOR, field);
+       else if(author)
+@@ -114,14 +110,14 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+                           GAVL_META_AUTHOR, author);
+ 
+ 
+-      if((field = cdtext_get_const(CDTEXT_GENRE, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_GENRE, field);
+       else
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_GENRE, genre);
+ 
+-      if((field = cdtext_get_const(CDTEXT_MESSAGE, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_COMMENT, field);
+       else