media-libs/libdlna: Fixed build issue with ffmpeg-5, added missed dependency on ffmpeg, tested on amd64, fixed QA issues (missed FAQ, CHANGELOG.

svn path=/sunrise/; revision=9758

4 files changed, 116 insertions, 9 deletions

diff --git a/media-libs/libdlna/ChangeLog b/media-libs/libdlna/ChangeLog
index 875f39c88..5a616e0d7 100644
--- a/media-libs/libdlna/ChangeLog
+++ b/media-libs/libdlna/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for media-libs/libdlna
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Dec 2009; Peter Volkov <pva@gentoo.org> libdlna-0.2.3.ebuild,
+  +files/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch:
+  Fixed build issue with ffmpeg-5, added missed dependency on ffmpeg, tested
+  on amd64, fixed QA issues (missed FAQ, CHANGELOG.
+
   17 Feb 2008; (Tommy[D]) tommy100@gmx.de libdlna-0.2.3.ebuild:
   Shorten description
 
diff --git a/media-libs/libdlna/Manifest b/media-libs/libdlna/Manifest
index 81e22e9ef..449dcaa30 100644
--- a/media-libs/libdlna/Manifest
+++ b/media-libs/libdlna/Manifest
@@ -1,4 +1,5 @@
+AUX libdlna-0.2.3-libavcodec-libavformat-include-paths.patch 2551 RMD160 29b311c7e3122ab6d6ae4ec31c10f222e5e06060 SHA1 c9d55f9cb6b7da89549329b85f8cafaf5e087819 SHA256 b2bb3464d4fbd65a58b59d51edfec4667c9dbb5399facb7cac93dfe58918872a
 DIST libdlna-0.2.3.tar.bz2 37142 RMD160 b6ef7cca1c661b95d3f8892ad99179fae9ddfbf4 SHA1 87159167610abde806a7addb8e425dbdc446856e SHA256 8eb7941cbae088026dd394fbe6f465cae6dd848edc430c6313f04cf57d1192b4
-EBUILD libdlna-0.2.3.ebuild 686 RMD160 56b45e1b7973f64ee66427a81c4c2620f4a20aa6 SHA1 83836870dbec3f6c1f7f274712fbf4d3071dfa35 SHA256 a6594c856299a2cc7042965032df500b85f27a5a0e8c3f5aca8457dcb8da2ba0
-MISC ChangeLog 298 RMD160 6888352ec4d2d5bc3dcabb136c9221b815833cb8 SHA1 0fd4fe633f2ba6681ef76345e05299f8c77be5f7 SHA256 3b61bdcb9b41a33be4e3c7362c2b07cfb23072629cc65262ce188d6457a57309
+EBUILD libdlna-0.2.3.ebuild 918 RMD160 99006ab442b62cccd2bbc54998a2f5b5d09c8ce1 SHA1 f8aff32638cd31c5d95b19258e276f9706cb44c5 SHA256 73941891ac6832edf887918595f21d99d2534ecc6a801aac50f2f5ee7b166e7e
+MISC ChangeLog 562 RMD160 f2ca804616af5a997da5353349b9fd37a8091369 SHA1 ac6a02c6e9b9204795827bae913dd07012f4f32d SHA256 a491ce1d0f4ca4f556ab77edeb288c5f69a037f64fc44ad98a56c65feca2cb77
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/media-libs/libdlna/files/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/media-libs/libdlna/files/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
new file mode 100644
index 000000000..8620ab2eb
--- /dev/null
+++ b/media-libs/libdlna/files/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
+
diff --git a/media-libs/libdlna/libdlna-0.2.3.ebuild b/media-libs/libdlna/libdlna-0.2.3.ebuild
index 7cd63a530..7297e8bf0 100644
--- a/media-libs/libdlna/libdlna-0.2.3.ebuild
+++ b/media-libs/libdlna/libdlna-0.2.3.ebuild
@@ -2,28 +2,40 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="2"
+
+inherit eutils
+
 DESCRIPTION="A reference open-source implementation of DLNA (Digital Living Network Alliance) standards."
 HOMEPAGE="http://libdlna.geexbox.org"
 SRC_URI="http://libdlna.geexbox.org/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
+DEPEND=">=media-video/ffmpeg-0.5"
+RDEPEND="${DEPEND}"
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}/${P}-libavcodec-libavformat-include-paths.patch"
+}
+
+src_configure() {
 	# I can't use econf
 	# --host is not implemented in ./configure file
 	./configure \
 		--prefix=/usr \
 		|| die "./configure failed"
-	emake || die "emake failed."
+}
+
+src_compile() {
+	# not parallel safe, error "cannot find -ldlna"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc README FAQ CHANGELOG
+	dodoc README AUTHORS ChangeLog
 }