fix build issues due to various header conflicts with recent ffmpeg: sanitize includes. bug #419451

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

3 files changed, 68 insertions, 2 deletions

diff --git a/net-misc/minidlna/ChangeLog b/net-misc/minidlna/ChangeLog
index 97217fe39888..042c7b2520eb 100644
--- a/net-misc/minidlna/ChangeLog
+++ b/net-misc/minidlna/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/minidlna
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.23 2012/09/18 05:42:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/ChangeLog,v 1.24 2012/11/08 11:43:45 aballier Exp $
+
+  08 Nov 2012; Alexis Ballier <aballier@gentoo.org> minidlna-1.0.25-r1.ebuild,
+  +files/minidlna-1.0.25-ffmpeg.patch:
+  fix build issues due to various header conflicts with recent ffmpeg: sanitize
+  includes. bug #419451
 
   18 Sep 2012; Michael Weber <xmw@gentoo.org> minidlna-1.0.25-r1.ebuild:
   Correct permissions hack in pkg_setup if user exists but /var/lib/minidlna
diff --git a/net-misc/minidlna/files/minidlna-1.0.25-ffmpeg.patch b/net-misc/minidlna/files/minidlna-1.0.25-ffmpeg.patch
new file mode 100644
index 000000000000..962ca5a6d3e0
--- /dev/null
+++ b/net-misc/minidlna/files/minidlna-1.0.25-ffmpeg.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/show_bug.cgi?id=419451
+
+Index: minidlna-1.0.25/Makefile
+===================================================================
+--- minidlna-1.0.25.orig/Makefile
++++ minidlna-1.0.25/Makefile
+@@ -12,10 +12,7 @@
+ #
+ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG
+ #CFLAGS = -Wall -g -Os -D_GNU_SOURCE
+-CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \
+-	 -I/usr/include/ffmpeg \
+-	 -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \
+-	 -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat
++CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ #STATIC_LINKING: CFLAGS += -DSTATIC
+ #STATIC_LINKING: LDFLAGS = -static
+ CC = gcc
+Index: minidlna-1.0.25/metadata.c
+===================================================================
+--- minidlna-1.0.25.orig/metadata.c
++++ minidlna-1.0.25/metadata.c
+@@ -30,9 +30,9 @@
+ #include "image_utils.h"
+ #include <jpeglib.h>
+ #include <setjmp.h>
+-#include <avutil.h>
+-#include <avcodec.h>
+-#include <avformat.h>
++#include <libavutil/avutil.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ #include "tagutils/tagutils.h"
+ 
+ #include "upnpglobalvars.h"
+Index: minidlna-1.0.25/minidlna.c
+===================================================================
+--- minidlna-1.0.25.orig/minidlna.c
++++ minidlna-1.0.25/minidlna.c
+@@ -69,6 +69,7 @@
+ 
+ #ifdef ENABLE_NLS
+ #include <libintl.h>
++#include <locale.h>
+ #endif
+ 
+ #include "upnpglobalvars.h"
+Index: minidlna-1.0.25/tagutils/tagutils-plist.c
+===================================================================
+--- minidlna-1.0.25.orig/tagutils/tagutils-plist.c
++++ minidlna-1.0.25/tagutils/tagutils-plist.c
+@@ -27,7 +27,7 @@
+ #include "misc.h"
+ #include "tagutils.h"
+ #include "textutils.h"
+-#include "log.h"
++#include "../log.h"
+ 
+ 
+ #define MAX_BUF 4096
diff --git a/net-misc/minidlna/minidlna-1.0.25-r1.ebuild b/net-misc/minidlna/minidlna-1.0.25-r1.ebuild
index 9aa4b93abcff..c7e87dab49db 100644
--- a/net-misc/minidlna/minidlna-1.0.25-r1.ebuild
+++ b/net-misc/minidlna/minidlna-1.0.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.25-r1.ebuild,v 1.4 2012/09/18 05:42:51 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.0.25-r1.ebuild,v 1.5 2012/11/08 11:43:45 aballier Exp $
 
 EAPI=4
 
@@ -42,6 +42,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.0.18-Makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.0.25-ffmpeg.patch
 
 	sed -e "/^DB_PATH=/s:\".*\":\"${EPREFIX}/var/lib/${PN}\":" \
 		-e "/^LOG_PATH=/s:\".*\":\"${EPREFIX}/var/log\":" \