Added patch to compile with ffmpeg-0.4.9_p20070616-r1

Package-Manager: portage-2.1.3_rc6

5 files changed, 42 insertions, 17 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index d51a9552abc3..bbaf375d0509 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.28 2007/06/12 16:04:19 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.29 2007/07/03 15:01:30 zzam Exp $
+
+  03 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/patches-0.6.0/new-ffmpeg-extern-c.diff, files/patches-0.6.0/series,
+  noad-0.6.0-r9.ebuild:
+  Added patch to compile with ffmpeg-0.4.9_p20070616-r1
 
   12 Jun 2007; Matthias Schwarzott <zzam@gentoo.org>
   files/0.6.0-r7/record-50-noad.sh:
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index c7a87483bd60..a8b23b0754a9 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -45,10 +45,14 @@ AUX patches-0.6.0/hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38
 MD5 450e7937a41c390c99a792cc9fafb70a files/patches-0.6.0/hangcheck.diff 617
 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 files/patches-0.6.0/hangcheck.diff 617
 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46 files/patches-0.6.0/hangcheck.diff 617
-AUX patches-0.6.0/series 101 RMD160 76992b20b7012150a25d690bf86ae78f1f00b5ae SHA1 3a9e295c00948b397d6a79c83fd34e80fd035b04 SHA256 d0e5e7d0e2a326781a33ecfa2f97e76ad80688de507c7baa3b7bcac8af566575
-MD5 0ee9541082540c2aa3e3f3d3fde5d079 files/patches-0.6.0/series 101
-RMD160 76992b20b7012150a25d690bf86ae78f1f00b5ae files/patches-0.6.0/series 101
-SHA256 d0e5e7d0e2a326781a33ecfa2f97e76ad80688de507c7baa3b7bcac8af566575 files/patches-0.6.0/series 101
+AUX patches-0.6.0/new-ffmpeg-extern-c.diff 316 RMD160 c90e734ef1b105833a13e1dbd6ea85ece333c4b0 SHA1 10854a6893cb3388876a46e9179140790d051c6e SHA256 bc69d37f89aa5415953dca8480d47db4e34ec4996ef279649c0d7e10c6b3f55e
+MD5 1c6fa4fe5f9d1b0f85755037359e4ccf files/patches-0.6.0/new-ffmpeg-extern-c.diff 316
+RMD160 c90e734ef1b105833a13e1dbd6ea85ece333c4b0 files/patches-0.6.0/new-ffmpeg-extern-c.diff 316
+SHA256 bc69d37f89aa5415953dca8480d47db4e34ec4996ef279649c0d7e10c6b3f55e files/patches-0.6.0/new-ffmpeg-extern-c.diff 316
+AUX patches-0.6.0/series 126 RMD160 8b73b009a02477de8bf24980cab7260036a84c34 SHA1 bf359b445135235a38d5bcd39c7e38a80c542902 SHA256 a74330aed7d138edccfc1477626d830f21844fdd4b7929a5cae6176722f2b60a
+MD5 f26e52100179097866c3fbb5de0ca4e4 files/patches-0.6.0/series 126
+RMD160 8b73b009a02477de8bf24980cab7260036a84c34 files/patches-0.6.0/series 126
+SHA256 a74330aed7d138edccfc1477626d830f21844fdd4b7929a5cae6176722f2b60a files/patches-0.6.0/series 126
 AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 SHA1 052504eea27ea04d10dff671df3929b62a404e15 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2
 MD5 f78d0723081b03ab7d430ca91a6c68de files/pre-shutdown-15-noad.sh 771
 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 files/pre-shutdown-15-noad.sh 771
@@ -62,14 +66,14 @@ EBUILD noad-0.6.0-r8.ebuild 2281 RMD160 98db6c0365ec833f28b31986c71763faa79ecf4c
 MD5 69b070e379630a051dc7c4f87ace7128 noad-0.6.0-r8.ebuild 2281
 RMD160 98db6c0365ec833f28b31986c71763faa79ecf4c noad-0.6.0-r8.ebuild 2281
 SHA256 030ef690556284da100e02158c4fe13dc91b67cc2ca328a9d2fd8e80743caef5 noad-0.6.0-r8.ebuild 2281
-EBUILD noad-0.6.0-r9.ebuild 2295 RMD160 19bf09d26905a9705136ff22d1c25aec469d9765 SHA1 93f02841ab7885bb642f5cc1aec195997e7c3deb SHA256 a5cac4598ad9c20df6eaba151b31e3ed090323dd2723f4f360aa0c143a038515
-MD5 f3c05bbb7e878adcbfa9df37debbc771 noad-0.6.0-r9.ebuild 2295
-RMD160 19bf09d26905a9705136ff22d1c25aec469d9765 noad-0.6.0-r9.ebuild 2295
-SHA256 a5cac4598ad9c20df6eaba151b31e3ed090323dd2723f4f360aa0c143a038515 noad-0.6.0-r9.ebuild 2295
-MISC ChangeLog 6394 RMD160 754224569c34b085629ec572e90b60a5322e4855 SHA1 4e4eb3ada9537b1c90b99136fe5efdd8f248c799 SHA256 0580dba38fff087c2f331a359866aef919a3fd8cf3f1a994e25e3af3a9d7d402
-MD5 09c33f95dd7ac2cd04a5793533ccf418 ChangeLog 6394
-RMD160 754224569c34b085629ec572e90b60a5322e4855 ChangeLog 6394
-SHA256 0580dba38fff087c2f331a359866aef919a3fd8cf3f1a994e25e3af3a9d7d402 ChangeLog 6394
+EBUILD noad-0.6.0-r9.ebuild 2354 RMD160 ace6585e11fd5c459d07f44a43d9f7302a469340 SHA1 822903e2d66942ff0de0640acb8d84b0930b26f6 SHA256 902c18fde10a0601552c5b5e2a117bc9fbc71187a32d785f14a9356f9da5d939
+MD5 05bbd4fe50de5f93586c8c953dc3d1c4 noad-0.6.0-r9.ebuild 2354
+RMD160 ace6585e11fd5c459d07f44a43d9f7302a469340 noad-0.6.0-r9.ebuild 2354
+SHA256 902c18fde10a0601552c5b5e2a117bc9fbc71187a32d785f14a9356f9da5d939 noad-0.6.0-r9.ebuild 2354
+MISC ChangeLog 6605 RMD160 802d891b21729dc9e6276d83a71ef3abdac7c9ea SHA1 5ee50e749e08701d7ea01c2e8fa998670704f851 SHA256 ac678fa6b802d3f1ae8807bca97a2e00f5b0cb2dcb2e100d785910ee86a60ac6
+MD5 c02ef6b78b1daaf4c63b960288598955 ChangeLog 6605
+RMD160 802d891b21729dc9e6276d83a71ef3abdac7c9ea ChangeLog 6605
+SHA256 ac678fa6b802d3f1ae8807bca97a2e00f5b0cb2dcb2e100d785910ee86a60ac6 ChangeLog 6605
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 MD5 0dac6cdf92af4c49732fb6ac660b2132 metadata.xml 345
 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 metadata.xml 345
@@ -86,7 +90,7 @@ SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGbsQIt2vP6XvVdOcRAlL7AJ9RKdQat87h2iBJxRGNOvSqC9JvegCdFFye
-R0IeknQITkvRNgDGu02bWA0=
-=xSGI
+iD8DBQFGimTQt2vP6XvVdOcRAsCIAKDRU3OH8E/XVxbb25KEUoBQ/GvSjgCfXZSX
+PDzbFuIJRGMBXcEUdd+cO6s=
+=eu/u
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff b/media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff
new file mode 100644
index 000000000000..5726cab796c3
--- /dev/null
+++ b/media-video/noad/files/patches-0.6.0/new-ffmpeg-extern-c.diff
@@ -0,0 +1,14 @@
+Index: noad-0.6.0/audiotools.cpp
+===================================================================
+--- noad-0.6.0.orig/audiotools.cpp
++++ noad-0.6.0/audiotools.cpp
+@@ -3,7 +3,9 @@
+ #ifdef HAVE_LIBAVCODEC
+ 
+ #include "mpeg2wrap.h"
++extern "C" {
+ #include "avcodec.h"
++}
+ 
+ #define MIN_LOWVALS 3
+ #define CUT_VAL 10
diff --git a/media-video/noad/files/patches-0.6.0/series b/media-video/noad/files/patches-0.6.0/series
index 1753631f9bde..67c440e7bf58 100644
--- a/media-video/noad/files/patches-0.6.0/series
+++ b/media-video/noad/files/patches-0.6.0/series
@@ -4,3 +4,4 @@ cflags.diff
 framesize.diff
 delete-while-scanning.diff
 fix-osd.patch
+new-ffmpeg-extern-c.diff
diff --git a/media-video/noad/noad-0.6.0-r9.ebuild b/media-video/noad/noad-0.6.0-r9.ebuild
index 048ada8cb606..a2d4cce175af 100644
--- a/media-video/noad/noad-0.6.0-r9.ebuild
+++ b/media-video/noad/noad-0.6.0-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r9.ebuild,v 1.2 2007/05/27 16:46:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r9.ebuild,v 1.3 2007/07/03 15:01:30 zzam Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -33,6 +33,7 @@ src_unpack() {
 	epatch ${FILESDIR}/patches-${PV}/delete-while-scanning.diff
 	epatch ${FILESDIR}/patches-${PV}/fix-osd.patch
 	epatch ${FILESDIR}/patches-${PV}/hangcheck.diff
+	epatch ${FILESDIR}/patches-${PV}/new-ffmpeg-extern-c.diff
 
 	rm configure
 	eautoreconf