[arch-commits] CVS update of extra/lib/smpeg (PKGBUILD smpeg-0.4.4-gcc41.patch)

[Eric Belanger]

    Date: Monday, December 17, 2007 @ 23:55:40
  Author: eric
    Path: /home/cvs-extra/extra/lib/smpeg

   Added: smpeg-0.4.4-gcc41.patch (1.1)
Modified: PKGBUILD (1.3 -> 1.4)

upgpkg: smpeg 0.4.4-3
added license and mesa makedepends, updated url, added patch for gcc 4.1


-------------------------+
 PKGBUILD                |   22 +++++++++++++---------
 smpeg-0.4.4-gcc41.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 9 deletions(-)


Index: extra/lib/smpeg/PKGBUILD
diff -u extra/lib/smpeg/PKGBUILD:1.3 extra/lib/smpeg/PKGBUILD:1.4
--- extra/lib/smpeg/PKGBUILD:1.3	Sun May 28 07:22:03 2006
+++ extra/lib/smpeg/PKGBUILD	Mon Dec 17 23:55:40 2007
@@ -1,21 +1,25 @@
-# $Id: PKGBUILD,v 1.3 2006/05/28 11:22:03 notz Exp $
-# Maintainer: Jan de Groot <jgc at archlinux.org>
+# $Id: PKGBUILD,v 1.4 2007/12/18 04:55:40 eric Exp $
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
 
 pkgname=smpeg
 pkgver=0.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="SDL MPEG Player Library"
-arch=(i686 x86_64)
-url="http://www.lokigames.com/development/smpeg.php3"
+arch=('i686' 'x86_64')
+url="http://icculus.org/smpeg/"
+license=('LGPL')
 depends=('sdl')
-makedepends=('gtk')
-source=(ftp://sunsite.dk/pub/os/linux/loki/open-source/smpeg/$pkgname-$pkgver.tar.gz)
-md5sums=('59c76ac704088ef5539210190c4e1fe3')
+makedepends=('gtk' 'mesa')
+options=('!libtool' '!makeflags')
+source=(http://mirrors.dotsrc.org/lokigames/open-source/smpeg/$pkgname-$pkgver.tar.gz smpeg-0.4.4-gcc41.patch)
+md5sums=('59c76ac704088ef5539210190c4e1fe3' '8b979a58307d7196655758bd3d2466c4')
+sha1sums=('6d7f4449472e6270ab435b2224f3fad951c35259' '7d9a2ad7f6b702dfe3adcb87601d9b55022bbd1e')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -p1 < ../smpeg-0.4.4-gcc41.patch
   ./configure --prefix=/usr
   make LDFLAGS+=-lstdc++ || return 1
   make DESTDIR=$startdir/pkg install
-  find $startdir/pkg -name '*.la' -exec rm {} \;
 }
Index: extra/lib/smpeg/smpeg-0.4.4-gcc41.patch
diff -u /dev/null extra/lib/smpeg/smpeg-0.4.4-gcc41.patch:1.1
--- /dev/null	Mon Dec 17 23:55:40 2007
+++ extra/lib/smpeg/smpeg-0.4.4-gcc41.patch	Mon Dec 17 23:55:40 2007
@@ -0,0 +1,41 @@
+Index: MPEGaudio.h
+===================================================================
+RCS file: /cvs/cvsroot/smpeg/MPEGaudio.h,v
+retrieving revision 1.23
+diff -u -p -r1.23 MPEGaudio.h
+--- smpeg/MPEGaudio.h	17 Jul 2001 19:52:24 -0000	1.23
++++ smpeg/MPEGaudio.h	6 Dec 2005 06:10:43 -0000
+@@ -151,12 +151,6 @@ private:
+ /* The actual MPEG audio class */
+ class MPEGaudio : public MPEGerror, public MPEGaudioaction {
+ 
+-    friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
+-    friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
+-#ifdef THREADED_AUDIO
+-    friend int Decode_MPEGaudio(void *udata);
+-#endif
+-
+ public:
+     MPEGaudio(MPEGstream *stream, bool initSDL = true);
+     virtual ~MPEGaudio();
+@@ -367,6 +361,20 @@ public:
+ #define N_TIMESTAMPS 5
+ 
+   double timestamp[N_TIMESTAMPS];
++
++  /* Functions which access MPEGaudio internals */
++  friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
++  friend int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
++#ifdef THREADED_AUDIO
++  friend int Decode_MPEGaudio(void *udata);
++#endif
+ };
+ 
++/* Need to duplicate the prototypes, this is not a typo :) */
++void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
++int Play_MPEGaudio(MPEGaudio *audio, Uint8 *stream, int len);
++#ifdef THREADED_AUDIO
++int Decode_MPEGaudio(void *udata);
++#endif
++
+ #endif /* _MPEGAUDIO_H_ */