[arch-commits] Commit in smpeg/repos (6 files)
Jan Steffens
heftig at archlinux.org
Sun Oct 7 17:15:25 UTC 2012
Date: Sunday, October 7, 2012 @ 13:15:25
Author: heftig
Revision: 168278
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
smpeg/repos/testing-i686/
smpeg/repos/testing-i686/PKGBUILD
(from rev 168277, smpeg/trunk/PKGBUILD)
smpeg/repos/testing-i686/smpeg-0.4.4-gcc41.patch
(from rev 168277, smpeg/trunk/smpeg-0.4.4-gcc41.patch)
smpeg/repos/testing-x86_64/
smpeg/repos/testing-x86_64/PKGBUILD
(from rev 168277, smpeg/trunk/PKGBUILD)
smpeg/repos/testing-x86_64/smpeg-0.4.4-gcc41.patch
(from rev 168277, smpeg/trunk/smpeg-0.4.4-gcc41.patch)
----------------------------------------+
testing-i686/PKGBUILD | 36 +++++++++++++++++++++++++++
testing-i686/smpeg-0.4.4-gcc41.patch | 41 +++++++++++++++++++++++++++++++
testing-x86_64/PKGBUILD | 36 +++++++++++++++++++++++++++
testing-x86_64/smpeg-0.4.4-gcc41.patch | 41 +++++++++++++++++++++++++++++++
4 files changed, 154 insertions(+)
Copied: smpeg/repos/testing-i686/PKGBUILD (from rev 168277, smpeg/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-10-07 17:15:25 UTC (rev 168278)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=smpeg
+pkgver=0.4.4
+pkgrel=7
+pkgdesc="SDL MPEG Player Library"
+arch=('i686' 'x86_64')
+url="http://icculus.org/smpeg/"
+license=('LGPL')
+depends=('sdl')
+makedepends=('gtk' 'mesa' 'glu')
+optdepends=('gtk: to use gtv ' 'glu: to use glmovie')
+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 ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch
+ ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
+ make LDFLAGS+=-lstdc++
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # fix aclocal warnings
+ sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4
+}
Copied: smpeg/repos/testing-i686/smpeg-0.4.4-gcc41.patch (from rev 168277, smpeg/trunk/smpeg-0.4.4-gcc41.patch)
===================================================================
--- testing-i686/smpeg-0.4.4-gcc41.patch (rev 0)
+++ testing-i686/smpeg-0.4.4-gcc41.patch 2012-10-07 17:15:25 UTC (rev 168278)
@@ -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_ */
Copied: smpeg/repos/testing-x86_64/PKGBUILD (from rev 168277, smpeg/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-10-07 17:15:25 UTC (rev 168278)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Eric Belanger <eric at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=smpeg
+pkgver=0.4.4
+pkgrel=7
+pkgdesc="SDL MPEG Player Library"
+arch=('i686' 'x86_64')
+url="http://icculus.org/smpeg/"
+license=('LGPL')
+depends=('sdl')
+makedepends=('gtk' 'mesa' 'glu')
+optdepends=('gtk: to use gtv ' 'glu: to use glmovie')
+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 ${srcdir}/${pkgname}-${pkgver}
+ patch -p1 -i $srcdir/smpeg-0.4.4-gcc41.patch
+ ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
+ make LDFLAGS+=-lstdc++
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # fix aclocal warnings
+ sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4
+}
Copied: smpeg/repos/testing-x86_64/smpeg-0.4.4-gcc41.patch (from rev 168277, smpeg/trunk/smpeg-0.4.4-gcc41.patch)
===================================================================
--- testing-x86_64/smpeg-0.4.4-gcc41.patch (rev 0)
+++ testing-x86_64/smpeg-0.4.4-gcc41.patch 2012-10-07 17:15:25 UTC (rev 168278)
@@ -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_ */
More information about the arch-commits
mailing list