From 962d1e81a62d7259ccb686da1a44de2bb28e73a5 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 8 Oct 2012 00:19:21 -0700 Subject: Mon Oct 8 00:19:21 PDT 2012 --- testing/smpeg/PKGBUILD | 36 ++++++++++++++++++++++++++++++ testing/smpeg/smpeg-0.4.4-gcc41.patch | 41 +++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) create mode 100644 testing/smpeg/PKGBUILD create mode 100644 testing/smpeg/smpeg-0.4.4-gcc41.patch (limited to 'testing/smpeg') diff --git a/testing/smpeg/PKGBUILD b/testing/smpeg/PKGBUILD new file mode 100644 index 000000000..96b7420ee --- /dev/null +++ b/testing/smpeg/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 168278 2012-10-07 17:15:25Z heftig $ +# Maintainer: Eric Belanger +# Contributor: Jan de Groot + +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 +} diff --git a/testing/smpeg/smpeg-0.4.4-gcc41.patch b/testing/smpeg/smpeg-0.4.4-gcc41.patch new file mode 100644 index 000000000..4a0eeb453 --- /dev/null +++ b/testing/smpeg/smpeg-0.4.4-gcc41.patch @@ -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_ */ -- cgit v1.2.3-54-g00ecf