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

Conflicts:
	community-staging/gnash/PKGBUILD
	kde-unstable/kactivities/PKGBUILD
	kde-unstable/kdeaccessibility-jovie/PKGBUILD
	kde-unstable/kdeaccessibility-kaccessible/PKGBUILD
	kde-unstable/kdeaccessibility-kmag/PKGBUILD
	kde-unstable/kdeaccessibility-kmousetool/PKGBUILD
	kde-unstable/kdeaccessibility-kmouth/PKGBUILD
	kde-unstable/kdeadmin/PKGBUILD
	kde-unstable/kdeartwork/PKGBUILD
	kde-unstable/kdebase-konsole/PKGBUILD
	kde-unstable/kdebase-runtime/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	kde-unstable/kdebase/PKGBUILD
	kde-unstable/kdebindings-kimono/PKGBUILD
	kde-unstable/kdebindings-korundum/PKGBUILD
	kde-unstable/kdebindings-kross/PKGBUILD
	kde-unstable/kdebindings-perlkde/PKGBUILD
	kde-unstable/kdebindings-perlqt/PKGBUILD
	kde-unstable/kdebindings-python/PKGBUILD
	kde-unstable/kdebindings-qtruby/PKGBUILD
	kde-unstable/kdebindings-qyoto/PKGBUILD
	kde-unstable/kdebindings-smokegen/PKGBUILD
	kde-unstable/kdebindings-smokekde/PKGBUILD
	kde-unstable/kdebindings-smokeqt/PKGBUILD
	kde-unstable/kdeedu-analitza/PKGBUILD
	kde-unstable/kdeedu-blinken/PKGBUILD
	kde-unstable/kdeedu-cantor/PKGBUILD
	kde-unstable/kdeedu-kalgebra/PKGBUILD
	kde-unstable/kdeedu-kalzium/PKGBUILD
	kde-unstable/kdeedu-kanagram/PKGBUILD
	kde-unstable/kdeedu-kbruch/PKGBUILD
	kde-unstable/kdeedu-kgeography/PKGBUILD
	kde-unstable/kdeedu-khangman/PKGBUILD
	kde-unstable/kdeedu-kig/PKGBUILD
	kde-unstable/kdeedu-kiten/PKGBUILD
	kde-unstable/kdeedu-klettres/PKGBUILD
	kde-unstable/kdeedu-kmplot/PKGBUILD
	kde-unstable/kdeedu-kstars/PKGBUILD
	kde-unstable/kdeedu-ktouch/PKGBUILD
	kde-unstable/kdeedu-kturtle/PKGBUILD
	kde-unstable/kdeedu-kwordquiz/PKGBUILD
	kde-unstable/kdeedu-marble/PKGBUILD
	kde-unstable/kdeedu-pairs/PKGBUILD
	kde-unstable/kdeedu-parley/PKGBUILD
	kde-unstable/kdeedu-rocs/PKGBUILD
	kde-unstable/kdeedu-step/PKGBUILD
	kde-unstable/kdegames/PKGBUILD
	kde-unstable/kdegraphics-gwenview/PKGBUILD
	kde-unstable/kdegraphics-kamera/PKGBUILD
	kde-unstable/kdegraphics-kcolorchooser/PKGBUILD
	kde-unstable/kdegraphics-kgamma/PKGBUILD
	kde-unstable/kdegraphics-kolourpaint/PKGBUILD
	kde-unstable/kdegraphics-kruler/PKGBUILD
	kde-unstable/kdegraphics-ksaneplugin/PKGBUILD
	kde-unstable/kdegraphics-ksnapshot/PKGBUILD
	kde-unstable/kdegraphics-mobipocket/PKGBUILD
	kde-unstable/kdegraphics-okular/PKGBUILD
	kde-unstable/kdegraphics-strigi-analyzer/PKGBUILD
	kde-unstable/kdegraphics-svgpart/PKGBUILD
	kde-unstable/kdegraphics-thumbnailers/PKGBUILD
	kde-unstable/kdemultimedia-audiocd-kio/PKGBUILD
	kde-unstable/kdemultimedia-dragonplayer/PKGBUILD
	kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
	kde-unstable/kdemultimedia-juk/PKGBUILD
	kde-unstable/kdemultimedia-kmix/PKGBUILD
	kde-unstable/kdemultimedia-kscd/PKGBUILD
	kde-unstable/kdemultimedia-mplayerthumbs/PKGBUILD
	kde-unstable/kdenetwork/PKGBUILD
	kde-unstable/kdepim-runtime/PKGBUILD
	kde-unstable/kdepim/PKGBUILD
	kde-unstable/kdepimlibs/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/kdesdk-kate/PKGBUILD
	kde-unstable/kdesdk/PKGBUILD
	kde-unstable/kdetoys/PKGBUILD
	kde-unstable/kdeutils-filelight/PKGBUILD
	kde-unstable/kdeutils-kcalc/PKGBUILD
	kde-unstable/kdeutils-kcharselect/PKGBUILD
	kde-unstable/kdeutils-kdf/PKGBUILD
	kde-unstable/kdeutils-kfloppy/PKGBUILD
	kde-unstable/kdeutils-kgpg/PKGBUILD
	kde-unstable/kdeutils-kremotecontrol/PKGBUILD
	kde-unstable/kdeutils-ktimer/PKGBUILD
	kde-unstable/kdeutils-kwallet/PKGBUILD
	kde-unstable/kdeutils-superkaramba/PKGBUILD
	kde-unstable/kdeutils-sweeper/PKGBUILD
	kde-unstable/kdewebdev/PKGBUILD
	kde-unstable/libkcddb/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD
	kde-unstable/libkdcraw/PKGBUILD
	kde-unstable/libkdeedu/PKGBUILD
	kde-unstable/libkexiv2/PKGBUILD
	kde-unstable/libkipi/PKGBUILD
	kde-unstable/libksane/PKGBUILD
	kde-unstable/nepomuk-core/PKGBUILD

2 files changed, 22 insertions, 6 deletions

diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index d68a01918..a067e098f 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73526 2012-07-09 06:06:23Z spupykin $
+# $Id: PKGBUILD 73571 2012-07-10 08:51:06Z stativ $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer:Biginoz < biginoz AT free point fr>
 # Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -7,12 +7,12 @@
 
 pkgname=minidlna
 pkgver=1.0.24
-pkgrel=5
+pkgrel=6
 pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://sourceforge.net/projects/minidlna/"
 license=('GPL')
-depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg-compat' 'sqlite')
+depends=('libexif' 'libjpeg' 'libid3tag' 'flac' 'libvorbis' 'ffmpeg' 'sqlite')
 conflicts=('minidlna-cvs')
 backup=('etc/minidlna.conf'
 	'etc/conf.d/minidlna')
@@ -21,16 +21,16 @@ source=(http://downloads.sourceforge.net/minidlna/minidlna_${pkgver}_src.tar.gz
 	minidlna.rc
 	minidlna.conf
 	minidlna.service
-	ffmpeg-compat.patch)
+    ffmpeg_0.11.diff)
 md5sums=('be9b4c91e3fcde592dc3f9828098ca0f'
          'c9863d5703e0a8469cc200f2739567e7'
          'af1b8c0fef9902f797b0324c255da5a1'
          '1903ed9ceee43b8bb86146b9ad8eb50c'
-         '310d66170f20d660e96f4c9709559ed1')
+         '1346e1d3d7d71db70ac46dcad96391b1')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 <$srcdir/ffmpeg-compat.patch
+  patch -Np1 <$srcdir/ffmpeg_0.11.diff || true
   sed -i 's|DB_PATH=.*|DB_PATH=/var/cache/minidlna|' genconfig.sh
   make
 }
diff --git a/community/minidlna/ffmpeg_0.11.diff b/community/minidlna/ffmpeg_0.11.diff
new file mode 100644
index 000000000..f43831add
--- /dev/null
+++ b/community/minidlna/ffmpeg_0.11.diff
@@ -0,0 +1,16 @@
+diff -rup minidlna-1.0.24/metadata.c minidlna-1.0.24.new/metadata.c
+--- minidlna-1.0.24/metadata.c	2012-02-14 19:44:56.000000000 +0100
++++ minidlna-1.0.24.new/metadata.c	2012-07-10 10:28:01.373163002 +0200
+@@ -1514,10 +1548,10 @@ GetVideoMetadata(const char * path, char
+ 	{
+ 		if( ctx->metadata )
+ 		{
+-			AVMetadataTag *tag = NULL;
++			AVDictionaryEntry *tag = NULL;
+ 
+ 			//DEBUG DPRINTF(E_DEBUG, L_METADATA, "Metadata:\n");
+-			while( (tag = av_metadata_get(ctx->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX)) )
++			while( (tag = av_dict_get(ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)) )
+ 			{
+ 				//DEBUG DPRINTF(E_DEBUG, L_METADATA, "  %-16s: %s\n", tag->key, tag->value);
+ 				if( strcmp(tag->key, "title") == 0 )