fix build with latest ffmpeg, bug #242096

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.6 x86_64

4 files changed, 28 insertions, 9 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index d9372ff21faa..61e51a6e1460 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.32 2008/03/30 12:03:40 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.33 2008/10/18 09:55:33 aballier Exp $
+
+  18 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/patches-0.6.0/lavc.patch, noad-0.6.0-r9.ebuild:
+  fix build with latest ffmpeg, bug #242096
 
   30 Mar 2008; Joerg Bornkessel <hd_brummy@gentoo.org> noad-0.6.0-r9.ebuild:
   new ffmpeg header structur fixed, bug #214740
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 041b5c155b6b..4038773c541f 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -12,20 +12,20 @@ AUX patches-0.6.0/directoryfix.diff 1254 RMD160 f7ed26ef2478d7a3a622e288642615b8
 AUX patches-0.6.0/fix-osd.patch 786 RMD160 e6385da0b44bf077c50612a7fee234e9ffba338a SHA1 85bd9023eeb5626c837bc85583cc98b80691400c SHA256 94af6480d5bef48ab7a597facded3c24e3ef68e62a2fa946ef412281f0a4f173
 AUX patches-0.6.0/framesize.diff 414 RMD160 187c4be6c276f878b3e64ad484ee6cb19d7dc3ad SHA1 93da45091c53e88f51090421aaa5b7e9fddf4eb7 SHA256 f6b7769ef62f5c00de9acb9d5e20fba09c2f745dfb2872405b6780411452eb9f
 AUX patches-0.6.0/hangcheck.diff 617 RMD160 ad20d2e4c454ff48fe5f37ca7e028b80aa38a3f2 SHA1 1dd89e80e32ef30ee4692eb05c3b63da431be3e7 SHA256 0919ce88b855a026db642e5071d7cf6a81c90068ce1703bdd28d1551fee34f46
+AUX patches-0.6.0/lavc.patch 524 RMD160 ba56259bec165aa79bcb5a9b94c8bd5eb5d97d4d SHA1 0583ba0c6dbc7a7fd014af68376ab7eabf49a609 SHA256 bc544218c4894eba6f48b90ea5df12f86fdb38330d93d4d2e0ac305f71a0d5c4
 AUX patches-0.6.0/new-ffmpeg-extern-c.diff 316 RMD160 c90e734ef1b105833a13e1dbd6ea85ece333c4b0 SHA1 10854a6893cb3388876a46e9179140790d051c6e SHA256 bc69d37f89aa5415953dca8480d47db4e34ec4996ef279649c0d7e10c6b3f55e
 AUX patches-0.6.0/series 126 RMD160 8b73b009a02477de8bf24980cab7260036a84c34 SHA1 bf359b445135235a38d5bcd39c7e38a80c542902 SHA256 a74330aed7d138edccfc1477626d830f21844fdd4b7929a5cae6176722f2b60a
 AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 SHA1 052504eea27ea04d10dff671df3929b62a404e15 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2
 DIST noad-0.6.0.tar.bz2 151369 RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd SHA1 21ade875f92b5f3a24456fbf6897634966bb0286 SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183
 EBUILD noad-0.6.0-r7.ebuild 2146 RMD160 bb23317285f368cc575cad44c7ccc36b5d8e3847 SHA1 ae0a49fd38b1884dd2fb5b10b1c36c774c113fff SHA256 aa8660ebeb71d09278f85274a3c89b0efe78fbc599a8f05923fdfa8216d67aaa
 EBUILD noad-0.6.0-r8.ebuild 2299 RMD160 4e4f1b28008a8e3ccc25db9476020c8de35cb55d SHA1 8c60d0b3477c51009ecff14d79fea4e7f4bde68d SHA256 7bb7ee37484571c73518b29c79ec6106bcc13e1c2cdc0ba8ff93f971b927819f
-EBUILD noad-0.6.0-r9.ebuild 2579 RMD160 acdf11b85a2990c4bc5c2835371ed55645958b86 SHA1 9233b5a0c4956bd020e87aa0dd75723fddcb041d SHA256 64ba70f7cdb1a170e48b8249a36e8703b7612f4ee3721ec6be1e682da427cc5f
-MISC ChangeLog 7007 RMD160 197b00a630e88fbfb9a8f5796145ff77884800d8 SHA1 6f6cfc6f28157e08cecb9083aea322fd5488f046 SHA256 8c9d884b39a41ec5c16e18a5648e4406f270920237d61480c9ec258a9597445f
+EBUILD noad-0.6.0-r9.ebuild 2625 RMD160 32ea9b91b6571579d4cfa47a728e53ea511043e7 SHA1 fad5daa5c64b42e95330c155445fe6ae5ea9e055 SHA256 12f6845ac6f34d9708461306110b13f64724ee782cbc357b902e19a946d139f9
+MISC ChangeLog 7160 RMD160 4e4d54c2cf9207bb0fee2d5a6eb1d4f62a5bd617 SHA1 ea25e6464cf421f63319596608e8938c046cc088 SHA256 6d970f16d4880d99df8d6d419b9a04e8208ed2c6cc335ac59314860221122e49
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH74Gmdn07HTTCgIoRAgcnAKCyHWT5VpojyzCDGjCeFbj64l+EzQCgu7pI
-TmftsoimN/pqRsRMB7Vv/3U=
-=Sy/P
+iEYEARECAAYFAkj5sp0ACgkQvFcC4BYPU0pLdACdE3+OOTE/IxgxzBojNV5RwaWE
+zJAAoJ7PrZqAY41uMhcZZa7zrWdPw4xo
+=QJ7/
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/patches-0.6.0/lavc.patch b/media-video/noad/files/patches-0.6.0/lavc.patch
new file mode 100644
index 000000000000..3139a78d308e
--- /dev/null
+++ b/media-video/noad/files/patches-0.6.0/lavc.patch
@@ -0,0 +1,14 @@
+Index: noad-0.6.0/audiotools.cpp
+===================================================================
+--- noad-0.6.0.orig/audiotools.cpp
++++ noad-0.6.0/audiotools.cpp
+@@ -99,7 +99,8 @@ int scan_audio_stream_0(unsigned char *m
+   inbuf_ptr = mbuf;
+   while (size > 0) 
+   {
+-    len = avcodec_decode_audio(c, (short *)outbuf, &out_size, 
++    out_size=AVCODEC_MAX_AUDIO_FRAME_SIZE;
++    len = avcodec_decode_audio2(c, (short *)outbuf, &out_size, 
+                                   inbuf_ptr, size);
+     if (len < 0) 
+     {
diff --git a/media-video/noad/noad-0.6.0-r9.ebuild b/media-video/noad/noad-0.6.0-r9.ebuild
index 5c2bad2c44df..b1ece974f7d6 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-2008 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.6 2008/03/30 12:03:40 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r9.ebuild,v 1.7 2008/10/18 09:55:33 aballier Exp $
 
 WANT_AUTOMAKE="latest"
 WANT_AUTOCONF="latest"
@@ -34,6 +34,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/patches-${PV}/fix-osd.patch
 	epatch "${FILESDIR}"/patches-${PV}/hangcheck.diff
 	epatch "${FILESDIR}"/patches-${PV}/new-ffmpeg-extern-c.diff
+	epatch "${FILESDIR}"/patches-${PV}/lavc.patch
 
 	sed -e "s:char \*indents:const char \*indents:" -i showindex.cpp