Extend ffmpeg patch wrt #258890, thanks to Mateusz Baran.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 61 insertions, 33 deletions

diff --git a/media-sound/moc/ChangeLog b/media-sound/moc/ChangeLog
index 077d8b3095fe..c7751c91f816 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.63 2008/07/17 18:56:29 corsair Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/ChangeLog,v 1.64 2009/05/11 18:03:30 ssuominen Exp $
+
+  11 May 2009; Samuli Suominen <ssuominen@gentoo.org>
+  files/moc-2.5.0_alpha3-ffmpegheaders.patch:
+  Extend ffmpeg patch wrt #258890, thanks to Mateusz Baran.
 
   17 Jul 2008; Markus Rothe <corsair@gentoo.org> moc-2.5.0_alpha3-r2.ebuild:
   Stable on ppc64; bug #230826
@@ -20,7 +24,7 @@
   moc-2.5.0_alpha3-r2.ebuild:
   amd64 stable wrt bug #230826
 
-  05 Jul 2008; Samuli Suominen <drac@gentoo.org>
+  05 Jul 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/moc-2.5.0_alpha3-fix_default_configuration_layout.patch,
   moc-2.5.0_alpha3-r2.ebuild:
   Fix default configuration layout (upstream), thanks to Emil Karlson and
@@ -28,11 +32,12 @@
 
 *moc-2.5.0_alpha3-r2 (08 May 2008)
 
-  08 May 2008; Samuli Suominen <drac@gentoo.org>
+  08 May 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/moc-2.5.0_alpha3-libtool22.patch, +moc-2.5.0_alpha3-r2.ebuild:
   Add missing AC_PROG_CXX and use system ltdl for libtool-2.2.
 
-  10 Apr 2008; Samuli Suominen <drac@gentoo.org> moc-2.5.0_alpha3-r1.ebuild:
+  10 Apr 2008; Samuli Suominen <ssuominen@gentoo.org>
+  moc-2.5.0_alpha3-r1.ebuild:
   DEPEND dev-util/pkgconfig because eautoreconf fails without pkg.m4 wrt
   #216940, thanks to bonsaikitten and aballier.
 
@@ -52,8 +57,8 @@
   02 Apr 2008; Markus Meier <maekke@gentoo.org> moc-2.5.0_alpha3-r1.ebuild:
   x86 stable, bug #215722
 
-  21 Mar 2008; Samuli Suominen <drac@gentoo.org> -moc-2.5.0_alpha3.ebuild,
-  moc-2.5.0_alpha3-r1.ebuild:
+  21 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
+  -moc-2.5.0_alpha3.ebuild, moc-2.5.0_alpha3-r1.ebuild:
   amd64 stable
 
   09 Mar 2008; Alexis Ballier <aballier@gentoo.org>
@@ -63,13 +68,13 @@
 
 *moc-2.5.0_alpha3-r1 (05 Mar 2008)
 
-  05 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  05 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/moc-2.5.0_alpha3-faad2.patch, +moc-2.5.0_alpha3-r1.ebuild:
   aac USE for media-libs/faad2 by Hendrik Iben, bug 211805.
 
 *moc-2.5.0_alpha3 (01 Mar 2008)
 
-  01 Mar 2008; Samuli Suominen <drac@gentoo.org>
+  01 Mar 2008; Samuli Suominen <ssuominen@gentoo.org>
   -files/moc-2.4.1+flac-1.1.3.patch, -moc-2.4.1.ebuild, -moc-2.4.2.ebuild,
   +moc-2.5.0_alpha3.ebuild:
   Version bump wrt #211805, thanks to Hendrik Iben.
@@ -86,23 +91,21 @@
   24 Nov 2007; Markus Rothe <corsair@gentoo.org> moc-2.5.0_alpha2.ebuild:
   Stable on ppc64; bug #200134
 
-  24 Nov 2007; Samuli Suominen <drac@gentoo.org> moc-2.5.0_alpha2.ebuild:
+  24 Nov 2007; Samuli Suominen <ssuominen@gentoo.org> moc-2.5.0_alpha2.ebuild:
   Timidity plug-in needs Timidity++ installed for timidity.cfg.
 
-  23 Nov 2007; Samuli Suominen <drac@gentoo.org> moc-2.5.0_alpha2.ebuild:
+  23 Nov 2007; Samuli Suominen <ssuominen@gentoo.org> moc-2.5.0_alpha2.ebuild:
   amd64 stable wrt #200134
 
-  08 Aug 2007; Samuli Suominen <drac@gentoo.org> moc-2.5.0_alpha2.ebuild:
-  Fix timidity depends.
-
-  07 Aug 2007; Samuli Suominen <drac@gentoo.org>
+  07 Aug 2007; Samuli Suominen <ssuominen@gentoo.org>
   +files/moc-2.5.0_alpha2-endianess.patch, moc-2.5.0_alpha2.ebuild:
   Apply endianess fixes from bug 169785, by Damian Pietras, Elimar Riesebieter
   and Hendrik Iben.
 
 *moc-2.5.0_alpha2 (30 Jul 2007)
 
-  30 Jul 2007; Samuli Suominen <drac@gentoo.org> +moc-2.5.0_alpha2.ebuild:
+  30 Jul 2007; Samuli Suominen <ssuominen@gentoo.org>
+  +moc-2.5.0_alpha2.ebuild:
   Version bump for bug 169785, thanks to Hendrik Iben for reporting.
 
   13 Jun 2007; Alexis Ballier <aballier@gentoo.org> -moc-2.1.4-r1.ebuild,
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 31201cf65fcc..f9b8c6f8ecf8 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -1,9 +1,9 @@
 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
+AUX moc-2.5.0_alpha3-ffmpegheaders.patch 1702 RMD160 3f8f8c1b92d7c86ee27efb5793bb8257e47701fb SHA1 84bc2e2ab2de630a6bae6d33f5016ee66a48f509 SHA256 a887f0eb68cb8741069561117c36ad8e228b9fabc1c41947a7f59e16c7d1e546
 AUX moc-2.5.0_alpha3-fix_default_configuration_layout.patch 354 RMD160 bc11e5d17a06669f949abb05e5ae157d30883652 SHA1 496017390e0078bde6a01afbd466cead5e904233 SHA256 e11b7fe9e29bbb500c4360bfc4e8e991e494a5d9db432783b1785be6c27a606d
 AUX moc-2.5.0_alpha3-libtool22.patch 964 RMD160 964b69215300a010b536a73bf1644f15524b098f SHA1 34d03402e276e941bd86eacf61ca5ef4a80a1f06 SHA256 61e0513ffd5132b658ad330444ccb32163efb8f892049d068ee6dbfbc3cab259
 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_alpha3-r2.ebuild 2362 RMD160 37a3594684e7abce5e97492c7b7dab08ba6fc3b1 SHA1 d356c70bc73badf62a3e462b3a983f47c2694397 SHA256 48e8d24e3cd2c32b0d267d7ef94a47d8510ef27e10053050de12f55e406164fb
-MISC ChangeLog 9029 RMD160 2c415c6a7b103362082147d696a85c30283bc934 SHA1 de93ab2d64b2404a4b64fcfb210d8810c5ed28fc SHA256 dbd9c03b9fa058bf1e36529564407e78285fda06b192b644a5bf4309b2f8d9df
-MISC metadata.xml 249 RMD160 053e31dbee7ebb042316ebe35284efda8a99ecf1 SHA1 00c981a528eff3ed991c5fd2e3f1ac0018fe82d2 SHA256 e31b65ec4e3e20698e1a4f52154b6fb1e9524c27b695547426ec369864612e03
+EBUILD moc-2.5.0_alpha3-r2.ebuild 2322 RMD160 9dbf4a9ab277cf6e3a6d0b40caa3ed061a01ab7d SHA1 5a31bf80fd5e2f81c94d688d65079728639a762f SHA256 9af1604d89e5b926060feb056b3547c057fe5041c9aab87e6f9ddcf322b18761
+MISC ChangeLog 9147 RMD160 80820778934600a494ee95d4db1d4906fd964cff SHA1 515922bc8ae4443ff38499cefb286702d00e6581 SHA256 d375ce6d4cd42b051bbf664e4c2bfca9364a9e12c9cebda4ab39ebb5c65b26fd
+MISC metadata.xml 244 RMD160 0f687a8096aa4afe69e958cf8cc4eb62361694d2 SHA1 14fe5a7bc2710d0240e9208786b24f409e71b179 SHA256 3f55674c364d24e3977d896f3bc95745716c55817511c3fc7282523da0aca164
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
index dd4972fe798e..be1180b24966 100644
--- a/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch
+++ b/media-sound/moc/files/moc-2.5.0_alpha3-ffmpegheaders.patch
@@ -26,3 +26,30 @@ Index: moc-2.5.0-alpha3/decoder_plugins/ffmpeg/ffmpeg.c
  
  /* FFmpeg also likes common names, without that, our common.h and log.h would
   * not be included. */
+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
+@@ -228,12 +228,12 @@
+ {
+ 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
+ 	int ret;
+-	int data_size;
+ 	char avbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof(int16_t)];
+ 	AVPacket pkt;
+ 	uint8_t *pkt_data;
+ 	int pkt_size = 0;
+ 	int filled = 0;
++	int data_size = sizeof(avbuf);
+ 
+ 	decoder_error_clear (&data->error);
+ 
+@@ -276,7 +276,7 @@
+ 		while (pkt_size) {
+ 			int len;
+ 		
+-			len = avcodec_decode_audio (data->enc, (int16_t *)avbuf,
++			len = avcodec_decode_audio2 (data->enc, (int16_t *)avbuf,
+ 					&data_size, pkt_data, pkt_size);
+ 			debug ("Decoded %dB", data_size);
+ 
diff --git a/media-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
index 85bb59d35272..c338a276b4d0 100644
--- a/media-sound/moc/metadata.xml
+++ b/media-sound/moc/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sound</herd>
-  <use>
-    <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
-  </use>
+	<herd>sound</herd>
+	<use>
+		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild b/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild
index 3077464d58fd..a7258e54c142 100644
--- a/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild
+++ b/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild
@@ -1,11 +1,11 @@
 # 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-r2.ebuild,v 1.7 2008/07/17 18:56:29 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/moc/moc-2.5.0_alpha3-r2.ebuild,v 1.8 2009/05/11 18:03:30 ssuominen Exp $
 
+EAPI=2
 inherit autotools eutils
 
 MY_P=${P/_/-}
-
 MOC_M4_VER=1
 
 DESCRIPTION="Music On Console - ncurses interface for playing audio files"
@@ -40,9 +40,7 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}"/${P}-faad2.patch \
 		"${FILESDIR}"/${P}-ffmpegheaders.patch \
 		"${FILESDIR}"/${P}-libtool22.patch \
@@ -51,8 +49,9 @@ src_unpack() {
 	AT_M4DIR="m4" eautoreconf
 }
 
-src_compile() {
-	econf --without-rcc \
+src_configure() {
+	econf \
+		--without-rcc \
 		$(use_with aac) \
 		$(use_with jack) \
 		$(use_with mad mp3) \
@@ -69,11 +68,10 @@ src_compile() {
 		$(use_with libsamplerate samplerate) \
 		$(use_with curl) \
 		$(use_enable debug)
-	emake || die "emake failed."
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO *.example
 	rm -rf "${D}"/usr/share/doc/${PN}
 }