Funny game; build with gcc as well as with clang and runs fine in window
and fullscreen mode. Unfortunately no joystick available.
ok rsadowski@
On Fri May 05, 2017 at 10:22:28PM +0200, Matthias Kilian wrote:
> Hi,
>
> Here's an to blobwars-2.00.
>
> Works fine for me in window mode (blobwars -window), in fullscreen
> mode (blobwars -fullscreen), it just hangs (but iirc, i had this
> problem with previous versions, too).
>
> I'd appreciate any tests, especially from people playing this game
> with a joystick (because the change from sdl to sdl2).
>
> Upstream changelog:
>
> * Changed to SDL 2.0. This also allows the window to be
> scaled to an arbitrary size, and doesn't change the desktop
> resolution anymore when going to fullscreen.
>
> * The joystick/gamepad can now also be used in the menus
> and on the hub.
>
> * Updated credits and copyright notices.
>
> * Added stereo to the sound effects.
>
> * Cleaned up some graphics.
>
> * Fixed the machinegun sound.
>
> * Fixed the behaviour of grenades.
>
> * Many small fixes.
>
> Ciao,
> Kili
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/blobwars/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile 10 Apr 2017 11:45:28 -0000 1.15
> +++ Makefile 4 May 2017 21:49:18 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT = 2D arcade game
>
> -DISTNAME = blobwars-1.19
> -REVISION= 5
> +DISTNAME = blobwars-2.00
>
> CATEGORIES = games
>
> @@ -15,20 +14,22 @@ MAINTAINER = Matthias Kilian <kili@openb
> # LGPLv2.1, BSD, GPLv2, "Public Domain", "Fair use".
> PERMIT_PACKAGE_CDROM = Yes
>
> -WANTLIB = SDL SDL_image SDL_mixer SDL_net SDL_ttf c m pthread ${LIBCXX} z
> +WANTLIB = SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf c m pthread
> ${LIBCXX} z
>
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=blobwars/}
>
> MODULES = devel/gettext
>
> -LIB_DEPENDS = devel/sdl-image \
> - devel/sdl-mixer \
> - devel/sdl-net \
> - devel/sdl-ttf
> +LIB_DEPENDS = devel/sdl2-image \
> + devel/sdl2-mixer \
> + devel/sdl2-net \
> + devel/sdl2-ttf
>
> RUN_DEPENDS = devel/desktop-file-utils \
> x11/gtk+3,-guic
>
> +CXXFLAGS += -DOpenBSD
> +
> MAKE_ENV += CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
> LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" \
> CXX=${CXX}
> @@ -37,7 +38,5 @@ USE_X11 = Yes
> USE_GMAKE = Yes
>
> NO_TEST = Yes
> -
> -MAKE_FILE = makefile
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/blobwars/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo 18 Jan 2015 03:13:56 -0000 1.5
> +++ distinfo 4 May 2017 21:49:18 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (blobwars-1.19.tar.gz) = +br+WerZ43DOq6Sq49KAJBvwX6BsiuAG7sAyLC/p4u0=
> -SIZE (blobwars-1.19.tar.gz) = 67019647
> +SHA256 (blobwars-2.00.tar.gz) = xAYnn2zfKu08btuNi+Fu/toCF0lKzVJfOe4r0+d+Spk=
> +SIZE (blobwars-2.00.tar.gz) = 66982603
> Index: patches/patch-Makefile
> ===================================================================
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Makefile 4 May 2017 21:49:18 -0000
> @@ -0,0 +1,89 @@
> +$OpenBSD$
> +Index: Makefile
> +--- Makefile.orig
> ++++ Makefile
> +@@ -1,16 +1,16 @@
> + PROG = blobwars
> + PAKNAME = blobwars.pak
> +-DOCS = doc/*
> ++DOCS = doc/*.{gif,png,html}
> + ICONS = icons/
> + DATA = data gfx sound music
> +
> + VERSION = 2.00
> + RELEASE ?= 0
> +-USEPAK ?= 0
> ++USEPAK ?= 1
> +
> + PREFIX ?= /usr
> +-BINDIR ?= $(PREFIX)/games/
> +-DATADIR ?= $(PREFIX)/share/games/blobwars/
> ++BINDIR ?= $(PREFIX)/bin/
> ++DATADIR ?= $(PREFIX)/share/$(PROG)/data/
> + DOCDIR ?= $(PREFIX)/share/doc/$(PROG)/
> + ICONDIR ?= $(PREFIX)/share/icons/hicolor/
> + DESKTOPDIR ?= $(PREFIX)/share/applications/
> +@@ -21,8 +21,8 @@ MEDAL_SERVER_PORT = 80
> + CXXFLAGS += `pkg-config --cflags sdl2 SDL2_mixer SDL2_image SDL2_ttf
> SDL2_net` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK)
> + CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX
> -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
> + CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
> -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\"
> -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
> +-CXXFLAGS += $(CFLAGS) -Werror
> +-LIBS = `pkg-config --libs sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -lz
> ++CXXFLAGS += $(CFLAGS)
> ++LIBS = `pkg-config --libs sdl2 SDL2_mixer SDL2_image SDL2_ttf SDL2_net` -lz
> -lintl -liconv
> + PAKLIBS = -lz
> +
> + OBJS += CAudio.o
> +@@ -105,33 +105,32 @@ buildpak: $(PAKNAME)
> +
> + # install
> + install: $(ALL)
> +- mkdir -p $(DESTDIR)$(BINDIR)
> +- mkdir -p $(DESTDIR)$(DATADIR)
> +- mkdir -p $(DESTDIR)$(DOCDIR)
> +- mkdir -p $(DESTDIR)$(ICONDIR)16x16/apps
> +- mkdir -p $(DESTDIR)$(ICONDIR)32x32/apps
> +- mkdir -p $(DESTDIR)$(ICONDIR)48x48/apps
> +- mkdir -p $(DESTDIR)$(ICONDIR)64x64/apps
> +- mkdir -p $(DESTDIR)$(DESKTOPDIR)
> ++ $(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
> ++ $(BSD_INSTALL_DATA_DIR) $(DATADIR)
> ++ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)
> ++ $(BSD_INSTALL_DATA_DIR) $(ICONDIR)16x16/apps
> ++ $(BSD_INSTALL_DATA_DIR) $(ICONDIR)32x32/apps
> ++ $(BSD_INSTALL_DATA_DIR) $(ICONDIR)48x48/apps
> ++ $(BSD_INSTALL_DATA_DIR) $(ICONDIR)64x64/apps
> ++ $(BSD_INSTALL_DATA_DIR) $(DESKTOPDIR)
> +
> +- install -m 755 $(PROG) $(DESTDIR)$(BINDIR)$(PROG)
> ++ $(BSD_INSTALL_PROGRAM) $(PROG) $(BINDIR)
> + ifeq ($(USEPAK), 1)
> +- install -m 644 $(PAKNAME) $(DESTDIR)$(DATADIR)$(PAKNAME)
> ++ $(BSD_INSTALL_DATA) $(PAKNAME) $(DATADIR)
> + else
> +- cp -pr $(DATA) $(DESTDIR)$(DATADIR)
> ++ umask 022 && cp -R $(DATA) $(DATADIR)
> + endif
> +- cp -p $(DOCS) $(DESTDIR)$(DOCDIR)
> +- cp -p $(ICONS)$(PROG)16x16.png
> $(DESTDIR)$(ICONDIR)16x16/apps/$(PROG).png
> +- cp -p $(ICONS)$(PROG)32x32.png
> $(DESTDIR)$(ICONDIR)32x32/apps/$(PROG).png
> +- cp -p $(ICONS)$(PROG)48x48.png
> $(DESTDIR)$(ICONDIR)48x48/apps/$(PROG).png
> +- cp -p $(ICONS)$(PROG)64x64.png
> $(DESTDIR)$(ICONDIR)64x64/apps/$(PROG).png
> +- cp -p $(ICONS)$(PROG).desktop $(DESTDIR)$(DESKTOPDIR)
> ++ $(BSD_INSTALL_DATA) $(DOCS) $(DOCDIR)
> ++ ${BSD_INSTALL_DATA} $(ICONS)$(PROG)16x16.png
> $(ICONDIR)16x16/apps/$(PROG).png
> ++ ${BSD_INSTALL_DATA} $(ICONS)$(PROG)32x32.png
> $(ICONDIR)32x32/apps/$(PROG).png
> ++ ${BSD_INSTALL_DATA} $(ICONS)$(PROG)48x48.png
> $(ICONDIR)48x48/apps/$(PROG).png
> ++ ${BSD_INSTALL_DATA} $(ICONS)$(PROG)64x64.png
> $(ICONDIR)64x64/apps/$(PROG).png
> ++ ${BSD_INSTALL_DATA} $(ICONS)$(PROG).desktop $(DESKTOPDIR)
> +
> + @for f in $(LOCALE_MO); do \
> + lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \
> +- mkdir -p $(DESTDIR)$(LOCALEDIR)$$lang/LC_MESSAGES; \
> +- echo "cp $$f
> $(DESTDIR)$(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo"; \
> +- cp $$f $(DESTDIR)$(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo; \
> ++ $(BSD_INSTALL_DATA_DIR) $(LOCALEDIR)$$lang/LC_MESSAGES; \
> ++ $(BSD_INSTALL_DATA) $$f
> $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo; \
> + done
> +
> + uninstall:
> Index: patches/patch-makefile
> ===================================================================
> RCS file: /cvs/ports/games/blobwars/patches/patch-makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-makefile
> --- patches/patch-makefile 4 May 2017 20:57:05 -0000 1.5
> +++ patches/patch-makefile 4 May 2017 21:49:18 -0000
> @@ -1,85 +0,0 @@
> -$OpenBSD: patch-makefile,v 1.5 2017/05/04 20:57:05 espie Exp $
> -Index: makefile
> ---- makefile.orig
> -+++ makefile
> -@@ -1,16 +1,16 @@
> - PROG = blobwars
> - PAKNAME = blobwars.pak
> --DOCS = doc/*
> -+DOCS = doc/*.{gif,png,html}
> - ICONS = icons/
> - DATA = data gfx sound music
> -
> - VERSION = 1.19
> - RELEASE ?= 0
> --USEPAK ?= 0
> -+USEPAK ?= 1
> -
> - PREFIX ?= /usr
> --BINDIR ?= $(PREFIX)/games/
> --DATADIR ?= $(PREFIX)/share/games/blobwars/
> -+BINDIR ?= $(PREFIX)/bin/
> -+DATADIR ?= $(PREFIX)/share/$(PROG)/data/
> - DOCDIR ?= $(PREFIX)/share/doc/$(PROG)/
> - ICONDIR ?= $(PREFIX)/share/icons/hicolor/
> - DESKTOPDIR ?= $(PREFIX)/share/applications/
> -@@ -21,8 +21,8 @@ MEDAL_SERVER_PORT = 80
> - CXXFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE)
> -DUSEPAK=$(USEPAK)
> - CXXFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DUNIX
> -DGAMEPLAYMANUAL=\"$(DOCDIR)index.html\" -Wall
> - CXXFLAGS += -DLOCALEDIR=\"$(LOCALEDIR)\"
> -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\"
> -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
> --CXXFLAGS += $(CFLAGS) -Werror
> --LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz
> -+CXXFLAGS += $(CFLAGS)
> -+LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf -lSDL_net -lz
> -lintl -liconv
> -
> - OBJS += CAudio.o
> - OBJS += CBoss.o
> -@@ -104,31 +104,30 @@ buildpak: $(PAKNAME)
> -
> - # install
> - install: $(ALL)
> -- mkdir -p $(DESTDIR)$(BINDIR)
> -- mkdir -p $(DESTDIR)$(DATADIR)
> -- mkdir -p $(DESTDIR)$(DOCDIR)
> -- mkdir -p $(DESTDIR)$(ICONDIR)16x16/apps
> -- mkdir -p $(DESTDIR)$(ICONDIR)32x32/apps
> -- mkdir -p $(DESTDIR)$(ICONDIR)64x64/apps
> -- mkdir -p $(DESTDIR)$(DESKTOPDIR)
> -+ $(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
> -+ $(BSD_INSTALL_DATA_DIR) $(DATADIR)
> -+ $(BSD_INSTALL_DATA_DIR) $(DOCDIR)
> -+ $(BSD_INSTALL_DATA_DIR) $(ICONDIR)16x16/apps
> -+ $(BSD_INSTALL_DATA_DIR) $(ICONDIR)32x32/apps
> -+ $(BSD_INSTALL_DATA_DIR) $(ICONDIR)64x64/apps
> -+ $(BSD_INSTALL_DATA_DIR) $(DESKTOPDIR)
> -
> -- install -m 755 $(PROG) $(DESTDIR)$(BINDIR)$(PROG)
> -+ $(BSD_INSTALL_PROGRAM) $(PROG) $(BINDIR)
> - ifeq ($(USEPAK), 1)
> -- install -m 644 $(PAKNAME) $(DESTDIR)$(DATADIR)$(PAKNAME)
> -+ $(BSD_INSTALL_DATA) $(PAKNAME) $(DATADIR)
> - else
> -- cp -pr $(DATA) $(DESTDIR)$(DATADIR)
> -+ umask 022 && cp -R $(DATA) $(DATADIR)
> - endif
> -- cp -p $(DOCS) $(DESTDIR)$(DOCDIR)
> -- cp -p $(ICONS)$(PROG).png $(DESTDIR)$(ICONDIR)32x32/apps/
> -- cp -p $(ICONS)$(PROG)-mini.png
> $(DESTDIR)$(ICONDIR)16x16/apps/$(PROG).png
> -- cp -p $(ICONS)$(PROG)-large.png
> $(DESTDIR)$(ICONDIR)64x64/apps/$(PROG).png
> -- cp -p $(ICONS)$(PROG).desktop $(DESTDIR)$(DESKTOPDIR)
> -+ $(BSD_INSTALL_DATA) $(DOCS) $(DOCDIR)
> -+ $(BSD_INSTALL_DATA) $(ICONS)$(PROG).png $(ICONDIR)32x32/apps
> -+ $(BSD_INSTALL_DATA) $(ICONS)$(PROG)-mini.png
> $(ICONDIR)16x16/apps/$(PROG).png
> -+ $(BSD_INSTALL_DATA) $(ICONS)$(PROG)-large.png
> $(ICONDIR)64x64/apps/$(PROG).png
> -+ $(BSD_INSTALL_DATA) $(ICONS)$(PROG).desktop $(DESKTOPDIR)
> -
> - @for f in $(LOCALE_MO); do \
> - lang=`echo $$f | sed -e 's/^locale\///;s/\.mo$$//'`; \
> -- mkdir -p $(DESTDIR)$(LOCALEDIR)$$lang/LC_MESSAGES; \
> -- echo "cp $$f
> $(DESTDIR)$(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo"; \
> -- cp $$f $(DESTDIR)$(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo; \
> -+ $(BSD_INSTALL_DATA_DIR) $(LOCALEDIR)$$lang/LC_MESSAGES; \
> -+ $(BSD_INSTALL_DATA) $$f
> $(LOCALEDIR)$$lang/LC_MESSAGES/$(PROG).mo; \
> - done
> -
> - uninstall:
> Index: patches/patch-src_init_cpp
> ===================================================================
> RCS file: /cvs/ports/games/blobwars/patches/patch-src_init_cpp,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-src_init_cpp
> --- patches/patch-src_init_cpp 8 May 2011 21:47:44 -0000 1.2
> +++ patches/patch-src_init_cpp 4 May 2017 21:49:18 -0000
> @@ -1,17 +1,17 @@
> $OpenBSD: patch-src_init_cpp,v 1.2 2011/05/08 21:47:44 kili Exp $
> ---- src/init.cpp.orig Sun Apr 17 16:56:56 2011
> -+++ src/init.cpp Sun May 8 15:41:13 2011
> -@@ -473,9 +473,11 @@ void cleanup()
> +--- src/init.cpp.orig
> ++++ src/init.cpp
> +@@ -499,9 +499,11 @@ void cleanup()
> if (SDL_NumJoysticks() > 0)
> {
> SDL_JoystickEventState(SDL_DISABLE);
> - for (int i = 0 ; i < SDL_NumJoysticks() ; i++)
> + // Blobwars tries to open only the first joystick,
> + // so test only the first here as well.
> -+ if (SDL_JoystickOpened(0))
> ++ if (SDL_JoystickGetAttached(config.sdlJoystick))
> {
> -- debug(("Closing Joystick #%d - %s...\n", i,
> SDL_JoystickName(i)));
> -+ debug(("Closing Joystick #%d - %s...\n", 0,
> SDL_JoystickName(0)));
> +- debug(("Closing Joystick #%d\n", i));
> ++ debug(("Closing Joystick #%d\n", 0));
> SDL_JoystickClose(config.sdlJoystick);
> }
> }
> Index: patches/patch-src_main_cpp
> ===================================================================
> RCS file: /cvs/ports/games/blobwars/patches/patch-src_main_cpp,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_main_cpp
> --- patches/patch-src_main_cpp 29 Apr 2013 11:27:44 -0000 1.1
> +++ patches/patch-src_main_cpp 4 May 2017 21:49:18 -0000
> @@ -1,13 +1,13 @@
> $OpenBSD: patch-src_main_cpp,v 1.1 2013/04/29 11:27:44 landry Exp $
> Fix non-ascii locales
> ---- src/main.cpp.orig Sun Apr 28 10:53:36 2013
> -+++ src/main.cpp Sun Apr 28 10:56:42 2013
> -@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
> +--- src/main.cpp.orig
> ++++ src/main.cpp
> +@@ -138,7 +138,7 @@ int main(int argc, char *argv[])
> replayData.reset();
>
> bindtextdomain("blobwars", LOCALEDIR);
> - setlocale(LC_ALL, "");
> + bind_textdomain_codeset("blobwars", "UTF-8");
> + setlocale(LC_NUMERIC, "C");
> textdomain("blobwars");
>
> - atexit(cleanup);
> Index: patches/patch-src_map_cpp
> ===================================================================
> RCS file: /cvs/ports/games/blobwars/patches/patch-src_map_cpp,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_map_cpp
> --- patches/patch-src_map_cpp 2 Apr 2011 17:39:33 -0000 1.1
> +++ patches/patch-src_map_cpp 4 May 2017 21:49:18 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-src_map_cpp,v 1.1 2011/04/02 17:39:33 kili Exp $
> ---- src/map.cpp.orig Sun Feb 13 18:22:21 2011
> -+++ src/map.cpp Sat Apr 2 16:41:32 2011
> -@@ -400,7 +400,7 @@ void showMap(int centerX, int centerY)
> +--- src/map.cpp.orig
> ++++ src/map.cpp
> +@@ -399,7 +399,7 @@ void showMap(int centerX, int centerY)
> engine.flushInput();
> engine.clearInput();
>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/games/blobwars/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 15 Jun 2012 08:32:15 -0000 1.7
> +++ pkg/PLIST 4 May 2017 21:49:18 -0000
> @@ -27,6 +27,7 @@ share/doc/blobwars/spreadIcon.png
> share/doc/blobwars/title.png
> share/icons/hicolor/16x16/apps/blobwars.png
> share/icons/hicolor/32x32/apps/blobwars.png
> +share/icons/hicolor/48x48/apps/blobwars.png
> share/icons/hicolor/64x64/apps/blobwars.png
> share/locale/ca/LC_MESSAGES/blobwars.mo
> share/locale/da/LC_MESSAGES/blobwars.mo
