[arch-commits] Commit in alsaplayer/trunk (4 files)

[Eric Bélanger]

    Date: Monday, November 8, 2010 @ 19:59:46
  Author: eric
Revision: 98445

upgpkg: alsaplayer 0.99.81-1
Upstream update, Added OpenGL visual plugin, Cleaned up configure options, Removed ChangeLog and old patches

Modified:
  alsaplayer/trunk/PKGBUILD
Deleted:
  alsaplayer/trunk/ChangeLog
  alsaplayer/trunk/alsaplayer-0.99.80-glibc-2.10.patch
  alsaplayer/trunk/gcc.diff

-------------------------------------+
 ChangeLog                           |   12 ------------
 PKGBUILD                            |   34 ++++++++++++++++------------------
 alsaplayer-0.99.80-glibc-2.10.patch |   21 ---------------------
 gcc.diff                            |   10 ----------
 4 files changed, 16 insertions(+), 61 deletions(-)

Deleted: ChangeLog
===================================================================
--- ChangeLog	2010-11-08 23:54:14 UTC (rev 98444)
+++ ChangeLog	2010-11-09 00:59:46 UTC (rev 98445)
@@ -1,12 +0,0 @@
-2009-11-07  Eric Belanger  <eric at archlinux.org>
-
-	* alsaplayer 0.99.80-3
-	* Fixed optdepends array syntax (close FS#16053)
-	* Added build patch for glibc 2.10
-
-2009-02-23  Eric Belanger  <eric at archlinux.org>
-
-	* alsaplayer 0.99.80-2
-	* Added gtk2 GUI (close FS#13372)
-	* Moved depends to optdepends
-	* Added ChangeLog

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-08 23:54:14 UTC (rev 98444)
+++ PKGBUILD	2010-11-09 00:59:46 UTC (rev 98445)
@@ -1,37 +1,35 @@
 # $Id$
 # Maintainer: Eric Belanger <eric at archlinux.org>
-# Contributor: Jochem Kossen <j.kossen at home.nl>
 
 pkgname=alsaplayer
-pkgver=0.99.80
-pkgrel=3
-pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit."
+pkgver=0.99.81
+pkgrel=1
+pkgdesc="A heavily multi-threaded PCM player that tries to excercise the ALSA library and driver quite a bit"
 arch=('i686' 'x86_64')
 url="http://www.alsaplayer.org/"
 license=('GPL')
 depends=('gcc-libs')
-makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack-audio-connection-kit' 'esound')
+makedepends=('gtk2' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack' 'esound' 'mesa')
 optdepends=('gtk2: for the gtk2 GUI interface' \
+            'libgl: for the OpenGL visual plugins' \
             'esound: for ESD audio server output support' \
-            'jack-audio-connection-kit: for JACK audio server output support' \
+            'jack: for JACK audio server output support' \
             'audiofile: for support of various audio formats like AIFF, WAVE, .snd/.au' \
             'libid3tag: for flac support' 'flac: for flac support' 'libmad: for MPEG support' \
             'libsndfile: for sndfile support' 'libvorbis: for ogg vorbis support' \
             'libmikmod: for mod, s3m, it and xm formats supports')
 options=('!libtool')
-source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2 gcc.diff alsaplayer-0.99.80-glibc-2.10.patch)
-md5sums=('04f8c2321a37d15f40f9ee21251c6202' '0c1790e4744d9b085208436f5442efe0'\
-         '4f549d51173762334529d200e14afd8b')
-sha1sums=('883d590b01371840024b5a8bf0fe95b464a2ccd1' '684ac4ea9f58e63da7f4c9518196128714575066'\
-         'ac9680d3feff660db0195178753d6c92760944bf')
+source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('845c53975791ba342e316ceac8aa1527')
+sha1sums=('25817ebd1e5c36da31a88363315a1bf7a945ddfd')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 < ../gcc.diff || return 1
-  patch -p1 < ../alsaplayer-0.99.80-glibc-2.10.patch || return 1
-  ./configure --prefix=/usr --enable-esd \
-    --disable-opengl --disable-gtk --enable-jack \
-    --enable-gtk2 --enable-audiofile || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --enable-audiofile
+  make
 }
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: alsaplayer-0.99.80-glibc-2.10.patch
===================================================================
--- alsaplayer-0.99.80-glibc-2.10.patch	2010-11-08 23:54:14 UTC (rev 98444)
+++ alsaplayer-0.99.80-glibc-2.10.patch	2010-11-09 00:59:46 UTC (rev 98445)
@@ -1,21 +0,0 @@
-diff -ur alsaplayer-0.99.80.orig/input/flac/FlacPlugin.cpp alsaplayer-0.99.80/input/flac/FlacPlugin.cpp
---- alsaplayer-0.99.80.orig/input/flac/FlacPlugin.cpp	2007-10-29 23:00:16.000000000 +0200
-+++ alsaplayer-0.99.80/input/flac/FlacPlugin.cpp	2009-07-20 00:19:07.000000000 +0300
-@@ -239,7 +239,7 @@
-     else
-     {
- 	// use stream name
--	char * fname = strrchr (f->name ().c_str (), '/');
-+	const char * fname = strrchr (f->name ().c_str (), '/');
- 	if (fname)
- 	{
- 	    fname++;
-@@ -270,7 +270,7 @@
- 	if (strncmp(name, "http://", 7) == 0) {
- 		return 0.0;
- 	}
--	char *ext = strrchr(name, '.');
-+	const char *ext = strrchr(name, '.');
- 	if (!ext)
- 		return 0.0;
- 	ext++;

Deleted: gcc.diff
===================================================================
--- gcc.diff	2010-11-08 23:54:14 UTC (rev 98444)
+++ gcc.diff	2010-11-09 00:59:46 UTC (rev 98445)
@@ -1,10 +0,0 @@
---- app/ControlSocket.cpp.orig	2008-07-04 22:34:38.000000000 +0200
-+++ app/ControlSocket.cpp	2008-07-04 22:35:53.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <sys/un.h>
- #include <csignal>
- #include <pwd.h>
-+#include <climits>
- #include "control.h"
- #include "message.h"
- #include "Playlist.h"