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

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 57 insertions, 29 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/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}
 }