add a patch to build with new ffmpeg headers layout

(Portage version: 2.1.5_rc2)

3 files changed, 35 insertions, 2 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 38c9cb2a8c54..24d795f3c889 100644
--- a/media-sound/moc/ChangeLog
+++ b/media-sound/moc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/moc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.54 2008/04/08 17:31:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.55 2008/04/08 21:06:59 aballier Exp $
+
+  08 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/moc-2.5.0_alpha3-ffmpegheaders.patch, moc-2.5.0_alpha3-r1.ebuild:
+  add a patch to build with new ffmpeg headers layout
 
   08 Apr 2008; Raúl Porcel <armin76@gentoo.org> moc-2.5.0_alpha3-r1.ebuild:
   sparc stable wrt #215722
diff --git a/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch b/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch
new file mode 100644
index 000000000000..dd4972fe798e
--- /dev/null
+++ b/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch
@@ -0,0 +1,28 @@
+Index: moc-2.5.0-alpha3/configure.in
+===================================================================
+--- moc-2.5.0-alpha3.orig/configure.in
++++ moc-2.5.0-alpha3/configure.in
+@@ -485,6 +485,7 @@ then
+ 				  DECODER_PLUGINS="$DECODER_PLUGINS ffmpeg"],
+ 				  [true])
+ 	fi
++	AC_CHECK_HEADERS(ffmpeg/avformat.h libavformat/avformat.h)
+ fi
+ 
+ dnl speex
+Index: moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- moc-2.5.0-alpha3.orig/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -22,7 +22,11 @@
+ #ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+ #endif
++#if HAVE_LIBAVFORMAT_AVFORMAT_H
++#include <libavformat/avformat.h>
++#else
+ #include <ffmpeg/avformat.h>
++#endif
+ 
+ /* FFmpeg also likes common names, without that, our common.h and log.h would
+  * not be included. */
diff --git a/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
index af9c045de66d..b4e9cd9a2eec 100644
--- a/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
+++ b/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild,v 1.7 2008/04/08 17:31:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r1.ebuild,v 1.8 2008/04/08 21:06:59 aballier Exp $
 
 inherit autotools eutils
 
@@ -43,6 +43,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-faad2.patch
+	epatch "${FILESDIR}"/${P}-ffmpegheaders.patch
 	cp -f "${WORKDIR}"/m4/* m4/
 	AT_M4DIR="m4" eautoreconf
 }