From 1f687113eefc862f58fe48beccc1dd899d1bc09a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 17 Feb 2014 09:38:45 +0100 Subject: [PATCH] smpeg: remove obsolete patch. --- srcpkgs/smpeg/patches/smpeg-0.4.4-gcc41.patch | 41 ------------------- srcpkgs/smpeg/template | 2 +- 2 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 srcpkgs/smpeg/patches/smpeg-0.4.4-gcc41.patch diff --git a/srcpkgs/smpeg/patches/smpeg-0.4.4-gcc41.patch b/srcpkgs/smpeg/patches/smpeg-0.4.4-gcc41.patch deleted file mode 100644 index a8bb2f6e6f..0000000000 --- a/srcpkgs/smpeg/patches/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 ---- MPEGaudio.h 17 Jul 2001 19:52:24 -0000 1.23 -+++ 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_ */ diff --git a/srcpkgs/smpeg/template b/srcpkgs/smpeg/template index ea6a77adc6..17a470aa1e 100644 --- a/srcpkgs/smpeg/template +++ b/srcpkgs/smpeg/template @@ -1,7 +1,7 @@ # Template file for 'smpeg' pkgname=smpeg version=0.4.5 -revision=1 +revision=2 build_style=gnu-configure configure_args="--disable-gtk-player --disable-opengl-player" make_build_args="LDFLAGS+=-lstdc++"