fix build with ffmpeg-0.8, bug #382593, and make it multilib-strict compliant

(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)

3 files changed, 31 insertions, 5 deletions

diff --git a/media-libs/libdlna/ChangeLog b/media-libs/libdlna/ChangeLog
index f817154aebbb..aa6c181a85f5 100644
--- a/media-libs/libdlna/ChangeLog
+++ b/media-libs/libdlna/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdlna
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/ChangeLog,v 1.2 2011/04/04 09:59:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/ChangeLog,v 1.3 2011/11/11 12:36:39 aballier Exp $
+
+  11 Nov 2011; Alexis Ballier <aballier@gentoo.org> libdlna-0.2.3.ebuild,
+  +files/libdlna-0.2.3-ffmpeg_api.patch:
+  fix build with ffmpeg-0.8, bug #382593, and make it multilib-strict compliant
 
   04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> libdlna-0.2.3.ebuild:
   Move to virtual/ffmpeg from media-video/ffmpeg.
diff --git a/media-libs/libdlna/files/libdlna-0.2.3-ffmpeg_api.patch b/media-libs/libdlna/files/libdlna-0.2.3-ffmpeg_api.patch
new file mode 100644
index 000000000000..07b80a3efe5c
--- /dev/null
+++ b/media-libs/libdlna/files/libdlna-0.2.3-ffmpeg_api.patch
@@ -0,0 +1,20 @@
+Index: libdlna-0.2.3/src/profiles.c
+===================================================================
+--- libdlna-0.2.3.orig/src/profiles.c
++++ libdlna-0.2.3/src/profiles.c
+@@ -205,13 +205,13 @@ av_profile_get_codecs (AVFormatContext *
+   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/media-libs/libdlna/libdlna-0.2.3.ebuild b/media-libs/libdlna/libdlna-0.2.3.ebuild
index d60cf6d2bc92..5a1fc790c82c 100644
--- a/media-libs/libdlna/libdlna-0.2.3.ebuild
+++ b/media-libs/libdlna/libdlna-0.2.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.3.ebuild,v 1.2 2011/04/04 09:59:32 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.3.ebuild,v 1.3 2011/11/11 12:36:39 aballier Exp $
 
 EAPI=2
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="A reference open-source implementation of DLNA (Digital Living Network Alliance) standards."
 HOMEPAGE="http://libdlna.geexbox.org"
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND="virtual/ffmpeg"
+DEPEND=">=virtual/ffmpeg-0.6.90"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-libavcodec-libavformat-include-paths.patch"
+	epatch "${FILESDIR}/${P}-libavcodec-libavformat-include-paths.patch" \
+		"${FILESDIR}/${P}-ffmpeg_api.patch"
 }
 
 src_configure() {
@@ -26,6 +27,7 @@ src_configure() {
 	# --host is not implemented in ./configure file
 	./configure \
 		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
 		|| die "./configure failed"
 }