Fix bug #443238

(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)

5 files changed, 26 insertions, 113 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/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