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

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

4 files changed, 38 insertions, 11 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/Manifest b/media-libs/libdlna/Manifest
index 7017ae98ecea..589dd64ca899 100644
--- a/media-libs/libdlna/Manifest
+++ b/media-libs/libdlna/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libdlna-0.2.3-ffmpeg_api.patch 730 RMD160 8422d676d0b684ebfdd0af789dfbbddf5134f9cb SHA1 c30d881942c1dc950825489f8c8340d354505c4c SHA256 3e8ccdf3c96198b2799f2b0a7cd012400f47016eda1f7b1d02c2dd942b6192e0
 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 1016 RMD160 e727344f635023236cd8c396e60b6584b020d6fc SHA1 d3b63f031eea0e4fb155d147d99879cf84b06111 SHA256 d2441c04b2ecf1dbfa96a22e901dbf982465ce2e5a22f1cd67e8e2e94f9140b5
-MISC ChangeLog 626 RMD160 78e39f701a4a2287b79f2388a9a1fc043790f106 SHA1 80399b1d0e493c123470dcecfb5c8888c3270b9f SHA256 2d0d8cf453cea41e77c5f26e3bc969f1ef398ee544a975afce77fa0ed9e6c030
+EBUILD libdlna-0.2.3.ebuild 1105 RMD160 2595e8ee0c46b39dd0f134c8b6d9549963358e8d SHA1 96ad6deb4597d939603d7e56cf8d792e338762da SHA256 8e507cfd663d6e52f372ef2dadce417a01684745aa09205101f130b312ae8397
+MISC ChangeLog 821 RMD160 fff92750dff2ceaa149fc0e054d463998904ded7 SHA1 b95454eb02e1834448ef4cd9807a8593f7506759 SHA256 083c0ab61bc6df0a7aec9833a6956772f00da391664bc5c54b77d39aa3e9e894
 MISC metadata.xml 230 RMD160 8e15bd387fc4d0bc85265e6a66f659b80df40cc7 SHA1 b065a166e26c42a3184541b62c9866a9a5491a0d SHA256 ad66488328b7b7398b3854c151952e06435641f2c0490ff23e81325e63813f13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk2ZlSYACgkQHB6c3gNBRYduFgCgmW5eZTNgZ3Nl1mRB5UlswOAv
-VLsAnAlSi9PTPIll/+lyEv33Oz+WHnhV
-=inYk
+iEYEARECAAYFAk69FtwACgkQvFcC4BYPU0qexwCfaIf89LqA02EXJ7GRseaSqEfz
+TtwAn0PW68r+wFSrTD/J4iWoigdcj8IT
+=Ephr
 -----END PGP SIGNATURE-----
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"
 }