[57307] trunk/dports/multimedia/smpeg

[jmr at macports.org]

Revision: 57307
          http://trac.macports.org/changeset/57307
Author:   jmr at macports.org
Date:     2009-09-08 21:08:12 -0700 (Tue, 08 Sep 2009)
Log Message:
-----------
smpeg: fix build with 10.6/libsdl-devel (#20324)

Modified Paths:
--------------
    trunk/dports/multimedia/smpeg/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/smpeg/files/patch-MPEG.cpp.diff
    trunk/dports/multimedia/smpeg/files/patch-MPEGaudio.h.diff
    trunk/dports/multimedia/smpeg/files/patch-video.h.diff

Modified: trunk/dports/multimedia/smpeg/Portfile
===================================================================
--- trunk/dports/multimedia/smpeg/Portfile	2009-09-09 03:59:00 UTC (rev 57306)
+++ trunk/dports/multimedia/smpeg/Portfile	2009-09-09 04:08:12 UTC (rev 57307)
@@ -6,6 +6,7 @@
 version		0.4.4
 revision	8
 categories	multimedia
+license		GPLv2
 maintainers	mww
 platforms	darwin
 description	a general purpose MPEG video/audio player/library
@@ -28,7 +29,8 @@
 
 patchfiles	patch-smpeg.h.diff patch-glmovie-tile.c.diff \
 		patch-glmovie.c.diff patch-Makefile.in.diff patch-configure.diff \
-		patch-smpeg.m4.diff
+		patch-smpeg.m4.diff patch-MPEGaudio.h.diff patch-video.h.diff \
+		patch-MPEG.cpp.diff
 post-patch {
 	file copy -force ${distpath}/ltconfig13 ${worksrcpath}/ltconfig
 	file copy -force ${distpath}/ltmain13 ${worksrcpath}/ltmain.sh
@@ -51,4 +53,3 @@
 	delete ${worksrcpath}/libtool
 	ln -s ${prefix}/bin/glibtool ${worksrcpath}/libtool
 }
-

Added: trunk/dports/multimedia/smpeg/files/patch-MPEG.cpp.diff
===================================================================
--- trunk/dports/multimedia/smpeg/files/patch-MPEG.cpp.diff	                        (rev 0)
+++ trunk/dports/multimedia/smpeg/files/patch-MPEG.cpp.diff	2009-09-09 04:08:12 UTC (rev 57307)
@@ -0,0 +1,11 @@
+--- MPEG.cpp.orig	2001-06-19 06:54:23.000000000 +1000
++++ MPEG.cpp	2009-09-09 13:59:30.000000000 +1000
+@@ -47,7 +47,7 @@
+     return;
+   }
+ 
+-  source = SDL_RWFromFP(file,false);
++  source = SDL_RWFromFP(file,SDL_FALSE);
+   if (!source) {
+     InitErrorState();
+     SetError(SDL_GetError());

Added: trunk/dports/multimedia/smpeg/files/patch-MPEGaudio.h.diff
===================================================================
--- trunk/dports/multimedia/smpeg/files/patch-MPEGaudio.h.diff	                        (rev 0)
+++ trunk/dports/multimedia/smpeg/files/patch-MPEGaudio.h.diff	2009-09-09 04:08:12 UTC (rev 57307)
@@ -0,0 +1,17 @@
+--- MPEGaudio.h       2006-03-13 15:24:38.000000000 +0000
++++ MPEGaudio.h       2006-03-13 15:25:07.000000000 +0000
+@@ -149,6 +149,14 @@
+ };
+ 
+ /* The actual MPEG audio class */
++
++class MPEGaudio;
++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
++
+ class MPEGaudio : public MPEGerror, public MPEGaudioaction {
+ 
+     friend void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);

Added: trunk/dports/multimedia/smpeg/files/patch-video.h.diff
===================================================================
--- trunk/dports/multimedia/smpeg/files/patch-video.h.diff	                        (rev 0)
+++ trunk/dports/multimedia/smpeg/files/patch-video.h.diff	2009-09-09 04:08:12 UTC (rev 57307)
@@ -0,0 +1,17 @@
+--- video/video.h.orig	2001-02-10 18:36:42.000000000 +1100
++++ video/video.h	2009-09-09 13:30:01.000000000 +1000
+@@ -413,12 +413,12 @@
+ #define __SCO__ 1
+ #endif
+ 
+-#if defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__)
++#if defined(__LITTLE_ENDIAN__) || defined(__i386__) || defined(__VAX__) || defined(__MIPSEL__) || defined(__alpha__) || defined(__SCO__)
+ #undef  BIG_ENDIAN_ARCHITECTURE
+ #define LITTLE_ENDIAN_ARCHITECTURE 1
+ #endif
+ 
+-#if defined(__RS6000__) || defined(__SPARC__) || defined(__mc68000__) || defined(__HPUX__) || defined(__MIPSEB__) || defined(convex) || defined(__convex__) || defined(__powerpc__)
++#if defined(__BIG_ENDIAN__) || defined(__RS6000__) || defined(__SPARC__) || defined(__mc68000__) || defined(__HPUX__) || defined(__MIPSEB__) || defined(convex) || defined(__convex__) || defined(__powerpc__)
+ #undef  LITTLE_ENDIAN_ARCHITECTURE
+ #define BIG_ENDIAN_ARCHITECTURE 1
+ #endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090908/06af0d29/attachment.html>