Fix bug #443238

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64

6 files changed, 29 insertions, 131 deletions

diff --git a/media-libs/libdlna/ChangeLog b/media-libs/libdlna/ChangeLog
index 557bbf7d72d2..167c5ccd7bd2 100644
--- a/media-libs/libdlna/ChangeLog
+++ b/media-libs/libdlna/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libdlna
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/ChangeLog,v 1.9 2012/11/15 05:39:24 flameeyes Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/ChangeLog,v 1.10 2013/04/21 13:26:35 lu_zero Exp $
+
+  21 Apr 2013; Luca Barbato <lu_zero@gentoo.org>
+  -files/libdlna-0.2.3-ffmpeg_api.patch,
+  -files/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch,
+  +files/libdlna-libav9.patch, libdlna-0.2.4.ebuild:
+  Fix bug #443238
 
   15 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> metadata.xml:
   Reassign to maintainer-needed as the email address is not registered in
diff --git a/media-libs/libdlna/Manifest b/media-libs/libdlna/Manifest
index a5f0be57166f..ef1a6ce21c6a 100644
--- a/media-libs/libdlna/Manifest
+++ b/media-libs/libdlna/Manifest
@@ -1,20 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX libdlna-0.2.3-ffmpeg_api.patch 730 SHA256 3e8ccdf3c96198b2799f2b0a7cd012400f47016eda1f7b1d02c2dd942b6192e0 SHA512 3d8c8df7d0b1cbfb81d7056d0b200284a639b9c93c373b13dee206c035c9522dd22c531b0f3534125a1943a9a39886d4c1d5e7813ef0d15066ae1594c753f78e WHIRLPOOL f4b485406923adffd9d7e9267cbeecf089713a6fd03b8b3839ab32e6dd20392b657d52d0a9a656cca1bbd68e7fa3d8e48cce29a52bfa73512cb0e7a222c5cf71
-AUX libdlna-0.2.3-libavcodec-libavformat-include-paths.patch 2551 SHA256 b2bb3464d4fbd65a58b59d51edfec4667c9dbb5399facb7cac93dfe58918872a SHA512 010c9f68a70583e290b1c15a84546ab3ecac289098e9b7771bf2b6bcad79d9e39f4bca29714e2ee1f208ba768ccc1f9098c960ac78b6d1039203f85de752084c WHIRLPOOL 452b97af1a35e815b2b27a4e34c89fb546d949af4bb17281e2679196c2b550d3c136ece50d0a83889878cedc8014f4d732d8bbe7420a33805807331570c8198a
+AUX libdlna-libav9.patch 434 SHA256 bf595743f4340b16fa5f57b7a92a259391524930ff3b40c2e3855b1fa75a4d80 SHA512 a6eeb9efa202f3f3b3fd970f85bae59c793fdd11750be5f5234a9f2f710e96c67934caf17339981bac649c1d54c8967f2877d9f6ac6a22a32d631068a22fcb86 WHIRLPOOL 1af3b274538d3af85f48871c0231bba132e1d33629abd424f6319cc6bc5f03aae177bd1daab5711ec136268820c49953c72d307a8396330edd8f255b07a943ea
 DIST libdlna-0.2.4.tar.bz2 37579 SHA256 4b2787392ea5ff61c0056bbaa0bb00a2c83d595d20b5658741658cddd17678c5 SHA512 2d6185e0d7f9d449fe48e5e6c7331a46fb795794c6b8f229e730e47ae519e28d012a79227c2bb43d3a62442560e0d65c8a84ef48e714a99848b854495d6bf7e6 WHIRLPOOL c2977ca71891cd64b12342b6ceb509c7c03ddb3ae1cbda44c0517796e990c07c9306c7372fcd112d7f211d7f79ae476fe146eaf2197065d5aebf6ba7dc20fda9
-EBUILD libdlna-0.2.4.ebuild 1014 SHA256 b9a25716488c8893a7d467a3e8b0961243547412683ae22a18c60aa7be59691b SHA512 4439dd4b569a3f691aaf0bc71dcbe5110aa22e1d68c7e5ede77e91c3069778eb2de773f74beccb293cdc91b0e1ab7bf2641a22bdefc99a6e9e9ba101b3393065 WHIRLPOOL cfbd6ff82c420f4cd3e3fc5611aef2ec90ef93789902bb12717d100adb10fc2979729189af2d9730e9c0cc0f4da52cad01d78f7fafb6e0f2b5bd64f6e462decd
-MISC ChangeLog 1687 SHA256 47831728035e0693adf1d7133eb1530f8496484a1a97e1ffff5557ae004dd206 SHA512 079a0849f9cf63d0a5d56fdb9d88874854c74c7e0a6e446e19220d3040acd965c7612bc4951934ada1f9fa22bae6b66ce4e143c2b44bba3668ccab03a928b1f4 WHIRLPOOL 195fbf8c65514bc74f9785e740f90fa9d29dfb0a487308628da3b9aab0aa484f3b662022061867fbe91d3c39c0e75c2a5ce2dc387e761ee463b1c729b3c035f2
+EBUILD libdlna-0.2.4.ebuild 1073 SHA256 47fc1edd93c47bb2613159cf8c637c36389af61e0ea998efa42d301d6af3d411 SHA512 fc172c81f4d2864261e75d29053e0cd1d613c89e9716c5c2706be8282a3dc2a279d9519e67c82b36c811015c7236301511645a9248c5f95deba8d5bd9a67bf13 WHIRLPOOL 6c7c998132ce8405bf6bbc0503ac3dc456d45c61a0366681332afed7c5d7f9b8b984f5533f16f230c127020172a8d92284aff710cbae702d498df522d28e6f31
+MISC ChangeLog 1915 SHA256 68a8504c9388f7ba8ddc0faa34d1ea941a580964a196d3a3e0270f602f7d2372 SHA512 a9b84c8e8ba75cf50a2b546448047efbefe63dfce16883b2ecc56f7771d8652db0a2d0b710da9cd1b7cbeb61e2611258b070a0a717c0b18b09cdaeb8bee904e5 WHIRLPOOL adb85e4f7441df6e776a2d0c784f9d81c30a549dea143eab0143b25cd033811772e9e552dd3e564470ae45fc33efdee050cacfb6d247461a148eec11abf44919
 MISC metadata.xml 218 SHA256 e124ad5b959f26606c176ee0a8cc3e59839b98e93c712fe4b699e7e4df11fd6b SHA512 d689950ba64adf80b0b7b667dfa81f230bc7ecf280eabba76ea3f4f0ecec3105d850cb24d34a88243debd08febe8bbd95e389fb8463f6aaeffe96a39a87d569b WHIRLPOOL 72aa8e8b9896ec82acedd6f4b4a1876861523430bc29bc96fcc03da4475e78ddb3802268b81d80d535d6942baad1508fe939a9a769b7635dfebbef7076962ee6
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQpIAQAAoJEBzRPIrUMBNCA60H/jxPNeFeZh4LJ/CGF24Ela/s
-xKPiO9q9g6CQ+s7F2SzY9icvchsiEs8G3Q+Rh6sOsy2leyvpMQ9c4D4sroFiFrvo
-u6Y4xdbvnh6QxUaLPGJD1bwEHC/KndGARlxy6/HBGeOx6tq7ZAiutW6iUmRjZDAb
-V0w9mLbe2aryhZLofVcDuBSOVkpJRmg6Spvbyxg2Opy+GX4OHdnIxaB8YIzGv+sc
-feMIkOpWmJUvxgwAjqFL3a/7Q1cEdDh3MT6Pk4YRiO91fLB2ggfAjBOkYWI9DuMi
-idbC0xZvHoL9RQserk1bAdARl3CriE3xWJTREoJ0m6Gy8w66UfcKF4U2D0nglOY=
-=9q2w
------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
deleted file mode 100644
index 07b80a3efe5c..000000000000
--- a/media-libs/libdlna/files/libdlna-0.2.3-ffmpeg_api.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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/files/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/media-libs/libdlna/files/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
deleted file mode 100644
index 8620ab2eb67f..000000000000
--- a/media-libs/libdlna/files/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-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/files/libdlna-libav9.patch b/media-libs/libdlna/files/libdlna-libav9.patch
new file mode 100644
index 000000000000..4fdd688ce798
--- /dev/null
+++ b/media-libs/libdlna/files/libdlna-libav9.patch
@@ -0,0 +1,12 @@
+diff -burN libdlna-0.2.4.orig/src/profiles.c libdlna-0.2.4/src/profiles.c
+--- libdlna-0.2.4.orig/src/profiles.c	2012-02-26 20:34:00.000000000 +0100
++++ libdlna-0.2.4/src/profiles.c	2013-04-21 15:11:17.158148687 +0200
+@@ -287,7 +287,7 @@
+     return NULL;
+   }
+ 
+-  if (av_find_stream_info (ctx) < 0)
++  if (avformat_find_stream_info (ctx, NULL) < 0)
+   {
+     if (dlna->verbosity)
+       fprintf (stderr, "can't find stream info\n");
diff --git a/media-libs/libdlna/libdlna-0.2.4.ebuild b/media-libs/libdlna/libdlna-0.2.4.ebuild
index 9e3dad3bd0ca..8a5758c3ebf2 100644
--- a/media-libs/libdlna/libdlna-0.2.4.ebuild
+++ b/media-libs/libdlna/libdlna-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.4.ebuild,v 1.4 2012/10/20 14:05:22 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdlna/libdlna-0.2.4.ebuild,v 1.5 2013/04/21 13:26:35 lu_zero Exp $
 
 EAPI=4
 inherit eutils multilib
@@ -17,6 +17,10 @@ IUSE=""
 DEPEND=">=virtual/ffmpeg-0.6.90"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-libav9.patch"
+}
+
 src_configure() {
 	# I can't use econf
 	# --host is not implemented in ./configure file