[83715] trunk/dports/games/sdl_sopwith
jmr at macports.org
jmr at macports.org
Fri Sep 9 11:13:32 PDT 2011
Revision: 83715
http://trac.macports.org/changeset/83715
Author: jmr at macports.org
Date: 2011-09-09 11:13:32 -0700 (Fri, 09 Sep 2011)
Log Message:
-----------
sdl_sopwith: update to 1.7.4
Modified Paths:
--------------
trunk/dports/games/sdl_sopwith/Portfile
Added Paths:
-----------
trunk/dports/games/sdl_sopwith/files/src_Makefile.in.patch
trunk/dports/games/sdl_sopwith/files/src_sdl_video.c.patch
trunk/dports/games/sdl_sopwith/files/src_swmain.c.patch
Removed Paths:
-------------
trunk/dports/games/sdl_sopwith/files/patch-src_swsound.c.diff
Modified: trunk/dports/games/sdl_sopwith/Portfile
===================================================================
--- trunk/dports/games/sdl_sopwith/Portfile 2011-09-09 18:00:45 UTC (rev 83714)
+++ trunk/dports/games/sdl_sopwith/Portfile 2011-09-09 18:13:32 UTC (rev 83715)
@@ -4,34 +4,29 @@
PortSystem 1.0
name sdl_sopwith
-version 1.7.1
+version 1.7.4
categories games
platforms darwin
-license GPL-2
+license GPL-2+
maintainers jmr openmaintainer
description Classic biplane shooter
-long_description This is a port of the classic computer game \"Sopwith\" to run on modern \
- computers and operating systems.
+long_description This is a port of the classic computer game \"Sopwith\" \
+ to run on modern computers and operating systems.
homepage http://sdl-sopwith.sourceforge.net/
master_sites sourceforge:project/sdl-sopwith/${name}/${version}/
-checksums md5 bc66c80c83b14d48b60ba263403dba9a \
- sha1 21ad6273ddb89a4c45ad11a8e35f8f6958bcc5b5 \
- rmd160 7c55da41e7e160b4a84e5235974ecf0d48d1010a
+distname sopwith-${version}
+checksums md5 f7bd8f754409aedd003b5b99d20f06dd \
+ sha1 e2523afb16ce04fe772468f5a3d027a162460d46 \
+ rmd160 f1ba6723d7606cdff00e43e593199040f1e1127c
-depends_lib path:lib/pkgconfig/sdl.pc:libsdl \
- port:gtk2
+depends_build port:pkgconfig
+depends_lib path:lib/pkgconfig/sdl.pc:libsdl
-patchfiles patch-src_swsound.c.diff
+patchfiles src_Makefile.in.patch src_sdl_video.c.patch \
+ src_swmain.c.patch
configure.args --mandir=${prefix}/share/man \
--disable-sdltest
-post-destroot {
- # the SDL binary is broken, so just leave the gtk version
- file delete ${destroot}${prefix}/bin/sopwith
-}
-
-livecheck.name sdl-sopwith
-livecheck.type sourceforge
livecheck.regex /sopwith-(\[0-9.\]+)${extract.suffix}
Deleted: trunk/dports/games/sdl_sopwith/files/patch-src_swsound.c.diff
===================================================================
--- trunk/dports/games/sdl_sopwith/files/patch-src_swsound.c.diff 2011-09-09 18:00:45 UTC (rev 83714)
+++ trunk/dports/games/sdl_sopwith/files/patch-src_swsound.c.diff 2011-09-09 18:13:32 UTC (rev 83715)
@@ -1,11 +0,0 @@
---- src/swsound.c.orig 2003-06-09 04:20:30.000000000 +1000
-+++ src/swsound.c 2008-04-01 03:53:06.000000000 +1100
-@@ -79,7 +79,7 @@
- };
- #endif
-
--static BOOL titleflg; /* Playing title tune */
-+BOOL titleflg; /* Playing title tune */
- static int titlplace; /* Place in title tune; */
- static int titlline; /* Line in title tune */
- static unsigned titltone; /* Current title tone */
Added: trunk/dports/games/sdl_sopwith/files/src_Makefile.in.patch
===================================================================
--- trunk/dports/games/sdl_sopwith/files/src_Makefile.in.patch (rev 0)
+++ trunk/dports/games/sdl_sopwith/files/src_Makefile.in.patch 2011-09-09 18:13:32 UTC (rev 83715)
@@ -0,0 +1,11 @@
+--- src/Makefile.in.orig 2010-09-07 00:11:37.000000000 +1000
++++ src/Makefile.in 2011-07-18 01:59:36.000000000 +1000
+@@ -81,7 +81,7 @@
+ bin_PROGRAMS = @SOPWITH_BINS@
+ EXTRA_PROGRAMS = sopwith gtksopwith psopwith
+
+-CFLAGS = @CFLAGS@ -I.. -I/usr/include/SDL
++CFLAGS = @CFLAGS@ -I.. $(SDL_CFLAGS)
+
+ COMMON_SRC = video.h swcollsn.c swgames.h swmain.h swutil.h font.h swcollsn.h swground.c swmisc.c tcpcomm.c pcsound.h swconf.c swground.h swmisc.h swsound.c tcpcomm.h std.h swconf.h swgrpha.c swmove.c swsound.h timer.h sw.h swdisp.c swgrpha.h swmove.h swsymbol.c swasynio.c swdisp.h swinit.c swsymbol.h swasynio.h swend.c swinit.h swtitle.c swauto.c swend.h swobject.c swtitle.h swauto.h swgames.c swmain.c swobject.h swutil.c video.c
+
Added: trunk/dports/games/sdl_sopwith/files/src_sdl_video.c.patch
===================================================================
--- trunk/dports/games/sdl_sopwith/files/src_sdl_video.c.patch (rev 0)
+++ trunk/dports/games/sdl_sopwith/files/src_sdl_video.c.patch 2011-09-09 18:13:32 UTC (rev 83715)
@@ -0,0 +1,69 @@
+--- src/sdl/video.c.orig 2010-07-07 08:19:39.000000000 +1000
++++ src/sdl/video.c 2011-09-10 03:33:26.000000000 +1000
+@@ -213,7 +213,7 @@ static void set_icon(sopsym_t *sym)
+
+ static void Vid_UnsetMode()
+ {
+- SDL_QuitSubSystem(SDL_INIT_VIDEO);
++ SDL_FreeSurface(screenbuf);
+ }
+
+ static void Vid_SetMode()
+@@ -225,8 +225,6 @@ static void Vid_SetMode()
+ printf("CGA Screen Emulation\n");
+ printf("init screen: ");
+
+- SDL_Init(SDL_INIT_VIDEO);
+-
+ srand(time(NULL));
+ set_icon(symbol_plane[rand() % 2][rand() % 16]);
+
+@@ -252,6 +250,11 @@ static void Vid_SetMode()
+ exit(-1);
+ }
+
++ screenbuf = SDL_CreateRGBSurface(0, SCR_WDTH, SCR_HGHT, 8,
++ 0, 0, 0, 0);
++ vid_vram = screenbuf->pixels;
++ vid_pitch = screenbuf->pitch;
++
+ SDL_EnableUNICODE(1);
+
+ for (n = 0; n < NUM_KEYS; ++n)
+@@ -261,6 +264,7 @@ static void Vid_SetMode()
+
+ SDL_SetColors(screen, cga_pal, 0, sizeof(cga_pal)/sizeof(*cga_pal));
+ SDL_SetColors(screenbuf, cga_pal, 0, sizeof(cga_pal)/sizeof(*cga_pal));
++ SDL_LockSurface(screenbuf);
+ }
+
+ void Vid_Shutdown()
+@@ -270,7 +274,7 @@ void Vid_Shutdown()
+
+ Vid_UnsetMode();
+
+- SDL_FreeSurface(screenbuf);
++ SDL_QuitSubSystem(SDL_INIT_VIDEO);
+
+ initted = 0;
+ }
+@@ -282,18 +286,13 @@ void Vid_Init()
+
+ fflush(stdout);
+
+- screenbuf = SDL_CreateRGBSurface(0, SCR_WDTH, SCR_HGHT, 8,
+- 0, 0, 0, 0);
+- vid_vram = screenbuf->pixels;
+- vid_pitch = screenbuf->pitch;
++ SDL_Init(SDL_INIT_VIDEO);
+
+ Vid_SetMode();
+
+ initted = 1;
+
+ atexit(Vid_Shutdown);
+-
+- SDL_LockSurface(screenbuf);
+ }
+
+ void Vid_Reset()
Added: trunk/dports/games/sdl_sopwith/files/src_swmain.c.patch
===================================================================
--- trunk/dports/games/sdl_sopwith/files/src_swmain.c.patch (rev 0)
+++ trunk/dports/games/sdl_sopwith/files/src_swmain.c.patch 2011-09-09 18:13:32 UTC (rev 83715)
@@ -0,0 +1,11 @@
+--- src/swmain.c.orig 2010-09-06 23:30:15.000000000 +1000
++++ src/swmain.c 2011-09-10 03:55:17.000000000 +1000
+@@ -24,6 +24,8 @@
+ //---------------------------------------------------------------------------
+
+ #include <stdio.h>
++/* needed to substitute SDL_Main for main */
++#include <SDL.h>
+
+ #include "timer.h"
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110909/d8b9858a/attachment.html>
More information about the macports-changes
mailing list