Revision: 103330 https://trac.macports.org/changeset/103330 Author: jmr@macports.org Date: 2013-02-22 00:02:25 -0800 (Fri, 22 Feb 2013) Log Message: ----------- sdl_sopwith: update to 1.8.0 Modified Paths: -------------- trunk/dports/games/sdl_sopwith/Portfile trunk/dports/games/sdl_sopwith/files/src_Makefile.in.patch trunk/dports/games/sdl_sopwith/files/src_sdl_video.c.patch Removed Paths: ------------- trunk/dports/games/sdl_sopwith/files/configure.patch Modified: trunk/dports/games/sdl_sopwith/Portfile =================================================================== --- trunk/dports/games/sdl_sopwith/Portfile 2013-02-22 06:00:20 UTC (rev 103329) +++ trunk/dports/games/sdl_sopwith/Portfile 2013-02-22 08:02:25 UTC (rev 103330) @@ -5,7 +5,7 @@ PortGroup app 1.0 name sdl_sopwith -version 1.7.5 +version 1.8.0 categories games platforms darwin license GPL-2+ @@ -17,22 +17,20 @@ master_sites sourceforge:project/sdl-sopwith/${name}/${version}/ distname sopwith-${version} -checksums md5 9a474203245d4b1052f17accd1553992 \ - sha1 018051a8524ced03e5e5a6c08cef67e663149e20 \ - rmd160 cb36db3a78e6d509d136c3ae37aad61f9d9012b6 +checksums md5 1ba378f9b5779ec932e26e6b6d67b870 \ + sha1 0ed85abc9d1b3be4b1be8b8b71005e44c4a66bc3 \ + rmd160 b56d59bd776e05df9c45124d256e55dbe1f18264 -depends_build port:pkgconfig depends_lib path:lib/pkgconfig/sdl.pc:libsdl patchfiles src_Makefile.in.patch src_sdl_video.c.patch \ - src_swmain.c.patch configure.patch + src_swmain.c.patch post-patch { file delete ${worksrcpath}/config.cache ${worksrcpath}/config.log \ ${worksrcpath}/config.status } -configure.args --mandir=${prefix}/share/man \ - --disable-sdltest +configure.args --disable-sdltest app.name Sopwith app.executable sopwith Deleted: trunk/dports/games/sdl_sopwith/files/configure.patch =================================================================== --- trunk/dports/games/sdl_sopwith/files/configure.patch 2013-02-22 06:00:20 UTC (rev 103329) +++ trunk/dports/games/sdl_sopwith/files/configure.patch 2013-02-22 08:02:25 UTC (rev 103330) @@ -1,17 +0,0 @@ ---- configure.orig 2010-09-07 00:14:00.000000000 +1000 -+++ configure 2011-09-10 05:50:30.000000000 +1000 -@@ -1615,14 +1615,6 @@ - fi - fi - -- if test $succeeded = yes; then -- -- SOPWITH_BINS="$SOPWITH_BINS" # gtksopwith" -- SOPWITH_SUBDIRS="$SOPWITH_SUBDIRS" # gtk" -- -- else -- { echo "configure: error: Library requirements (glib-2.0 >= 2.0 gtk+-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } -- fi - - - Modified: trunk/dports/games/sdl_sopwith/files/src_Makefile.in.patch =================================================================== --- trunk/dports/games/sdl_sopwith/files/src_Makefile.in.patch 2013-02-22 06:00:20 UTC (rev 103329) +++ trunk/dports/games/sdl_sopwith/files/src_Makefile.in.patch 2013-02-22 08:02:25 UTC (rev 103330) @@ -5,7 +5,7 @@ EXTRA_PROGRAMS = sopwith gtksopwith psopwith -CFLAGS = @CFLAGS@ -I.. -I/usr/include/SDL -+CFLAGS = @CFLAGS@ -I.. $(SDL_CFLAGS) ++CFLAGS = -I.. @CFLAGS@ $(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 Modified: trunk/dports/games/sdl_sopwith/files/src_sdl_video.c.patch =================================================================== --- trunk/dports/games/sdl_sopwith/files/src_sdl_video.c.patch 2013-02-22 06:00:20 UTC (rev 103329) +++ trunk/dports/games/sdl_sopwith/files/src_sdl_video.c.patch 2013-02-22 08:02:25 UTC (rev 103330) @@ -1,5 +1,5 @@ ---- src/sdl/video.c.orig 2012-09-20 08:59:39.000000000 +1000 -+++ src/sdl/video.c 2012-09-26 19:19:05.000000000 +1000 +--- src/sdl/video.c.orig 2013-02-22 02:49:35.000000000 +1100 ++++ src/sdl/video.c 2013-02-22 18:43:37.000000000 +1100 @@ -222,7 +222,7 @@ static void set_icon(sopsym_t *sym) static void Vid_UnsetMode() @@ -9,16 +9,25 @@ } -@@ -368,8 +368,6 @@ static void Vid_SetMode() +@@ -364,17 +364,10 @@ static void Vid_SetMode() + int n; + int w, h; + int flags = 0; +- int status; + printf("CGA Screen Emulation\n"); printf("init screen: "); -- SDL_Init(SDL_INIT_VIDEO); -- +- status = SDL_Init(SDL_INIT_VIDEO); +- if (status == -1) +- { +- fprintf(stderr, "Unable to locate video device. Exiting.\n"); +- exit(1); +- } srand(time(NULL)); set_icon(symbol_plane[rand() % 2][rand() % 16]); -@@ -395,6 +393,11 @@ static void Vid_SetMode() +@@ -400,6 +393,11 @@ static void Vid_SetMode() exit(-1); } @@ -30,7 +39,7 @@ SDL_EnableUNICODE(1); for (n = 0; n < NUM_KEYS; ++n) -@@ -404,6 +407,7 @@ static void Vid_SetMode() +@@ -409,6 +407,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)); @@ -38,7 +47,7 @@ // create custom key file Create_Custom_File(); -@@ -418,7 +422,7 @@ void Vid_Shutdown() +@@ -423,30 +422,32 @@ void Vid_Shutdown() Vid_UnsetMode(); @@ -47,15 +56,26 @@ initted = 0; } -@@ -430,18 +434,13 @@ void Vid_Init() + void Vid_Init() + { ++ int status; ++ + if (initted) + return; + 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); ++ status = SDL_Init(SDL_INIT_VIDEO); ++ if (status == -1) ++ { ++ fprintf(stderr, "Unable to locate video device. Exiting.\n"); ++ exit(1); ++ } Vid_SetMode();