Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/emesene/PKGBUILD
	community/minidlna/PKGBUILD
	community/uzbl/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/lirc/PKGBUILD
	libre/pacman/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	testing/mesa/PKGBUILD
	testing/subversion/PKGBUILD

1 files changed, 15 insertions, 18 deletions

diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index 2df733cc2..e9712ad35 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 124292 2011-05-19 04:47:01Z eric $
+# $Id: PKGBUILD 126916 2011-06-08 17:30:45Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
-pkgver=2.4.4
-pkgrel=4
+pkgver=20110528
+pkgrel=2
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://moc.daper.net/"
 license=('GPL')
-depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool')
+depends=('libmad' 'libid3tag' 'jack' 'curl' 'libsamplerate' 'libtool' 'file')
 makedepends=('speex' 'ffmpeg' 'taglib' 'libmpcdec' 'wavpack' 'libmodplug')
 optdepends=('speex: for using the speex plugin' 
 	    'ffmpeg: for using the ffmpeg plugin'
@@ -17,31 +17,28 @@ optdepends=('speex: for using the speex plugin'
             'wavpack: for using the wavpack plugin' 
 	    'libmodplug: for using the modplug plugin')
 options=('!libtool')
-source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 \
-        gcc-undefined-symbols.diff curl-streams.diff)
-md5sums=('647c770a5542a4ae5437386807a89796'
-         'efacb8559e9145e15b0c25f8fa2a9d79'
-         'bb9be1e80762851c57075c99a612af2f')
-sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db'
-          'a811a4ac7e049914aab528d3f06a6be6634c2720'
-          'a58ca952d7f3b0ede19b95c53da96c090d0a94c4')
+source=(ftp://ftp.archlinux.org/other/moc/${pkgname}-${pkgver}.tar.xz \
+        gcc-undefined-symbols.diff)
+md5sums=('003fd01af2165264eb666040e4f586cd'
+         'efacb8559e9145e15b0c25f8fa2a9d79')
+sha1sums=('f79049136ce6616bfd6af2f5e08246a5921441cf'
+          'a811a4ac7e049914aab528d3f06a6be6634c2720')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}"
   patch -p0 -i ../gcc-undefined-symbols.diff
-  patch -p1 -i ../curl-streams.diff
-  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c
-  sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c
+
 # Disabling aac to use the external ffmpeg to play them (FS#13164)
+  ./autogen.sh
   ./configure --prefix=/usr --without-rcc --without-aac \
     --with-oss  --with-alsa  --with-jack --with-mp3 \
     --with-musepack --with-vorbis --with-flac --with-wavpack \
     --with-sndfile --with-modplug --with-ffmpeg --with-speex \
-    --with-samplerate --with-curl
+    --with-samplerate --with-curl --disable-debug
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}"
   make DESTDIR="${pkgdir}" install
 }