[pkgsrc/trunk]: pkgsrc/games rocksndiamonds: updated to 4.1.2.0

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/games rocksndiamonds: updated to 4.1.2.0
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 11:10:09 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/9e6f26e0fd9e
branches:  trunk
changeset: 395320:9e6f26e0fd9e
user:      adam <adam%pkgsrc.org@localhost>
date:      Sun May 05 07:59:38 2019 +0000

description:
rocksndiamonds: updated to 4.1.2.0

4.1.2.0:
Levels & Artwork:
drag-and-drop support for level and artwork zip files on all platforms
zip files can be dropped into main menu or into level set selection menu
zip files placed into level (sub-)directory will be extracted at start
added support for level sketch copy/paste using Ctrl-c/v in level editor
also makes it easy to copy complete playfields between levels in editor
added support for graphics sets with dynamic window and playfield size
added special global animation mode ?NO_TITLE? for all but title screens

Gameplay:
added request dialog to play again after game is over without solving level
added quickly toggling team mode by clicking on main menu ?name/team? text

Bug fixes:
fixed bugs in game logic of ?game of life? and ?biomaze? elements
fixed many bugs related to local and network multi-player games
fixed many bugs related to virtual buttons when playing on touch devices
lots of other bugs fixed in this release (see Git commit messages)

Other changes:
removed support for SDL 1.2

4.1.1.0:
Multi-player games (team mode and network games):
improved support for network multi-player games (plus lots of bugfixes)
network games can now be fully configured by using setup menu settings
when playing network games, the level to be played is now sent to all clients
added UDP broadcast to auto-detect network server in local network
multi-player levels now marked in main menu preview with network or team mode
fixed team mode games in R?n?D game engine (all players have to enter an exit)
added player option in level editor to let the first player solve the level

Virtual buttons on touch devices:
improved support for highly configurable virtual buttons on touch devices
options for transparency, grid size, highlighted and outlined virtual buttons
separately configurable virtual buttons for portrait and landscape mode

Graphics:
ultra-smooth scrolling using vertical sync (vsync) on supported devices

Game settings:
added setup option to directly play the next level after solving a level
added setup option to skip displaying the high scores after solving a level
added setup option to use extended list for game speed selection

Global animations:
added event actions (key events and screen buttons) to global animations
this allows for simulating key or button events when animations are clicked
added ?passthrough? option to click several overlapping global animations

Other changes:
fixed bug with dragon fire destroying indestructible steel letter walls
fixed various other bugs (and probably added some new)

diffstat:

 games/mirrormagic/patches/patch-src_Makefile              |  19 ++++++++++++
 games/mirrormagic/patches/patch-src_libgame_joystick.c    |  22 +++++++++++++++
 games/mirrormagic/patches/patch-src_libgame_joystick.h    |  15 ++++++++++
 games/mirrormagic/patches/patch-src_libgame_system.c      |  18 ++++++++++++
 games/rocksndiamonds/Makefile                             |   4 +-
 games/rocksndiamonds/Makefile.common                      |   4 +--
 games/rocksndiamonds/distinfo                             |  16 +++++-----
 games/rocksndiamonds/patches/patch-src_Makefile           |  12 +++----
 games/rocksndiamonds/patches/patch-src_libgame_joystick.c |   6 ++--
 games/rocksndiamonds/patches/patch-src_libgame_system.c   |  10 +++---
 10 files changed, 98 insertions(+), 28 deletions(-)

diffs (216 lines):

diff -r d91a94d483ff -r 9e6f26e0fd9e games/mirrormagic/patches/patch-src_Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/mirrormagic/patches/patch-src_Makefile      Sun May 05 07:59:38 2019 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_Makefile,v 1.1 2019/05/05 07:59:38 adam Exp $
+
+Append to CFLAGS and LDFLAGS.
+
+--- src/Makefile.orig  2017-03-15 20:15:06.000000000 +0000
++++ src/Makefile
+@@ -117,8 +117,10 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
+ OPTIONS = -O3 -Wall
+ endif
+ 
+-CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+-LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
++# pkgsrc presets those variables, so use '+=' to append to them
++# flags for debugging or optimisation may be supplied from the pkgsrc Makefile
++CFLAGS += $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
++LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+ 
+ 
+ SRCS =        main.c          \
diff -r d91a94d483ff -r 9e6f26e0fd9e games/mirrormagic/patches/patch-src_libgame_joystick.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/mirrormagic/patches/patch-src_libgame_joystick.c    Sun May 05 07:59:38 2019 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_libgame_joystick.c,v 1.1 2019/05/05 07:59:38 adam Exp $
+
+Allow joystick on NetBSD.
+
+--- src/libgame/joystick.c.orig        2015-10-20 21:58:08.000000000 +0000
++++ src/libgame/joystick.c
+@@ -9,12 +9,13 @@
+ // joystick.c
+ // ============================================================================
+ 
+-#if defined(PLATFORM_FREEBSD)
++#include "misc.h"
++
++#if defined(PLATFORM_FREEBSD) || (defined(PLATFORM_NETBSD) && defined(HAVE_JOYSTICK))
+ #include <machine/joystick.h>
+ #endif
+ 
+ #include "joystick.h"
+-#include "misc.h"
+ 
+ 
+ /* ========================================================================= */
diff -r d91a94d483ff -r 9e6f26e0fd9e games/mirrormagic/patches/patch-src_libgame_joystick.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/mirrormagic/patches/patch-src_libgame_joystick.h    Sun May 05 07:59:38 2019 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libgame_joystick.h,v 1.1 2019/05/05 07:59:38 adam Exp $
+
+Allow joystick on NetBSD.
+
+--- src/libgame/joystick.h.orig        2017-09-12 20:17:10.000000000 +0000
++++ src/libgame/joystick.h
+@@ -23,7 +23,7 @@
+ 
+ #define MAX_JOYSTICK_NAME_LEN 40
+ 
+-#if defined(PLATFORM_FREEBSD)
++#if defined(PLATFORM_FREEBSD) || (defined(PLATFORM_NETBSD) && defined(HAVE_JOYSTICK))
+ #define DEV_JOYSTICK_0                "/dev/joy0"
+ #define DEV_JOYSTICK_1                "/dev/joy1"
+ #define DEV_JOYSTICK_2                "/dev/joy2"
diff -r d91a94d483ff -r 9e6f26e0fd9e games/mirrormagic/patches/patch-src_libgame_system.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/mirrormagic/patches/patch-src_libgame_system.c      Sun May 05 07:59:38 2019 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_libgame_system.c,v 1.1 2019/05/05 07:59:38 adam Exp $
+
+InitJoystick will be called more than once, so reset the state
+variable 'joystick' only if there's no joystick available (yet).
+
+--- src/libgame/system.c.orig  2018-04-10 19:44:08.000000000 +0000
++++ src/libgame/system.c
+@@ -1744,8 +1744,10 @@ void InitJoysticks()
+ 
+   /* always start with reliable default values */
+   joystick.status = JOYSTICK_NOT_AVAILABLE;
++  if (joystick.status == JOYSTICK_NOT_AVAILABLE) {
+   for (i = 0; i < MAX_PLAYERS; i++)
+     joystick.nr[i] = -1;              /* no joystick configured */
++  }
+ 
+   SDLInitJoysticks();
+ }
diff -r d91a94d483ff -r 9e6f26e0fd9e games/rocksndiamonds/Makefile
--- a/games/rocksndiamonds/Makefile     Sun May 05 07:58:38 2019 +0000
+++ b/games/rocksndiamonds/Makefile     Sun May 05 07:59:38 2019 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2018/07/13 17:27:32 adam Exp $
+# $NetBSD: Makefile,v 1.56 2019/05/05 07:59:38 adam Exp $
 
-DISTNAME=      rocksndiamonds-4.1.0.0
+DISTNAME=      rocksndiamonds-4.1.2.0
 
 COMMENT=       Game like Boulder Dash, Emerald Mine, or Sokoban
 
diff -r d91a94d483ff -r 9e6f26e0fd9e games/rocksndiamonds/Makefile.common
--- a/games/rocksndiamonds/Makefile.common      Sun May 05 07:58:38 2019 +0000
+++ b/games/rocksndiamonds/Makefile.common      Sun May 05 07:59:38 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2018/07/13 17:27:32 adam Exp $
+# $NetBSD: Makefile.common,v 1.17 2019/05/05 07:59:38 adam Exp $
 # used by games/mirrormagic/Makefile
 # used by games/rocksndiamonds/Makefile
 
@@ -9,8 +9,6 @@
 HOMEPAGE=      http://www.artsoft.org/${PKGBASE}/
 LICENSE=       gnu-gpl-v2
 
-PATCHDIR=      ${.CURDIR}/../../games/rocksndiamonds/patches
-
 USE_GAMESGROUP=                yes
 USE_TOOLS+=            gmake
 
diff -r d91a94d483ff -r 9e6f26e0fd9e games/rocksndiamonds/distinfo
--- a/games/rocksndiamonds/distinfo     Sun May 05 07:58:38 2019 +0000
+++ b/games/rocksndiamonds/distinfo     Sun May 05 07:59:38 2019 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.31 2018/07/13 17:27:32 adam Exp $
+$NetBSD: distinfo,v 1.32 2019/05/05 07:59:38 adam Exp $
 
-SHA1 (rocksndiamonds-4.1.0.0.tar.gz) = 9262857f4862bc52b47e53ef247efe3963cbc5b2
-RMD160 (rocksndiamonds-4.1.0.0.tar.gz) = 6e9f572dbd78d0dbb88b5cbf3d1aa94f54c16ddd
-SHA512 (rocksndiamonds-4.1.0.0.tar.gz) = 4949c2e9a601c8e005b006b13b82e36f7f001321051d392bc34aa4c234c6cddfa9fae16e58d83070072cac1429e13f1fb96d2c4b2ecd35a309065ca3c1c869c2
-Size (rocksndiamonds-4.1.0.0.tar.gz) = 3850621 bytes
-SHA1 (patch-src_Makefile) = 702af16aeb41f10d3ea995ad8c5c2a43f3ce9a0e
-SHA1 (patch-src_libgame_joystick.c) = 152bfcca101d5b66838d68532fbd76599297a6ef
+SHA1 (rocksndiamonds-4.1.2.0.tar.gz) = 8e5407304363536176eab17f34d81f42dd4bbd29
+RMD160 (rocksndiamonds-4.1.2.0.tar.gz) = c5c497a06cda5ae62e65645b23f5135f16bd687b
+SHA512 (rocksndiamonds-4.1.2.0.tar.gz) = ed58476da36024146f6cd028f2645bbfe5eb7fc2c481ef6597513e939a7558e27c175e77c593c533cb057450004f263aa51e335356f84dd5304dfe098f710096
+Size (rocksndiamonds-4.1.2.0.tar.gz) = 3923401 bytes
+SHA1 (patch-src_Makefile) = de1d33c22ef4828201d5b31747c009ceef463340
+SHA1 (patch-src_libgame_joystick.c) = 000805d76fee695cbedc42f1aa25423f04c08dbb
 SHA1 (patch-src_libgame_joystick.h) = a6bae0443a6285b9e4179119f1101ba7bf8d6727
-SHA1 (patch-src_libgame_system.c) = 5e45cba46865f43c7f7d9de3a1f5b44aebb185d0
+SHA1 (patch-src_libgame_system.c) = a43d320a760c59dbc57f77c1d3726c5c4b138a95
diff -r d91a94d483ff -r 9e6f26e0fd9e games/rocksndiamonds/patches/patch-src_Makefile
--- a/games/rocksndiamonds/patches/patch-src_Makefile   Sun May 05 07:58:38 2019 +0000
+++ b/games/rocksndiamonds/patches/patch-src_Makefile   Sun May 05 07:59:38 2019 +0000
@@ -1,19 +1,17 @@
-$NetBSD: patch-src_Makefile,v 1.1 2017/09/09 07:10:34 adam Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2019/05/05 07:59:38 adam Exp $
 
 Append to CFLAGS and LDFLAGS.
 
---- src/Makefile.orig  2017-03-15 20:15:06.000000000 +0000
+--- src/Makefile.orig  2019-02-17 19:09:38.000000000 +0000
 +++ src/Makefile
-@@ -117,8 +117,10 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
+@@ -113,8 +113,8 @@ SYS_LDFLAGS := $(shell echo $(SYS_LDFLAG
  OPTIONS = -O3 -Wall
  endif
  
 -CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
--LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
-+# pkgsrc presets those variables, so use '+=' to append to them
-+# flags for debugging or optimisation may be supplied from the pkgsrc Makefile
+-LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm -lz
 +CFLAGS += $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
-+LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
++LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm -lz
  
  
  SRCS =        main.c          \
diff -r d91a94d483ff -r 9e6f26e0fd9e games/rocksndiamonds/patches/patch-src_libgame_joystick.c
--- a/games/rocksndiamonds/patches/patch-src_libgame_joystick.c Sun May 05 07:58:38 2019 +0000
+++ b/games/rocksndiamonds/patches/patch-src_libgame_joystick.c Sun May 05 07:59:38 2019 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_libgame_joystick.c,v 1.1 2017/09/09 07:10:34 adam Exp $
+$NetBSD: patch-src_libgame_joystick.c,v 1.2 2019/05/05 07:59:38 adam Exp $
 
 Allow joystick on NetBSD.
 
---- src/libgame/joystick.c.orig        2015-10-20 21:58:08.000000000 +0000
+--- src/libgame/joystick.c.orig        2019-02-17 19:09:38.000000000 +0000
 +++ src/libgame/joystick.c
 @@ -9,12 +9,13 @@
  // joystick.c
@@ -19,4 +19,4 @@
 -#include "misc.h"
  
  
- /* ========================================================================= */
+ // ============================================================================
diff -r d91a94d483ff -r 9e6f26e0fd9e games/rocksndiamonds/patches/patch-src_libgame_system.c
--- a/games/rocksndiamonds/patches/patch-src_libgame_system.c   Sun May 05 07:58:38 2019 +0000
+++ b/games/rocksndiamonds/patches/patch-src_libgame_system.c   Sun May 05 07:59:38 2019 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-src_libgame_system.c,v 1.3 2018/07/13 17:27:32 adam Exp $
+$NetBSD: patch-src_libgame_system.c,v 1.4 2019/05/05 07:59:38 adam Exp $
 
 InitJoystick will be called more than once, so reset the state
 variable 'joystick' only if there's no joystick available (yet).
 
---- src/libgame/system.c.orig  2018-04-10 19:44:08.000000000 +0000
+--- src/libgame/system.c.orig  2019-02-17 19:09:38.000000000 +0000
 +++ src/libgame/system.c
-@@ -1744,8 +1744,10 @@ void InitJoysticks()
+@@ -1748,8 +1748,10 @@ void InitJoysticks(void)
  
-   /* always start with reliable default values */
+   // always start with reliable default values
    joystick.status = JOYSTICK_NOT_AVAILABLE;
 +  if (joystick.status == JOYSTICK_NOT_AVAILABLE) {
    for (i = 0; i < MAX_PLAYERS; i++)
-     joystick.nr[i] = -1;              /* no joystick configured */
+     joystick.nr[i] = -1;              // no joystick configured
 +  }
  
    SDLInitJoysticks();
Prev by Date: [pkgsrc/trunk]: pkgsrc/multimedia/dvdauthor dvdauthor: add missing file to PLIST
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc/TODO: add some
Previous by Thread: [pkgsrc/trunk]: pkgsrc/multimedia/dvdauthor dvdauthor: add missing file to PLIST
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc/TODO: add some
Indexes:
Home | Main Index | Thread Index | Old Index