diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /testing/smpeg | |
parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'testing/smpeg')
-rw-r--r-- | testing/smpeg/PKGBUILD | 36 | ||||
-rw-r--r-- | testing/smpeg/smpeg-0.4.4-gcc41.patch | 41 |
2 files changed, 0 insertions, 77 deletions
diff --git a/testing/smpeg/PKGBUILD b/testing/smpeg/PKGBUILD deleted file mode 100644 index 96b7420ee..000000000 --- a/testing/smpeg/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 168278 2012-10-07 17:15:25Z heftig $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Jan de Groot <jgc@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 -} diff --git a/testing/smpeg/smpeg-0.4.4-gcc41.patch b/testing/smpeg/smpeg-0.4.4-gcc41.patch deleted file mode 100644 index 4a0eeb453..000000000 --- a/testing/smpeg/smpeg-0.4.4-gcc41.patch +++ /dev/null @@ -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_ */ |