[arch-commits] Commit in moc/repos (4 files)

[Eric Bélanger]

    Date: Saturday, March 7, 2009 @ 19:23:45
  Author: eric
Revision: 29341

Merged revisions 29317 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/moc/trunk

........
  r29317 | eric | 2009-03-07 18:05:58 -0500 (Sat, 07 Mar 2009) | 2 lines
  
  upgpkg: moc 2.4.4-2
      Added patch to fix playback of WMA files
........

Added:
  moc/repos/extra-i686/moc-2.4.4-ffmpeg.diff
    (from rev 29317, moc/trunk/moc-2.4.4-ffmpeg.diff)
Modified:
  moc/repos/extra-i686/	(properties)
  moc/repos/extra-i686/ChangeLog
  moc/repos/extra-i686/PKGBUILD

-----------------------+
 ChangeLog             |    5 +++++
 PKGBUILD              |    8 ++++----
 moc-2.4.4-ffmpeg.diff |   22 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)


Property changes on: moc/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /moc/trunk:1-23436
   + /moc/trunk:1-29340

Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog	2009-03-08 00:18:55 UTC (rev 29340)
+++ extra-i686/ChangeLog	2009-03-08 00:23:45 UTC (rev 29341)
@@ -1,3 +1,8 @@
+2009-03-07  Eric Belanger  <eric at archlinux.org>
+
+	* moc 2.4.4-2
+	* Added patch to fix playback of WMA files
+
 2009-01-11  Eric Belanger  <eric at archlinux.org>
 
 	* moc 2.4.4-1

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-08 00:18:55 UTC (rev 29340)
+++ extra-i686/PKGBUILD	2009-03-08 00:23:45 UTC (rev 29341)
@@ -4,7 +4,7 @@
 
 pkgname=moc
 pkgver=2.4.4
-pkgrel=1
+pkgrel=2
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64')
 url="http://moc.daper.net/"
@@ -13,12 +13,12 @@
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec')
 optdepends=('speex: for using the speex plugin' 'ffmpeg: for using the ffmpeg plugin' 'taglib and libmpcdec: for using the musepack plugin')
 options=('!libtool')
-source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('647c770a5542a4ae5437386807a89796')
-sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db')
+source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 moc-2.4.4-ffmpeg.diff)
+md5sums=('647c770a5542a4ae5437386807a89796' '2e6958ddbb4cd0aa7bdf6c3235782381')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -p1 < ../moc-2.4.4-ffmpeg.diff || return 1
   sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c || return 1
   ./configure --prefix=/usr --without-rcc || return 1
   make || return 1

Copied: moc/repos/extra-i686/moc-2.4.4-ffmpeg.diff (from rev 29317, moc/trunk/moc-2.4.4-ffmpeg.diff)
===================================================================
--- extra-i686/moc-2.4.4-ffmpeg.diff	                        (rev 0)
+++ extra-i686/moc-2.4.4-ffmpeg.diff	2009-03-08 00:23:45 UTC (rev 29341)
@@ -0,0 +1,22 @@
+diff -Naur moc-2.4.4/decoder_plugins/ffmpeg/ffmpeg.c moc-2.4.4-new/decoder_plugins/ffmpeg/ffmpeg.c
+--- moc-2.4.4/decoder_plugins/ffmpeg/ffmpeg.c	2008-04-09 14:44:00.000000000 -0400
++++ moc-2.4.4-new/decoder_plugins/ffmpeg/ffmpeg.c	2009-03-07 01:31:48.000000000 -0500
+@@ -222,8 +222,8 @@
+ {
+ 	struct ffmpeg_data *data = (struct ffmpeg_data *)prv_data;
+ 	int ret;
+-	int data_size;
+ 	char avbuf[AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof(int16_t)];
++	int data_size = sizeof(avbuf);
+ 	AVPacket pkt;
+ 	uint8_t *pkt_data;
+ 	int pkt_size = 0;
+@@ -270,7 +270,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);
+