[arch-commits] Commit in moc/trunk (PKGBUILD)

[Rémy Oudompheng]

    Date: Tuesday, January 25, 2011 @ 15:51:09
  Author: remy
Revision: 107458

upgpkg: moc 2.4.4-3
Rebuild with a fix for latest ffmpeg

Modified:
  moc/trunk/PKGBUILD

----------+
 PKGBUILD |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-25 20:25:31 UTC (rev 107457)
+++ PKGBUILD	2011-01-25 20:51:09 UTC (rev 107458)
@@ -5,7 +5,7 @@
 
 pkgname=moc
 pkgver=2.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64')
 url="http://moc.daper.net/"
@@ -26,18 +26,19 @@
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
-	sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c || return 1
+	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)
 	./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 || return 1
-	make || return 1
+	    --with-samplerate --with-curl
+	make
 }
 
 package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
-	make DESTDIR=${pkgdir} install || return 1
+	make DESTDIR=${pkgdir} install
 }