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

[Eric Bélanger]

    Date: Saturday, February 21, 2009 @ 21:10:09
  Author: eric
Revision: 27450

upgpkg: cmus 2.2.0-8
    Rebuilt against faad2 2.7

Modified:
  cmus/trunk/ChangeLog
  cmus/trunk/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-02-22 02:03:42 UTC (rev 27449)
+++ ChangeLog	2009-02-22 02:10:09 UTC (rev 27450)
@@ -1,3 +1,8 @@
+2009-02-19  Eric Belanger  <eric at archlinux.org>
+
+	* cmus 2.2.0-8
+	* Rebuilt against faad2 2.7
+
 2008-07-19  Eric Belanger  <eric at archlinux.org>
 
 	* cmus 2.2.0-6

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-02-22 02:03:42 UTC (rev 27449)
+++ PKGBUILD	2009-02-22 02:10:09 UTC (rev 27450)
@@ -4,24 +4,24 @@
 
 pkgname=cmus
 pkgver=2.2.0
-pkgrel=7
+pkgrel=8
 pkgdesc="A very feature-rich ncurses-based music player"
+arch=(i686 x86_64)
 url="http://cmus.sourceforge.net/"
-arch=(i686 x86_64)
 license=('GPL')
 # namcap assured me it was safe to remove ncurses and the like... /shrug
-depends=(libao libmpcdec 'ffmpeg>=20080625' flac libmad 'faad2>=2.6.1')
+depends=(libao libmpcdec 'ffmpeg>=20080625' flac libmad 'faad2>=2.7')
 source=(http://mirror.greaterscope.net/cmus/$pkgname-$pkgver.tar.bz2)
 md5sums=('7a9895ecfc10cd16577c73051436962f')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ffmpeg.c
-  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ffmpeg.c
-  sed -i 's|ffmpeg/avio.h|libavformat/avio.h|' ffmpeg.c
+  cd $srcdir/$pkgname-$pkgver
+  sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' ffmpeg.c || return 1
+  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ffmpeg.c || return 1
+  sed -i 's|ffmpeg/avio.h|libavformat/avio.h|' ffmpeg.c || return 1
 
   export CONFIG_ARTS=n
-  ./configure prefix=/usr
+  ./configure prefix=/usr || return 1
   make || return 1
-  make DESTDIR=$startdir/pkg install
+  make DESTDIR=$pkgdir install || return 1
 }