[arch-commits] Commit in smpeg/repos (6 files)
Jan Steffens
heftig at nymeria.archlinux.org
Wed Mar 5 09:33:16 UTC 2014
Date: Wednesday, March 5, 2014 @ 10:33:16
Author: heftig
Revision: 206703
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
smpeg/repos/extra-i686/PKGBUILD
(from rev 206702, smpeg/trunk/PKGBUILD)
smpeg/repos/extra-x86_64/PKGBUILD
(from rev 206702, smpeg/trunk/PKGBUILD)
Deleted:
smpeg/repos/extra-i686/PKGBUILD
smpeg/repos/extra-i686/smpeg-0.4.4-gcc41.patch
smpeg/repos/extra-x86_64/PKGBUILD
smpeg/repos/extra-x86_64/smpeg-0.4.4-gcc41.patch
--------------------------------------+
/PKGBUILD | 58 +++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 36 --------------------
extra-i686/smpeg-0.4.4-gcc41.patch | 41 -----------------------
extra-x86_64/PKGBUILD | 36 --------------------
extra-x86_64/smpeg-0.4.4-gcc41.patch | 41 -----------------------
5 files changed, 58 insertions(+), 154 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-03-05 09:27:44 UTC (rev 206702)
+++ extra-i686/PKGBUILD 2014-03-05 09:33:16 UTC (rev 206703)
@@ -1,36 +0,0 @@
-# $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=('!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/extra-i686/PKGBUILD (from rev 206702, smpeg/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-03-05 09:33:16 UTC (rev 206703)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=smpeg
+pkgver=0.4.5
+pkgrel=1
+pkgdesc="SDL MPEG Player Library"
+arch=('i686' 'x86_64')
+url="http://icculus.org/smpeg/"
+license=('LGPL')
+depends=('sdl')
+makedepends=('mesa' 'glu')
+optdepends=('glu: to use glmovie')
+source=("$pkgname-$pkgver::svn://svn.icculus.org/smpeg/tags/release_${pkgver//./_}")
+md5sums=('SKIP')
+
+build() {
+ cd $pkgname-$pkgver
+ ./autogen.sh
+ ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-i686/smpeg-0.4.4-gcc41.patch
===================================================================
--- extra-i686/smpeg-0.4.4-gcc41.patch 2014-03-05 09:27:44 UTC (rev 206702)
+++ extra-i686/smpeg-0.4.4-gcc41.patch 2014-03-05 09:33:16 UTC (rev 206703)
@@ -1,41 +0,0 @@
-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_ */
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-03-05 09:27:44 UTC (rev 206702)
+++ extra-x86_64/PKGBUILD 2014-03-05 09:33:16 UTC (rev 206703)
@@ -1,36 +0,0 @@
-# $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=('!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/extra-x86_64/PKGBUILD (from rev 206702, smpeg/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-03-05 09:33:16 UTC (rev 206703)
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=smpeg
+pkgver=0.4.5
+pkgrel=1
+pkgdesc="SDL MPEG Player Library"
+arch=('i686' 'x86_64')
+url="http://icculus.org/smpeg/"
+license=('LGPL')
+depends=('sdl')
+makedepends=('mesa' 'glu')
+optdepends=('glu: to use glmovie')
+source=("$pkgname-$pkgver::svn://svn.icculus.org/smpeg/tags/release_${pkgver//./_}")
+md5sums=('SKIP')
+
+build() {
+ cd $pkgname-$pkgver
+ ./autogen.sh
+ ./configure --prefix=/usr --mandir=/usr/share/man --disable-static
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
Deleted: extra-x86_64/smpeg-0.4.4-gcc41.patch
===================================================================
--- extra-x86_64/smpeg-0.4.4-gcc41.patch 2014-03-05 09:27:44 UTC (rev 206702)
+++ extra-x86_64/smpeg-0.4.4-gcc41.patch 2014-03-05 09:33:16 UTC (rev 206703)
@@ -1,41 +0,0 @@
-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