Date: Sunday, January 24, 2010 @ 19:43:30
Author: eric
Revision: 65200
Merged revisions 58403,65199 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/moc/trunk
........
r58403 | eric | 2009-11-07 13:14:17 -0500 (Sat, 07 Nov 2009) | 1 line
Fixed optdepends array syntax (close FS#16053)
........
r65199 | eric | 2010-01-24 19:43:08 -0500 (Sun, 24 Jan 2010) | 2 lines
upgpkg: moc 2.5.0_alpha4-1
Upstream update to unstable series, Fixed aac support (close FS#13164)
........
Modified:
moc/repos/extra-i686/ (properties)
moc/repos/extra-i686/ChangeLog
moc/repos/extra-i686/PKGBUILD
Deleted:
moc/repos/extra-i686/moc-2.4.4-ffmpeg.diff
-----------------------+
ChangeLog | 10 ++++++++++
PKGBUILD | 22 ++++++++++++----------
moc-2.4.4-ffmpeg.diff | 22 ----------------------
3 files changed, 22 insertions(+), 32 deletions(-)
Property changes on: moc/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /moc/trunk:1-30648
+ /moc/trunk:1-65199
Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2010-01-25 00:43:08 UTC (rev 65199)
+++ extra-i686/ChangeLog 2010-01-25 00:43:30 UTC (rev 65200)
@@ -1,3 +1,13 @@
+2010-01-24 Eric Belanger <[email protected]>
+
+ * moc 2.5.0_alpha4-1
+ * Upstream update to unstable series
+ * Fixed aac support (close FS#13164)
+
+2009-11-07 Eric Belanger <[email protected]>
+
+ * Fixed optdepends array syntax (close FS#16053)
+
2009-03-21 Eric Belanger <[email protected]>
* moc 2.4.4-3
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2010-01-25 00:43:08 UTC (rev 65199)
+++ extra-i686/PKGBUILD 2010-01-25 00:43:30 UTC (rev 65200)
@@ -3,24 +3,26 @@
# Contributor: dorphell <[email protected]>
pkgname=moc
-pkgver=2.4.4
-pkgrel=3
+pkgver=2.5.0_alpha4
+pkgrel=1
pkgdesc="An ncurses console audio player with support for the mp3, ogg, and
wave formats"
arch=('i686' 'x86_64')
url="http://moc.daper.net/";
license=('GPL')
-depends=('libmad' 'libid3tag' 'jack-audio-connection-kit' 'curl>=7.16.2'
'libsamplerate' 'libtool')
+depends=('libmad' 'libid3tag' 'jack-audio-connection-kit' 'curl'
'libsamplerate' 'libtool')
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')
+optdepends=('speex: for using the speex plugin' 'ffmpeg: for using the ffmpeg
plugin' \
+ 'taglib: for using the musepack plugin' 'libmpcdec: for using the
musepack plugin')
options=('!libtool')
-source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2
moc-2.4.4-ffmpeg.diff)
-md5sums=('647c770a5542a4ae5437386807a89796' '2e6958ddbb4cd0aa7bdf6c3235782381')
+source=(ftp://ftp.daper.net/pub/soft/moc/unstable/${pkgname}-${pkgver/_/-}.tar.bz2)
+md5sums=('2dd0cb6481d77fda09c58ec3154a21c0')
+sha1sums=('ca55b3bed0f3f3f352ca43078208ab63e20f40fc')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -p1 < ../moc-2.4.4-ffmpeg.diff || return 1
+ cd "${srcdir}/${pkgname}-${pkgver/_/-}"
sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|'
decoder_plugins/ffmpeg/ffmpeg.c || return 1
- ./configure --prefix=/usr --without-rcc || return 1
+# Disabling aac to use the external ffmpeg to play them (FS#13164)
+ ./configure --prefix=/usr --without-rcc --without-aac || return 1
make || return 1
- make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR="${pkgdir}" install || return 1
}
Deleted: extra-i686/moc-2.4.4-ffmpeg.diff
===================================================================
--- extra-i686/moc-2.4.4-ffmpeg.diff 2010-01-25 00:43:08 UTC (rev 65199)
+++ extra-i686/moc-2.4.4-ffmpeg.diff 2010-01-25 00:43:30 UTC (rev 65200)
@@ -1,22 +0,0 @@
-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);
-
