add a patch to build with new ffmpeg headers layout

Package-Manager: portage-2.1.5_rc2

4 files changed, 48 insertions, 4 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/Manifest b/media-sound/moc/Manifest
index 3b8c004748c8..f1b722cf214e 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX moc-2.5.0_alpha2-endianess.patch 1747 RMD160 6b284b59d461aba3b3248b78cee7a4c576b9d67d SHA1 4a26b7f6b488f7781ba18a1423dadc0d74a6d8b7 SHA256 b6874f79f454a430dc96705b54048ee999576e8327436ca9ef1654b72bb5f28f
 AUX moc-2.5.0_alpha3-faad2.patch 933 RMD160 54fdaee534bde0f2004334ce1637d6f57a95028a SHA1 d387c13600458eb4bebe2d2715e5eaba36c748af SHA256 2a221a9328b3a1dd753af07d0ba64ebffba145b2309d7c9ac596b04fc8c4a283
+AUX moc-2.5.0_alpha3-ffmpegheaders.patch 880 RMD160 ce9d02203fff727ce49afd52a207831457beb234 SHA1 e400201af328fc7866cfae3c9cd7d42e11e4e8b7 SHA256 c3d80f406320e99ae2ab2edaaaa08ff79bc7711a933d31903a50902d74b706f2
 DIST moc-2.5.0-alpha2.tar.bz2 486681 RMD160 64efd4bff599ae419dad34905725db38633ec8c9 SHA1 9d448c79ad0889cc5a27c5d9e1bbe7b6a697954f SHA256 000deb3212a70fe4b83e4f005753746e80fdc7d5b74db89b8a6cf69410c455a3
 DIST moc-2.5.0-alpha3.tar.bz2 489824 RMD160 7a603538e2080f3e182a543bc82100a09a56c2fe SHA1 59251b6239ad38f3f5ba8a1f73d1e90246765ab7 SHA256 6b691295eb0b42aab17805798bd40fb308619a9ba8f6a1e1ed599e3449946617
 DIST moc-m4-1.tar.bz2 1635 RMD160 25f0561e4fdd7f5a622d419dae434bbcba70a02f SHA1 0e0c47b379764f986976414c283a05e6da825822 SHA256 337f47d91fbf532443f278b81db3d69d13260bebeaa1358bedff34e10637dee7
 EBUILD moc-2.5.0_alpha2.ebuild 2042 RMD160 b6d43919bad24a254fa452317a74e44291271b04 SHA1 8c1588a576b9c5952e42525f04b1139575dc1a6d SHA256 eb844976f867392e231e1e4c8859e4a5f8eb4d9aa990b306eb2dd446eb3d5b8e
-EBUILD moc-2.5.0_alpha3-r1.ebuild 2200 RMD160 fc16b990b01066a6950feee8aa53b9b90c3593da SHA1 f8ab08c3f71ea33f850781ab3635a1a956af76da SHA256 7e0cca9cd4876fc2941eb635c36984b8407ebf5699f20c76bce8c55c00df8a97
-MISC ChangeLog 7629 RMD160 da02188788c1bb9a56f7a96e14023f95bcdc6a9d SHA1 4b3feec050674ab2d98d2c7c2adcc5a527d38a57 SHA256 6c4bc914e9e48d0520973ac54c81915fc502fd90c3c6bc8e4366d526bb9ae1ae
+EBUILD moc-2.5.0_alpha3-r1.ebuild 2248 RMD160 a1d0d0228ee6f3a51939c7c0f339b17ec119e2ea SHA1 bbe3410bbc3e50f6f020cf82091289a982ccb367 SHA256 47aa6cd638d8225d25ec3f80c1f4471a1321f73d6c7dc5655c663fcb04fc401a
+MISC ChangeLog 7812 RMD160 550ab9f377a8031c8ac774654dfb1403c0bb41d8 SHA1 609a8ff240a2ff4f7fe60d09c76ef82565d0cdc0 SHA256 951cb0aa60108777e4e7fb8769d3fd00ded8ae6d2820c834453e2bc00d39f76a
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf73nwACgkQvFcC4BYPU0pBHgCgmBZ4yUMT+FIIFVcESBxstcR6
+1pAAoKkCuGOK1F0co9mXwUjMSAFq/w1P
+=GtmF
+-----END PGP SIGNATURE-----
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
 }