[arch-commits] CVS update of extra/multimedia/alsaplayer (PKGBUILD flac_patch.diff)

[Eric Belanger]

    Date: Saturday, December 15, 2007 @ 23:26:00
  Author: eric
    Path: /home/cvs-extra/extra/multimedia/alsaplayer

Modified: PKGBUILD (1.17 -> 1.18)
 Removed: flac_patch.diff (1.1)

upgpkg: alsaplayer 0.99.80-1
PKGBUILD cleanup, removed old patch


-----------------+
 PKGBUILD        |    6 +---
 flac_patch.diff |   66 ------------------------------------------------------
 2 files changed, 2 insertions(+), 70 deletions(-)


Index: extra/multimedia/alsaplayer/PKGBUILD
diff -u extra/multimedia/alsaplayer/PKGBUILD:1.17 extra/multimedia/alsaplayer/PKGBUILD:1.18
--- extra/multimedia/alsaplayer/PKGBUILD:1.17	Sat Dec 15 21:04:09 2007
+++ extra/multimedia/alsaplayer/PKGBUILD	Sat Dec 15 23:26:00 2007
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.17 2007/12/16 02:04:09 travis Exp $
+# $Id: PKGBUILD,v 1.18 2007/12/16 04:26:00 eric Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 # Contributor: Jochem Kossen <j.kossen at home.nl>
 
@@ -10,15 +10,13 @@
 url="http://www.alsaplayer.org/"
 arch=('i686' 'x86_64')
 depends=('gtk' 'libid3tag' 'libvorbis' 'libmad' 'libmikmod' 'jack-audio-connection-kit>=0.102.20-2' 'esd' 'gcc-libs')
-source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2) # flac_patch.diff)
+source=(http://www.alsaplayer.org/${pkgname}-${pkgver}.tar.bz2)
 md5sums=('04f8c2321a37d15f40f9ee21251c6202')
 options=('!libtool')
 
 build() {
     cd ${startdir}/src/${pkgname}-${pkgver}
     autoconf
-   #fix compilation with flac support on x86_64
-   # [ "$CARCH" = "x86_64" ] && patch -Np1 -i $startdir/flac_patch.diff
     ./configure --prefix=/usr --enable-esd \
       --disable-opengl --enable-gtk --enable-jack \
       --disable-gtk2 --enable-audiofile
Index: extra/multimedia/alsaplayer/flac_patch.diff
diff -u extra/multimedia/alsaplayer/flac_patch.diff:1.1 extra/multimedia/alsaplayer/flac_patch.diff:removed
--- extra/multimedia/alsaplayer/flac_patch.diff:1.1	Wed Jun  6 13:19:11 2007
+++ extra/multimedia/alsaplayer/flac_patch.diff	Sat Dec 15 23:26:00 2007
@@ -1,66 +0,0 @@
-diff -Naur alsaplayer-0.99.79-orig/input/flac/FlacSeekableStream.cpp alsaplayer-0.99.79/input/flac/FlacSeekableStream.cpp
---- alsaplayer-0.99.79-orig/input/flac/FlacSeekableStream.cpp	2007-04-06 16:26:32.000000000 -0400
-+++ alsaplayer-0.99.79/input/flac/FlacSeekableStream.cpp	2007-06-05 23:38:53.000000000 -0400
-@@ -255,7 +255,7 @@
- FlacSeekableStream::readCallBack (const FLAC__StreamDecoder * /*decoder*/,
- #endif
- 				  FLAC__byte buffer[],
--				  unsigned * bytes,
-+				  size_t * bytes,
- 				  void * client_data)
- {
-     if (!client_data)
-diff -Naur alsaplayer-0.99.79-orig/input/flac/FlacSeekableStream.h alsaplayer-0.99.79/input/flac/FlacSeekableStream.h
---- alsaplayer-0.99.79-orig/input/flac/FlacSeekableStream.h	2007-04-06 16:33:04.000000000 -0400
-+++ alsaplayer-0.99.79/input/flac/FlacSeekableStream.h	2007-06-05 23:39:01.000000000 -0400
-@@ -114,7 +114,7 @@
- 	readCallBack (const FLAC__StreamDecoder * decoder,
- #endif
- 		      FLAC__byte buffer[],
--		      unsigned * bytes,
-+		      size_t * bytes,
- 		      void * client_data);
- 
- #ifdef LEGACY_FLAC
-diff -Naur alsaplayer-0.99.79-orig/input/flac/FlacStream.cpp alsaplayer-0.99.79/input/flac/FlacStream.cpp
---- alsaplayer-0.99.79-orig/input/flac/FlacStream.cpp	2007-04-06 16:15:50.000000000 -0400
-+++ alsaplayer-0.99.79/input/flac/FlacStream.cpp	2007-06-05 23:39:20.000000000 -0400
-@@ -321,7 +321,7 @@
- 
- 
- FLAC__StreamDecoderReadStatus
--FlacStream::realReadCallBack (FLAC__byte buffer[], unsigned * bytes)
-+FlacStream::realReadCallBack (FLAC__byte buffer[], size_t * bytes)
- {
-     *bytes = reader_read (buffer, *bytes, _datasource);
-     return *bytes > 0 ? FLAC__STREAM_DECODER_READ_STATUS_CONTINUE :
-@@ -336,7 +336,7 @@
- FLAC__StreamDecoderReadStatus
- FlacStream::readCallBack (const FLAC__StreamDecoder *,
- 			  FLAC__byte buffer[],
--			  unsigned * bytes,
-+			  size_t * bytes,
- 			  void * client_data)
- {
-     if (!client_data)
-diff -Naur alsaplayer-0.99.79-orig/input/flac/FlacStream.h alsaplayer-0.99.79/input/flac/FlacStream.h
---- alsaplayer-0.99.79-orig/input/flac/FlacStream.h	2007-03-02 07:06:58.000000000 -0500
-+++ alsaplayer-0.99.79/input/flac/FlacStream.h	2007-06-05 23:39:30.000000000 -0400
-@@ -191,7 +191,7 @@
- 
-     FLAC__StreamDecoderReadStatus 
-                  realReadCallBack (FLAC__byte buffer[],
--				   unsigned * bytes);
-+				   size_t * bytes);
- 
- 
-  protected:
-@@ -233,7 +233,7 @@
-     static FLAC__StreamDecoderReadStatus
- 	readCallBack (const FLAC__StreamDecoder * decoder,
- 		      FLAC__byte buffer[],
--		      unsigned * bytes,
-+		      size_t * bytes,
- 		      void * client_data);
- 
-     static void errCallBack (const FLAC__StreamDecoder * decoder,