<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fbe25355e770c5a0748a6ac88e2b01fef93b7905">https://github.com/macports/macports-ports/commit/fbe25355e770c5a0748a6ac88e2b01fef93b7905</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fbe25355e77 sdl_sopwith: update to 2.5.0
</span>fbe25355e77 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fbe25355e770c5a0748a6ac88e2b01fef93b7905
</span>Author: Sam Thompson <sambthompson@users.noreply.github.com>
AuthorDate: Tue Oct 15 08:23:57 2024 +1100
<span style='display:block; white-space:pre;color:#404040;'> sdl_sopwith: update to 2.5.0
</span>---
games/sdl_sopwith/Portfile | 32 +++++-----
games/sdl_sopwith/files/src_Makefile.in.patch | 11 ----
games/sdl_sopwith/files/src_sdl_video.c.patch | 89 ---------------------------
games/sdl_sopwith/files/src_swmain.c.patch | 11 ----
4 files changed, 15 insertions(+), 128 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/sdl_sopwith/Portfile b/games/sdl_sopwith/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c953574b15..df6eeb87d43 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/sdl_sopwith/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/sdl_sopwith/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,36 +2,34 @@
</span>
PortSystem 1.0
PortGroup app 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
name sdl_sopwith
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.5.0
</span> categories games
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-2+
maintainers nomaintainer
description Classic biplane shooter
long_description This is a port of the classic computer game \"Sopwith\" \
to run on modern computers and operating systems.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://sdl-sopwith.sourceforge.net/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://fragglet.github.io/sdl-sopwith/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/sdl-sopwith/${name}/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname sopwith-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 1ba378f9b5779ec932e26e6b6d67b870 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 0ed85abc9d1b3be4b1be8b8b71005e44c4a66bc3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 b56d59bd776e05df9c45124d256e55dbe1f18264
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Development has migrated to github for newer 2.x series.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup fragglet sdl-sopwith ${version} sdl-sopwith-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 9527c13fd463731d0e189deb24eb39f8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 8e644f7e6c567b7fb51709e62582641467d7952e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5261b253020715a0fcb18c3b032c239ef9278b46 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 afef3efb49994aec6a37185bde97af46d7231a7bf18dfbc6d3c87251f3f9dd46 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1046380
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:libsdl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles src_Makefile.in.patch src_sdl_video.c.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src_swmain.c.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${worksrcpath}/config.cache ${worksrcpath}/config.log \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/config.status
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:libsdl2
</span>
configure.args --disable-sdltest
app.name Sopwith
app.executable sopwith
<span style='display:block; white-space:pre;background:#e0ffe0;'>+app.icon src/sopwith.png
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex /sopwith-(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.livecheck.branch trunk
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/sdl_sopwith/files/src_Makefile.in.patch b/games/sdl_sopwith/files/src_Makefile.in.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 62f128b8e95..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/sdl_sopwith/files/src_Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.in.orig 2010-09-07 00:11:37.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile.in 2011-07-18 01:59:36.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,7 +81,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bin_PROGRAMS = @SOPWITH_BINS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXTRA_PROGRAMS = sopwith gtksopwith psopwith
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CFLAGS = @CFLAGS@ -I.. -I/usr/include/SDL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CFLAGS = -I.. @CFLAGS@ $(SDL_CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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 sw [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/sdl_sopwith/files/src_sdl_video.c.patch b/games/sdl_sopwith/files/src_sdl_video.c.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1a29c11741f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/sdl_sopwith/files/src_sdl_video.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,89 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/sdl/video.c.orig 2013-02-22 02:49:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/sdl/video.c 2013-02-22 18:43:37.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,7 +222,7 @@ static void set_icon(sopsym_t *sym)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void Vid_UnsetMode()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SDL_QuitSubSystem(SDL_INIT_VIDEO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SDL_FreeSurface(screenbuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,17 +364,10 @@ static void Vid_SetMode()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int w, h;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int flags = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("CGA Screen Emulation\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("init screen: ");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- status = SDL_Init(SDL_INIT_VIDEO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (status == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fprintf(stderr, "Unable to locate video device. Exiting.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- srand(time(NULL));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_icon(symbol_plane[rand() % 2][rand() % 16]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -400,6 +393,11 @@ static void Vid_SetMode()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit(-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ screenbuf = SDL_CreateRGBSurface(0, SCR_WDTH, SCR_HGHT, 8,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 0, 0, 0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vid_vram = screenbuf->pixels;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vid_pitch = screenbuf->pitch;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL_EnableUNICODE(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (n = 0; n < NUM_KEYS; ++n)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -409,6 +407,7 @@ static void Vid_SetMode()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL_SetColors(screen, cga_pal, 0, sizeof(cga_pal)/sizeof(*cga_pal));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL_SetColors(screenbuf, cga_pal, 0, sizeof(cga_pal)/sizeof(*cga_pal));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SDL_LockSurface(screenbuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // create custom key file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Create_Custom_File();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -423,30 +422,32 @@ void Vid_Shutdown()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Vid_UnsetMode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SDL_FreeSurface(screenbuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SDL_QuitSubSystem(SDL_INIT_VIDEO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- initted = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void Vid_Init()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int status;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (initted)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fflush(stdout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- screenbuf = SDL_CreateRGBSurface(0, SCR_WDTH, SCR_HGHT, 8,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 0, 0, 0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vid_vram = screenbuf->pixels;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- vid_pitch = screenbuf->pitch;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ status = SDL_Init(SDL_INIT_VIDEO);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (status == -1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "Unable to locate video device. Exiting.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ exit(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Vid_SetMode();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- initted = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- atexit(Vid_Shutdown);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SDL_LockSurface(screenbuf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void Vid_Reset()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/sdl_sopwith/files/src_swmain.c.patch b/games/sdl_sopwith/files/src_swmain.c.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0a759ba4ab3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/sdl_sopwith/files/src_swmain.c.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/swmain.c.orig 2010-09-06 23:30:15.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/swmain.c 2011-09-10 03:55:17.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,6 +24,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //---------------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* needed to substitute SDL_Main for main */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <SDL.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "timer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>