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

Conflicts:
	community/ginac/PKGBUILD
	community/gnash/PKGBUILD
	community/haskell-tar/PKGBUILD
	community/libdlna/PKGBUILD
	community/mplayer2/PKGBUILD
	community/musescore/PKGBUILD
	community/open-vm-tools-modules/PKGBUILD
	community/paraview/PKGBUILD
	community/picard/PKGBUILD
	core/idnkit/PKGBUILD
	core/ifenslave/PKGBUILD
	extra/audacious/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/graphite/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/k3b/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/koffice/PKGBUILD
	extra/kradio/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/mediastreamer/PKGBUILD
	extra/poppler/PKGBUILD
	extra/vlc/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD

3 files changed, 124 insertions, 9 deletions

diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD
index a5d6be8f5..57c0ec859 100644
--- a/community/libdlna/PKGBUILD
+++ b/community/libdlna/PKGBUILD
@@ -1,24 +1,31 @@
-# $Id: PKGBUILD 7626 2010-01-08 23:34:07Z dgriffiths $
+# $Id: PKGBUILD 58401 2011-11-12 17:17:29Z ibiru $
 # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> 
 # Contributor: kastor <kastor@fobos.org.ar>
 pkgname=libdlna
 pkgver=0.2.3
-pkgrel=8
+pkgrel=9
 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards "
 url="http://libdlna.geexbox.org"
 license=("LGPL")
 arch=('i686' 'x86_64' 'mips64el')
-options=('!libtool')
+options=('!libtool' '!makeflags')  # not parallel safe, error find -ldlna  
 makedepends=('ctags')
 depends=('glibc' 'ffmpeg')
-source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2c974f95b711e5fd07f78fc4ebfcca66')
+source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "libdlna-0.2.3-libavcodec-libavformat-include-paths.patch" "ffmpeg-0.8.patch")
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ./configure src/profiles.h src/*.c || return 1
-  sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ./configure src/profiles.h src/*.c || return 1
-  ./configure --prefix=/usr --includedir=/usr/include/libavformat || return 1
-  make || return 1
+  patch -Np1 -i $srcdir/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
+  patch -Np1 -i $srcdir/ffmpeg-0.8.patch
+#  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ./configure src/profiles.h src/*.c 
+#  sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ./configure src/profiles.h src/*.c 
+  ./configure --prefix=/usr --includedir=/usr/include/libavformat 
+  make -j1  # not parallel safe, error find -ldlna
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make INSTALL=/bin/install DESTDIR=${pkgdir} install
 }
+md5sums=('2c974f95b711e5fd07f78fc4ebfcca66'
+         '937f1aebf930571127856056bd1d3959'
+         'a5c9f58233fc7fc79b5fe550b297273b')
diff --git a/community/libdlna/ffmpeg-0.8.patch b/community/libdlna/ffmpeg-0.8.patch
new file mode 100644
index 000000000..63b33a451
--- /dev/null
+++ b/community/libdlna/ffmpeg-0.8.patch
@@ -0,0 +1,19 @@
+diff -aur libdlna-0.2.3/src/profiles.c libdlna-0.2.3.new/src/profiles.c
+--- libdlna-0.2.3/src/profiles.c	2007-11-26 21:47:43.000000000 +0100
++++ libdlna-0.2.3.new/src/profiles.c	2011-10-31 16:06:34.000000000 +0100
+@@ -205,13 +205,13 @@
+   for (i = 0; i < ctx->nb_streams; i++)
+   {
+     if (audio_stream == -1 &&
+-        ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
++        ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+     {
+       audio_stream = i;
+       continue;
+     }
+     else if (video_stream == -1 &&
+-             ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
++             ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+     {
+       video_stream = i;
+       continue;
diff --git a/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
new file mode 100644
index 000000000..8620ab2eb
--- /dev/null
+++ b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
@@ -0,0 +1,89 @@
+https://bugs.gentoo.org/show_bug.cgi?id=297872
+http://hg.geexbox.org/libdlna/raw-rev/4113a728a2ca
+
+From 81130b9ade274bfc53900999ccc6f963ae9ce9d7 Mon Sep 17 00:00:00 2001
+From: Jeremy Olexa <darkside@gentoo.org>
+Date: Tue, 22 Dec 2009 00:22:42 -0600
+Subject: [PATCH] Update reference to ffmpeg header files
+
+---
+ configure             |    4 ++--
+ src/av_mpeg4_part10.c |    2 +-
+ src/av_mpeg4_part2.c  |    2 +-
+ src/containers.c      |    2 +-
+ src/profiles.h        |    4 ++--
+ 5 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index 8acbd9d..85c1091 100755
+--- a/configure
++++ b/configure
+@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then
+ fi
+ 
+ echolog "Checking for libavformat ..."
+-check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
++check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !"
+ echolog "Checking for libavcodec ..."
+-check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
++check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !"
+ 
+ #################################################
+ #   version
+diff --git a/src/av_mpeg4_part10.c b/src/av_mpeg4_part10.c
+index bd17022..f9c8ee5 100644
+--- a/src/av_mpeg4_part10.c
++++ b/src/av_mpeg4_part10.c
+@@ -26,7 +26,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ 
+ #include "dlna_internals.h"
+ #include "profiles.h"
+diff --git a/src/av_mpeg4_part2.c b/src/av_mpeg4_part2.c
+index 0148384..823e1b6 100644
+--- a/src/av_mpeg4_part2.c
++++ b/src/av_mpeg4_part2.c
+@@ -26,7 +26,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ 
+ #include "dlna_internals.h"
+ #include "profiles.h"
+diff --git a/src/containers.c b/src/containers.c
+index 71b51f7..ca0819b 100644
+--- a/src/containers.c
++++ b/src/containers.c
+@@ -4,7 +4,7 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ 
+-#include <ffmpeg/avformat.h>
++#include <libavformat/avformat.h>
+ 
+ #include "containers.h"
+ #include "profiles.h"
+diff --git a/src/profiles.h b/src/profiles.h
+index 7b86d33..a7fc0fd 100644
+--- a/src/profiles.h
++++ b/src/profiles.h
+@@ -22,8 +22,8 @@
+ #ifndef _PROFILES_H_
+ #define _PROFILES_H_
+ 
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ 
+ #include "dlna_internals.h"
+ #include "containers.h"
+-- 
+1.6.4.4
+