[arch-commits] Commit in smpeg/repos (10 files)
Allan McRae
allan at archlinux.org
Fri Sep 9 23:30:58 UTC 2011
Date: Friday, September 9, 2011 @ 19:30:58
Author: allan
Revision: 137587
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
smpeg/repos/extra-i686/PKGBUILD
(from rev 137586, smpeg/trunk/PKGBUILD)
smpeg/repos/extra-i686/smpeg-0.4.4-gcc41.patch
(from rev 137586, smpeg/trunk/smpeg-0.4.4-gcc41.patch)
smpeg/repos/extra-x86_64/PKGBUILD
(from rev 137586, smpeg/trunk/PKGBUILD)
smpeg/repos/extra-x86_64/smpeg-0.4.4-gcc41.patch
(from rev 137586, smpeg/trunk/smpeg-0.4.4-gcc41.patch)
Deleted:
smpeg/repos/extra-i686/ChangeLog
smpeg/repos/extra-i686/PKGBUILD
smpeg/repos/extra-i686/smpeg-0.4.4-gcc41.patch
smpeg/repos/extra-x86_64/ChangeLog
smpeg/repos/extra-x86_64/PKGBUILD
smpeg/repos/extra-x86_64/smpeg-0.4.4-gcc41.patch
--------------------------------------+
extra-i686/ChangeLog | 6 --
extra-i686/PKGBUILD | 65 ++++++++++++++------------
extra-i686/smpeg-0.4.4-gcc41.patch | 82 ++++++++++++++++-----------------
extra-x86_64/ChangeLog | 6 --
extra-x86_64/PKGBUILD | 65 ++++++++++++++------------
extra-x86_64/smpeg-0.4.4-gcc41.patch | 82 ++++++++++++++++-----------------
6 files changed, 154 insertions(+), 152 deletions(-)
Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2011-09-09 23:28:54 UTC (rev 137586)
+++ extra-i686/ChangeLog 2011-09-09 23:30:58 UTC (rev 137587)
@@ -1,6 +0,0 @@
-2009-02-07 Eric Belanger <eric at archlinux.org>
-
- * smpeg 0.4.4-5
- * Added gtk and mesa optdepends (close FS#12693)
- * FHS man pages
- * Added ChangeLog
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-09-09 23:28:54 UTC (rev 137586)
+++ extra-i686/PKGBUILD 2011-09-09 23:30:58 UTC (rev 137587)
@@ -1,29 +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=5
-pkgdesc="SDL MPEG Player Library"
-arch=('i686' 'x86_64')
-url="http://icculus.org/smpeg/"
-license=('LGPL')
-depends=('sdl')
-makedepends=('gtk' 'mesa')
-optdepends=('gtk: to use gtv ' 'mesa: 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 < ../smpeg-0.4.4-gcc41.patch || return 1
- ./configure --prefix=/usr --mandir=/usr/share/man || return 1
- make LDFLAGS+=-lstdc++ || return 1
- make DESTDIR=${pkgdir} install || return 1
-
- #fix aclocal warnings
- sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 || return 1
-}
Copied: smpeg/repos/extra-i686/PKGBUILD (from rev 137586, smpeg/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-09 23:30:58 UTC (rev 137587)
@@ -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=6
+pkgdesc="SDL MPEG Player Library"
+arch=('i686' 'x86_64')
+url="http://icculus.org/smpeg/"
+license=('LGPL')
+depends=('sdl')
+makedepends=('gtk' 'mesa')
+optdepends=('gtk: to use gtv ' 'mesa: 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
+ 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
+}
Deleted: extra-i686/smpeg-0.4.4-gcc41.patch
===================================================================
--- extra-i686/smpeg-0.4.4-gcc41.patch 2011-09-09 23:28:54 UTC (rev 137586)
+++ extra-i686/smpeg-0.4.4-gcc41.patch 2011-09-09 23:30:58 UTC (rev 137587)
@@ -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_ */
Copied: smpeg/repos/extra-i686/smpeg-0.4.4-gcc41.patch (from rev 137586, smpeg/trunk/smpeg-0.4.4-gcc41.patch)
===================================================================
--- extra-i686/smpeg-0.4.4-gcc41.patch (rev 0)
+++ extra-i686/smpeg-0.4.4-gcc41.patch 2011-09-09 23:30:58 UTC (rev 137587)
@@ -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_ */
Deleted: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2011-09-09 23:28:54 UTC (rev 137586)
+++ extra-x86_64/ChangeLog 2011-09-09 23:30:58 UTC (rev 137587)
@@ -1,6 +0,0 @@
-2009-02-07 Eric Belanger <eric at archlinux.org>
-
- * smpeg 0.4.4-5
- * Added gtk and mesa optdepends (close FS#12693)
- * FHS man pages
- * Added ChangeLog
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-09 23:28:54 UTC (rev 137586)
+++ extra-x86_64/PKGBUILD 2011-09-09 23:30:58 UTC (rev 137587)
@@ -1,29 +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=5
-pkgdesc="SDL MPEG Player Library"
-arch=('i686' 'x86_64')
-url="http://icculus.org/smpeg/"
-license=('LGPL')
-depends=('sdl')
-makedepends=('gtk' 'mesa')
-optdepends=('gtk: to use gtv ' 'mesa: 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 < ../smpeg-0.4.4-gcc41.patch || return 1
- ./configure --prefix=/usr --mandir=/usr/share/man || return 1
- make LDFLAGS+=-lstdc++ || return 1
- make DESTDIR=${pkgdir} install || return 1
-
- #fix aclocal warnings
- sed -i "s#(AM_PATH_SMPEG#([AM_PATH_SMPEG]#" ${pkgdir}/usr/share/aclocal/smpeg.m4 || return 1
-}
Copied: smpeg/repos/extra-x86_64/PKGBUILD (from rev 137586, smpeg/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-09 23:30:58 UTC (rev 137587)
@@ -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=6
+pkgdesc="SDL MPEG Player Library"
+arch=('i686' 'x86_64')
+url="http://icculus.org/smpeg/"
+license=('LGPL')
+depends=('sdl')
+makedepends=('gtk' 'mesa')
+optdepends=('gtk: to use gtv ' 'mesa: 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
+ 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
+}
Deleted: extra-x86_64/smpeg-0.4.4-gcc41.patch
===================================================================
--- extra-x86_64/smpeg-0.4.4-gcc41.patch 2011-09-09 23:28:54 UTC (rev 137586)
+++ extra-x86_64/smpeg-0.4.4-gcc41.patch 2011-09-09 23:30:58 UTC (rev 137587)
@@ -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_ */
Copied: smpeg/repos/extra-x86_64/smpeg-0.4.4-gcc41.patch (from rev 137586, smpeg/trunk/smpeg-0.4.4-gcc41.patch)
===================================================================
--- extra-x86_64/smpeg-0.4.4-gcc41.patch (rev 0)
+++ extra-x86_64/smpeg-0.4.4-gcc41.patch 2011-09-09 23:30:58 UTC (rev 137587)
@@ -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