From 57ffd6e1dcace13e27aa34e4bf94df8b36edd403 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Tue, 4 Jan 2022 16:34:47 +0100
Subject: [PATCH] brogue: update to 1.10.1, by switching to community edition

---
 packages/brogue/build.sh                      | 10 +++----
 packages/brogue/config.mk.patch               | 24 ++++++++++++++++
 packages/brogue/curses-platform.c.patch       | 28 -------------------
 packages/brogue/no_i586.patch                 | 12 --------
 .../src-platform-platformdependent.c.patch    | 11 --------
 5 files changed, 28 insertions(+), 57 deletions(-)
 create mode 100644 packages/brogue/config.mk.patch
 delete mode 100644 packages/brogue/curses-platform.c.patch
 delete mode 100644 packages/brogue/no_i586.patch
 delete mode 100644 packages/brogue/src-platform-platformdependent.c.patch

diff --git a/packages/brogue/build.sh b/packages/brogue/build.sh
index 1ebd5e768..9b77caeb2 100644
--- a/packages/brogue/build.sh
+++ b/packages/brogue/build.sh
@@ -1,13 +1,11 @@
 TERMUX_PKG_HOMEPAGE=https://sites.google.com/site/broguegame/
-TERMUX_PKG_DESCRIPTION="Roguelike dungeon crawling game"
+TERMUX_PKG_DESCRIPTION="Roguelike dungeon crawling game (community edition)"
 TERMUX_PKG_LICENSE="AGPL-V3"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=1.7.5
-TERMUX_PKG_REVISION=4
-TERMUX_PKG_SRCURL=https://github.com/termux/distfiles/releases/download/2021.01.04/brogue-${TERMUX_PKG_VERSION}-linux-amd64.tbz2
-TERMUX_PKG_SHA256=a74ff18139564c597d047cfb167f74ab1963dd8608b6fb2e034e7635d6170444
+TERMUX_PKG_VERSION=1.10.1
+TERMUX_PKG_SRCURL=https://github.com/tmewett/BrogueCE/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_SHA256=3e0425b3f1b59afe98a92c0282aa4dd7e8964b53f7cab969fcf437701a04c5fa
 TERMUX_PKG_DEPENDS="ncurses"
-TERMUX_PKG_EXTRA_MAKE_ARGS="curses"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_GROUPS="games"
 
diff --git a/packages/brogue/config.mk.patch b/packages/brogue/config.mk.patch
new file mode 100644
index 000000000..ae866b73a
--- /dev/null
+++ b/packages/brogue/config.mk.patch
@@ -0,0 +1,24 @@
+--- ../config.mk.orig	2022-01-04 16:32:56.338295489 +0100
++++ ./config.mk	2022-01-04 16:33:21.661580852 +0100
+@@ -2,10 +2,10 @@
+ DATADIR := .
+ 
+ # Include terminal support. Requires ncurses
+-TERMINAL := NO
++TERMINAL := YES
+ 
+ # Include graphical support. Requires SDL2 and SDL2_image
+-GRAPHICS := YES
++GRAPHICS := NO
+ # Path to sdl2-config script
+ SDL_CONFIG := sdl2-config
+ 
+@@ -16,7 +16,7 @@
+ DEBUG := NO
+ 
+ # Declare this is a release build
+-RELEASE := NO
++RELEASE := YES
+ 
+ # Configure the executable to run from a macOS .app bundle (only works in graphical mode)
+ MAC_APP := NO
diff --git a/packages/brogue/curses-platform.c.patch b/packages/brogue/curses-platform.c.patch
deleted file mode 100644
index 973a49c03..000000000
--- a/packages/brogue/curses-platform.c.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-In Android the <sys/timeb.h> header and associated ftime(3) has been
-removed in android-21 since it is deprecated and removed from POSIX.
-
-diff -u -r ../brogue-1.7.4/src/platform/curses-platform.c ./src/platform/curses-platform.c
---- ../brogue-1.7.4/src/platform/curses-platform.c	2014-07-03 15:19:10.000000000 -0400
-+++ ./src/platform/curses-platform.c	2014-12-20 03:47:20.303572495 -0500
-@@ -3,7 +3,7 @@
- #include <string.h>
- #include <time.h>
- #include "term.h"
--#include <sys/timeb.h>
-+#include <sys/time.h>
- #include <stdint.h>
- #include <signal.h>
- #include "platform.h"
-@@ -109,9 +109,9 @@
- #define PAUSE_BETWEEN_EVENT_POLLING		34//17
-
- static uint32_t getTime() {
--	struct timeb time;
--	ftime(&time);
--	return 1000 * time.time + time.millitm;
-+	struct timeval tv;
-+	gettimeofday(&tv, NULL);
-+	return 1000 * tv.tv_sec + tv.tv_usec / 1000;
- }
-
- static boolean curses_pauseForMilliseconds(short milliseconds) {
diff --git a/packages/brogue/no_i586.patch b/packages/brogue/no_i586.patch
deleted file mode 100644
index 6b6e49823..000000000
--- a/packages/brogue/no_i586.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ../brogue-linux-1.7.3/brogue-1.7.3/Makefile	2013-09-11 07:38:48.000000000 +0200
-+++ ./Makefile	2014-01-28 07:57:06.000000000 +0100
-@@ -81,7 +81,7 @@
- .PHONY : clean both curses tcod tar
- 
- bin/brogue : ${DEPENDENCIES} ${BROGUEFILES}
--	$(CC) -O2 -march=i586 -o bin/brogue ${BROGUEFILES} ${LIBRARIES} -Wl,-rpath,.
-+	$(CC) -o bin/brogue ${BROGUEFILES} ${LIBRARIES} -Wl,-rpath,.
- 
- clean : 
- 	rm -f src/brogue/*.o src/platform/*.o bin/brogue
-
diff --git a/packages/brogue/src-platform-platformdependent.c.patch b/packages/brogue/src-platform-platformdependent.c.patch
deleted file mode 100644
index ff5f73302..000000000
--- a/packages/brogue/src-platform-platformdependent.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r ../brogue-1.7.4/src/platform/platformdependent.c ./src/platform/platformdependent.c
---- ../brogue-1.7.4/src/platform/platformdependent.c	2014-07-03 19:19:10.000000000 +0000
-+++ ./src/platform/platformdependent.c	2017-07-07 07:09:10.116242335 +0000
-@@ -21,6 +21,7 @@
-  *  along with Brogue.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include <ctype.h>
- #include <stdio.h>
- #include <string.h>
- #include <time.h>