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

2011-01-28 Thread 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  
-
-   * cmus 2.3.3-1
-   * Upstream update
-
-2010-05020  Ionut Biru 
-
-   * cmus 2.3.2-1
-   * upstream release
-
-2010-03-07  Andrea Scarpino 
-   * cmus 2.3.0-1
-   * rebuilt against libmp4v2 1.9.1
-
-2010-01-10  Ionut Biru 
-
-   * cmus 2.2.0-10
-   * Rebuilt against ffmpeg 20100108
-
-2009-04-19  Eric Belanger  
-
-   * cmus 2.2.0-9
-   * Updated ffmpeg versioned depends
-
-2009-02-19  Eric Belanger  
-
-   * cmus 2.2.0-8
-   * Rebuilt against faad2 2.7
-
-2008-07-19  Eric Belanger  
-
-   * cmus 2.2.0-6
-   * Rebuilt agains faad2 2.6.1
-
-2008-07-04  Eric Belanger  
-
-   * cmus 2.2.0-5
-   * rebuilt against ffmpeg 20080625
-
-2007-10-29 Aaron Griffin 
-* 2.2.0-3
-Removed arts support (FS#8341)
-Added flac and libmad

Modified: PKGBUILD
===
--- PKGBUILD2011-01-28 21:39:47 UTC (rev 108010)
+++ PKGBUILD2011-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
 }



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

2010-07-05 Thread Eric Bélanger
Date: Monday, July 5, 2010 @ 22:23:10
  Author: eric
Revision: 84974

upgpkg: cmus 2.3.3-1
Upstream update, Removed old patch

Modified:
  cmus/trunk/ChangeLog
  cmus/trunk/PKGBUILD
Deleted:
  cmus/trunk/fix_format_print.patch

+
 ChangeLog  |5 
 PKGBUILD   |   26 ++---
 fix_format_print.patch |   48 ---
 3 files changed, 16 insertions(+), 63 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-07-06 01:38:09 UTC (rev 84973)
+++ ChangeLog   2010-07-06 02:23:10 UTC (rev 84974)
@@ -1,3 +1,8 @@
+2010-07-05  Eric Belanger  
+
+   * cmus 2.3.3-1
+   * Upstream update
+
 2010-05020  Ionut Biru 
 
* cmus 2.3.2-1

Modified: PKGBUILD
===
--- PKGBUILD2010-07-06 01:38:09 UTC (rev 84973)
+++ PKGBUILD2010-07-06 02:23:10 UTC (rev 84974)
@@ -3,8 +3,8 @@
 # Contributor: dorphell 
 
 pkgname=cmus
-pkgver=2.3.2
-pkgrel=2
+pkgver=2.3.3
+pkgrel=1
 pkgdesc="A very feature-rich ncurses-based music player"
 arch=('i686' 'x86_64')
 url="http://cmus.sourceforge.net/";
@@ -13,22 +13,18 @@
 depends=('sh' 'libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2')
 makedepends=('libmp4v2')
 optdepends=('libmp4v2')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2";
-   fix_format_print.patch)
-md5sums=('47698e355cff2e7b985a22475099c100'
- '3d62fa9030cd054eb5fa0a275fd1964a')
+changelog=ChangeLog
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2";)
+md5sums=('220e875e4210a6b54882114ef7094a79')
+sha1sums=('ca8c40c86ead8af05a1ca703caa4131217832114')
 
 build() {
-  cd $srcdir/$pkgname-v$pkgver
-
-  patch -Np1 -i $srcdir/fix_format_print.patch || return 1
-
-  export CONFIG_ARTS=n
-  ./configure prefix=/usr || return 1
-  make || return 1
+  cd "$srcdir/$pkgname-v$pkgver"
+  ./configure prefix=/usr CONFIG_ARTS=n
+  make
 }
 
 package() {
-  cd $srcdir/$pkgname-v$pkgver
-  make DESTDIR=$pkgdir install || return 1
+  cd "$srcdir/$pkgname-v$pkgver"
+  make DESTDIR="$pkgdir" install
 }

Deleted: fix_format_print.patch
===
--- fix_format_print.patch  2010-07-06 01:38:09 UTC (rev 84973)
+++ fix_format_print.patch  2010-07-06 02:23:10 UTC (rev 84974)
@@ -1,48 +0,0 @@
-From 2e679c66554cc0205779a72b82ddcc0175f571a6 Mon Sep 17 00:00:00 2001
-From: Gregory Petrosyan 
-Date: Sun, 23 May 2010 20:02:58 +0400
-Subject: [PATCH] Fix format_print()'s buffer width calculation
-
-This solves reported memory corruptions and crashes.
-Looks like this bug was uncovered due to a GCC upgrade.
-
-Reported-by: Vlastimil Kotas 
-Reported-by: evinupavi...@arcor.de
-Triaged-by: Xavier Chantry 
-Acked-by: Xavier Chantry 
-Signed-off-by: Gregory Petrosyan 

- ui_curses.c |8 +---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/ui_curses.c b/ui_curses.c
-index 0a390a0..ce6d334 100644
 a/ui_curses.c
-+++ b/ui_curses.c
-@@ -104,7 +104,9 @@ static char print_buffer[512];
- /* destination buffer for utf8_encode and utf8_decode */
- static char conv_buffer[512];
- 
--#define print_buffer_size (sizeof(print_buffer) - 1)
-+/* one character can take up to 4 bytes in UTF-8 */
-+#define print_buffer_max_width (sizeof(print_buffer) / 4 - 1)
-+
- static int using_utf8;
- 
- static const char *t_ts;
-@@ -1181,10 +1183,10 @@ static void do_update_titleline(void)
- 
-   /* set window title */
-   if (use_alt_format) {
--  format_print(print_buffer, sizeof(print_buffer) - 1,
-+  format_print(print_buffer, print_buffer_max_width,
-   window_title_alt_format, track_fopts);
-   } else {
--  format_print(print_buffer, sizeof(print_buffer) - 1,
-+  format_print(print_buffer,  print_buffer_max_width,
-   window_title_format, track_fopts);
-   }
- 
--- 
-1.6.1
-



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

2010-05-20 Thread Ionut Biru
Date: Thursday, May 20, 2010 @ 12:05:32
  Author: ibiru
Revision: 80627

upgpkg: cmus 2.3.2-1
update to 2.3.2

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

---+
 ChangeLog |5 +
 PKGBUILD  |9 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-05-20 15:57:48 UTC (rev 80626)
+++ ChangeLog   2010-05-20 16:05:32 UTC (rev 80627)
@@ -1,3 +1,8 @@
+2010-05020  Ionut Biru 
+
+   * cmus 2.3.2-1
+   * upstream release
+
 2010-03-07  Andrea Scarpino 
* cmus 2.3.0-1
* rebuilt against libmp4v2 1.9.1

Modified: PKGBUILD
===
--- PKGBUILD2010-05-20 15:57:48 UTC (rev 80626)
+++ PKGBUILD2010-05-20 16:05:32 UTC (rev 80627)
@@ -3,8 +3,8 @@
 # Contributor: dorphell 
 
 pkgname=cmus
-pkgver=2.3.0
-pkgrel=3
+pkgver=2.3.2
+pkgrel=1
 pkgdesc="A very feature-rich ncurses-based music player"
 arch=('i686' 'x86_64')
 url="http://cmus.sourceforge.net/";
@@ -14,13 +14,10 @@
 makedepends=('libmp4v2')
 optdepends=('libmp4v2')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2";)
-md5sums=('8039df4b08b9cbc2e050ab2922e6d99d')
+md5sums=('47698e355cff2e7b985a22475099c100')
 
 build() {
   cd $srcdir/$pkgname-v$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 || return 1



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

2010-03-07 Thread Andrea Scarpino
Date: Sunday, March 7, 2010 @ 06:54:23
  Author: andrea
Revision: 71470

upgpkg: cmus 2.3.0-2
rebuilt with libmp4v2 1.9

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

---+
 ChangeLog |4 
 PKGBUILD  |   12 +---
 2 files changed, 13 insertions(+), 3 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-03-07 11:13:19 UTC (rev 71469)
+++ ChangeLog   2010-03-07 11:54:23 UTC (rev 71470)
@@ -1,3 +1,7 @@
+2010-03-07  Andrea Scarpino 
+   * cmus 2.3.0-1
+   * rebuilt against libmp4v2 1.9.1
+
 2010-01-10  Ionut Biru 
 
* cmus 2.2.0-10

Modified: PKGBUILD
===
--- PKGBUILD2010-03-07 11:13:19 UTC (rev 71469)
+++ PKGBUILD2010-03-07 11:54:23 UTC (rev 71470)
@@ -4,14 +4,16 @@
 
 pkgname=cmus
 pkgver=2.3.0
-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=(libao libmpcdec 'ffmpeg' flac libmad 'faad2')
-source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-v$pkgver.tar.bz2)
+depends=('sh' 'libao' 'libmpcdec' 'ffmpeg' 'flac' 'libmad' 'faad2')
+makedepends=('libmp4v2')
+optdepends=('libmp4v2')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-v$pkgver.tar.bz2";)
 md5sums=('8039df4b08b9cbc2e050ab2922e6d99d')
 
 build() {
@@ -23,5 +25,9 @@
   export CONFIG_ARTS=n
   ./configure prefix=/usr || return 1
   make || return 1
+}
+
+package() {
+  cd $srcdir/$pkgname-v$pkgver
   make DESTDIR=$pkgdir install || return 1
 }



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

2010-01-10 Thread Ionut Biru
Date: Sunday, January 10, 2010 @ 13:46:33
  Author: ibiru
Revision: 62626

upgpkg: cmus 2.2.0-10
ffmpeg rebuild

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

---+
 ChangeLog |5 +
 PKGBUILD  |6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

Modified: ChangeLog
===
--- ChangeLog   2010-01-10 18:41:01 UTC (rev 62625)
+++ ChangeLog   2010-01-10 18:46:33 UTC (rev 62626)
@@ -1,3 +1,8 @@
+2010-01-10  Ionut Biru 
+
+   * cmus 2.2.0-10
+   * Rebuilt against ffmpeg 20100108
+
 2009-04-19  Eric Belanger  
 
* cmus 2.2.0-9

Modified: PKGBUILD
===
--- PKGBUILD2010-01-10 18:41:01 UTC (rev 62625)
+++ PKGBUILD2010-01-10 18:46:33 UTC (rev 62626)
@@ -4,13 +4,13 @@
 
 pkgname=cmus
 pkgver=2.2.0
-pkgrel=9
+pkgrel=10
 pkgdesc="A very feature-rich ncurses-based music player"
-arch=(i686 x86_64)
+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=(libao libmpcdec 'ffmpeg>=0.5' flac libmad 'faad2>=2.7')
+depends=(libao libmpcdec 'ffmpeg>=20100108' flac libmad 'faad2>=2.7')
 source=(http://mirror.greaterscope.net/cmus/$pkgname-$pkgver.tar.bz2)
 md5sums=('7a9895ecfc10cd16577c73051436962f')