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

[Eric Bélanger]

    Date: Friday, January 28, 2011 @ 21:21:03
  Author: eric
Revision: 108011

upgpkg: cmus 2.3.3-2
Added modplug, wavpack and pulse plugins (close FS#22640), Changed depends to optdepends, Removed ChangeLog

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

-----------+
 ChangeLog |   43 -------------------------------------------
 PKGBUILD  |   23 +++++++++++++++++------
 2 files changed, 17 insertions(+), 49 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2011-01-28 21:39:47 UTC (rev 108010)
+++ ChangeLog	2011-01-29 02:21:03 UTC (rev 108011)
@@ -1,43 +0,0 @@
-2010-07-05  Eric Belanger  <eric at archlinux.org>
-
-	* cmus 2.3.3-1
-	* Upstream update
-
-2010-05020  Ionut Biru <ibiru at archlinux.org>
-
-	* cmus 2.3.2-1
-	* upstream release
-
-2010-03-07  Andrea Scarpino <andrea at archlinux.org>
-	* cmus 2.3.0-1
-	* rebuilt against libmp4v2 1.9.1
-
-2010-01-10  Ionut Biru <ionut at archlinux.ro>
-
-	* cmus 2.2.0-10
-	* Rebuilt against ffmpeg 20100108
-
-2009-04-19  Eric Belanger  <eric at archlinux.org>
-
-	* cmus 2.2.0-9
-	* Updated ffmpeg versioned depends
-
-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
-	* Rebuilt agains faad2 2.6.1
-
-2008-07-04  Eric Belanger  <eric at archlinux.org>
-
-	* cmus 2.2.0-5
-	* rebuilt against ffmpeg 20080625
-
-2007-10-29 Aaron Griffin <aaronmgriffin at gmail.com>
-* 2.2.0-3
-Removed arts support (FS#8341)
-Added flac and libmad

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-28 21:39:47 UTC (rev 108010)
+++ PKGBUILD	2011-01-29 02:21:03 UTC (rev 108011)
@@ -4,22 +4,33 @@
 
 pkgname=cmus
 pkgver=2.3.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A very feature-rich ncurses-based music player"
 arch=('i686' 'x86_64')
 url="http://cmus.sourceforge.net/"
 license=('GPL')
-# namcap assured me it was safe to remove ncurses and the like... /shrug
-depends=('sh' 'libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2')
-makedepends=('libmp4v2')
-optdepends=('libmp4v2')
-changelog=ChangeLog
+depends=('ncurses')
+makedepends=('libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2' 'libmodplug' 'libvorbis' 'libpulse' 'wavpack')
+optdepends=('alsa-lib: for ALSA output plugin support'
+            'libao: for AO output plugin support'
+            'libpulse: for PulseAudio output plugin support'
+            'ffmpeg: for ffmpeg input plugin support'
+            'libmodplug: for modplug input plugin support'
+            'faad2: for input AAC plugin support'
+            'libmad: for mp3 input plugin support'
+            'libmpcdec: for musepack input plugin support'
+            'wavpack: for wavpack input plugin support'
+            'libvorbis: for vorbis input plugin support'
+            'flac: for flac input plugin support')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2")
 md5sums=('220e875e4210a6b54882114ef7094a79')
 sha1sums=('ca8c40c86ead8af05a1ca703caa4131217832114')
 
 build() {
   cd "$srcdir/$pkgname-v$pkgver"
+  sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' configure ffmpeg.c
+  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' ffmpeg.c
+  sed -i 's|ffmpeg/avio.h|libavformat/avio.h|' ffmpeg.c
   ./configure prefix=/usr CONFIG_ARTS=n
   make
 }