Skip to contentSkip to conversation

Frotz and XorCurses

PATCH Superseded Thomas Huth 3 participants 8 messages Sep 12, 2019 – Mar 29, 2020

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

v2 cover Frotz and XorCurses

Here are two more games, Frotz and XorCurses, that I've used with buildroot last year ( https://www.qemu-advent-calendar.org/2018/ ).

Thomas Huth (2):
package/frotz: new package
package/xorcurses: new package

 DEVELOPERS                       |  1 +
 package/Config.in                |  2 ++
 package/frotz/Config.in          | 10 ++++++++++
 package/frotz/frotz.hash         |  5 +++++
 package/frotz/frotz.mk           | 29 +++++++++++++++++++++++++++++
 package/xorcurses/Config.in      | 11 +++++++++++
 package/xorcurses/xorcurses.hash |  5 +++++
 package/xorcurses/xorcurses.mk   | 25 +++++++++++++++++++++++++
 8 files changed, 88 insertions(+)
 create mode 100644 package/frotz/Config.in
 create mode 100644 package/frotz/frotz.hash
 create mode 100644 package/frotz/frotz.mk
 create mode 100644 package/xorcurses/Config.in
 create mode 100644 package/xorcurses/xorcurses.hash
 create mode 100644 package/xorcurses/xorcurses.mk
Signature · 1 line
2.21.0
#1 lore raw

PATCH v2 1/2 package/frotz: new package

Frotz is an interpreter for old Infocom adventures and other Z-code games.

---
 DEVELOPERS               |  1 +
 package/Config.in        |  1 +
 package/frotz/Config.in  | 10 ++++++++++
 package/frotz/frotz.hash |  5 +++++
 package/frotz/frotz.mk   | 29 +++++++++++++++++++++++++++++
 5 files changed, 46 insertions(+)
 create mode 100644 package/frotz/Config.in
 create mode 100644 package/frotz/frotz.hash
 create mode 100644 package/frotz/frotz.mk
DEVELOPERS +1 -0
index 7604cfe2b7..c8805fef7b 100644
@@ -2229,6 +2229,7 @@ F:	toolchain/
 
 N:	Thomas Huth <[email protected]>
 F:	package/ascii-invaders/
+F:	package/frotz/
 
 N:	Thomas Petazzoni <[email protected]>
 F:	arch/Config.in.arm
package/Config.in +1 -0
index 7d915ea4d7..92ec3ca66e 100644
@@ -252,6 +252,7 @@ menu "Games"
 	source "package/doom-wad/Config.in"
 	source "package/flare-engine/Config.in"
 	source "package/flare-game/Config.in"
+	source "package/frotz/Config.in"
 	source "package/gnuchess/Config.in"
 	source "package/lbreakout2/Config.in"
 	source "package/ltris/Config.in"
package/frotz/Config.in new file +10 -0
new file mode 100644
index 0000000000..59b6d0007d
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_FROTZ
+	bool "frotz"
+	select BR2_PACKAGE_NCURSES
+	help
+	  Frotz is an interpreter for old Infocom adventure games and
+	  other Z-code games. Note that frotz can not be run as root.
+	  You must add a normal user to your buildroot configuration to
+	  be able to use it.
+
+	  https://661.org/proj/if/frotz/
package/frotz/frotz.hash new file +5 -0
new file mode 100644
index 0000000000..8bb15eab03
@@ -0,0 +1,5 @@
+# Locally calculated
+sha512 c3aeb1bca227db7b759be880c1fe14e3d46c79eae3f2891d2472ff1e1b17b2153b2e400d537d54dce68011079e230fe8176ebb7547b2ecbc30e44f2b7423c285  frotz-2.44.tar.bz2
+
+# Hash for license file
+sha512 aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957  COPYING
package/frotz/frotz.mk new file +29 -0
new file mode 100644
index 0000000000..97e2eaf21f
@@ -0,0 +1,29 @@
+################################################################################
+#
+# Frotz
+#
+################################################################################
+
+FROTZ_VERSION = 2.44
+FROTZ_SOURCE = frotz-$(FROTZ_VERSION).tar.bz2
+FROTZ_SITE = https://gitlab.com/DavidGriffith/frotz/-/archive/$(FROTZ_VERSION)
+FROTZ_DEPENDENCIES = ncurses
+FROTZ_LICENSE = GPL-2.0+
+FROTZ_LICENSE_FILES = COPYING
+
+define FROTZ_POST_EXTRACT_FIXUP
+	( sed -i 's/$	ar rc/	\$$\(AR\) rc/g' $(@D)/Makefile ; \
+	  sed -i 's/$	ranlib/	\$$\(RANLIB\)/g' $(@D)/Makefile ; \
+	  sed -i 's/$	strip/	\$$\(STRIP\)/g' $(@D)/Makefile )
+endef
+FROTZ_POST_EXTRACT_HOOKS += FROTZ_POST_EXTRACT_FIXUP
+
+define FROTZ_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr CONFIG_DIR=/etc -C $(@D)
+endef
+
+define FROTZ_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/frotz $(TARGET_DIR)/usr/bin/frotz
+endef
+
+$(eval $(generic-package))
Signature · 1 line
2.21.0
#2 lore raw

PATCH v2 1/2 package/frotz: new package

Hi Thomas,

Quoted 79 lines · Thomas Huth

Frotz is an interpreter for old Infocom adventures and other Z-code games.

---
  DEVELOPERS               |  1 +
  package/Config.in        |  1 +
  package/frotz/Config.in  | 10 ++++++++++
  package/frotz/frotz.hash |  5 +++++
  package/frotz/frotz.mk   | 29 +++++++++++++++++++++++++++++
  5 files changed, 46 insertions(+)

create mode 100644 package/frotz/Config.in
create mode 100644 package/frotz/frotz.hash
create mode 100644 package/frotz/frotz.mk

DEVELOPERS +1 -0
index 7604cfe2b7..c8805fef7b 100644
@@ -2229,6 +2229,7 @@ F:	toolchain/
 
  N:	Thomas Huth <[email protected]>
  F:	package/ascii-invaders/
+F:	package/frotz/
 
  N:	Thomas Petazzoni <[email protected]>
  F:	arch/Config.in.arm
package/Config.in +1 -0
index 7d915ea4d7..92ec3ca66e 100644
@@ -252,6 +252,7 @@ menu "Games"
  	source "package/doom-wad/Config.in"
  	source "package/flare-engine/Config.in"
  	source "package/flare-game/Config.in"
+	source "package/frotz/Config.in"
  	source "package/gnuchess/Config.in"
  	source "package/lbreakout2/Config.in"
  	source "package/ltris/Config.in"
package/frotz/Config.in new file +10 -0
new file mode 100644
index 0000000000..59b6d0007d
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_FROTZ
+	bool "frotz"
+	select BR2_PACKAGE_NCURSES
+	help
+	  Frotz is an interpreter for old Infocom adventure games and
+	  other Z-code games. Note that frotz can not be run as root.
+	  You must add a normal user to your buildroot configuration to
+	  be able to use it.
+
+	  https://661.org/proj/if/frotz/
package/frotz/frotz.hash new file +5 -0
new file mode 100644
index 0000000000..8bb15eab03
@@ -0,0 +1,5 @@
+# Locally calculated
+sha512 c3aeb1bca227db7b759be880c1fe14e3d46c79eae3f2891d2472ff1e1b17b2153b2e400d537d54dce68011079e230fe8176ebb7547b2ecbc30e44f2b7423c285  frotz-2.44.tar.bz2
+
+# Hash for license file
+sha512 aee80b1f9f7f4a8a00dcf6e6ce6c41988dcaedc4de19d9d04460cbfb05d99829ffe8f9d038468eabbfba4d65b38e8dbef5ecf5eb8a1b891d9839cda6c48ee957  COPYING
package/frotz/frotz.mk new file +8 -0
new file mode 100644
index 0000000000..97e2eaf21f
@@ -0,0 +1,29 @@
+################################################################################
+#
+# Frotz
+#
+################################################################################
+
+FROTZ_VERSION = 2.44
+FROTZ_SOURCE = frotz-$(FROTZ_VERSION).tar.bz2

package/frotz/frotz.mk line 18

Quoted 10 lines
package/frotz/frotz.mk new file +10 -0
+FROTZ_SITE = https://gitlab.com/DavidGriffith/frotz/-/archive/$(FROTZ_VERSION)
+FROTZ_DEPENDENCIES = ncurses
+FROTZ_LICENSE = GPL-2.0+
+FROTZ_LICENSE_FILES = COPYING
+
+define FROTZ_POST_EXTRACT_FIXUP
+	( sed -i 's/$	ar rc/	\$$\(AR\) rc/g' $(@D)/Makefile ; \
+	  sed -i 's/$	ranlib/	\$$\(RANLIB\)/g' $(@D)/Makefile ; \
+	  sed -i 's/$	strip/	\$$\(STRIP\)/g' $(@D)/Makefile )
+endef

Here you should provide a patch(and send it upstream) instead of this hack.

package/frotz/frotz.mk line 29

Quoted 12 lines
package/frotz/frotz.mk new file +11 -0
+FROTZ_POST_EXTRACT_HOOKS += FROTZ_POST_EXTRACT_FIXUP
+
+define FROTZ_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) PREFIX=/usr CONFIG_DIR=/etc -C $(@D)
+endef
+
+define FROTZ_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/frotz $(TARGET_DIR)/usr/bin/frotz
+endef
+
+$(eval $(generic-package))

Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
#3 lore raw

PATCH v2 2/2 package/xorcurses: new package

In reply to Thomas Huth

From: Thomas Huth <[email protected]>

XorCurses is a remake of the 8-bit game 'Xor' by Astral Software. Your task is to roam around a series of mazes where you have to collect all blue masks before finding the exit. You have two 'shields' (players) and you can use either one at any time and switch between them. While the first level is simply a matter of navigation, the following levels introduce further objects like bombs and teleports, which have to be used right to solve the puzzles.

---
 package/Config.in                |  1 +
 package/xorcurses/Config.in      | 11 +++++++++++
 package/xorcurses/xorcurses.hash |  5 +++++
 package/xorcurses/xorcurses.mk   | 25 +++++++++++++++++++++++++
 4 files changed, 42 insertions(+)
 create mode 100644 package/xorcurses/Config.in
 create mode 100644 package/xorcurses/xorcurses.hash
 create mode 100644 package/xorcurses/xorcurses.mk
package/Config.in +1 -0
index 92ec3ca66e..629376f7c1 100644
@@ -268,6 +268,7 @@ menu "Games"
 	source "package/stella/Config.in"
 	source "package/supertux/Config.in"
 	source "package/supertuxkart/Config.in"
+	source "package/xorcurses/Config.in"
 endmenu
 
 menu "Graphic libraries and applications (graphic/text)"
package/xorcurses/Config.in new file +11 -0
new file mode 100644
index 0000000000..f0b1a7898c
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XORCURSES
+	bool "xorcurses"
+	select BR2_PACKAGE_NCURSES
+	help
+	  XorCurses is a game remake of the 8-bit game 'Xor'. Your task
+	  is to roam around a series of mazes where you have to collect
+	  all blue masks before finding the exit. Note that the game
+	  needs a terminal with colors, i.e. make sure that the TERM
+	  environment variable is set to "linux" ("vt100" won't work).
+
+	  http://jwm-art.net/?p=XorCurses
package/xorcurses/xorcurses.hash new file +5 -0
new file mode 100644
index 0000000000..38c1c001c1
@@ -0,0 +1,5 @@
+# Locally calculated
+sha512 1782ebf6ae8798b32e0a8e5e20e6d0b44eb619f6e7f015735c6e86205bd545da108c36bff1c9cfc9e9b44dee8f90bacb9df70436991f57f51c2c87e94b3a4725  XorCurses-0.2.2.tar.bz2
+
+# License information is only mentioned in the README file
+sha512 1878313f74d10e97aea8560ca9b28981b7ccf83ade81275eb982684cea006bc55776b6d029d1eca7a7ae20756aed0cfb4f63424634e0b5ad15d052dca3d2eee9  README
package/xorcurses/xorcurses.mk new file +25 -0
new file mode 100644
index 0000000000..aa70b73c08
@@ -0,0 +1,25 @@
+################################################################################
+#
+# XorCurses
+#
+################################################################################
+
+XORCURSES_VERSION = 0.2.2
+XORCURSES_SOURCE = XorCurses-$(XORCURSES_VERSION).tar.bz2
+XORCURSES_SITE = http://www.jwm-art.net/art/archive
+XORCURSES_DEPENDENCIES = ncurses
+XORCURSES_LICENSE = GPL-3.0
+XORCURSES_LICENSE_FILES = README
+
+define XORCURSES_BUILD_CMDS
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -DDATADIR='\"/usr/share/xorcurses\"' -DVERSION='\"$(XORCURSES_VERSION)\"'"
+endef
+
+define XORCURSES_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/xorcurses $(TARGET_DIR)/usr/bin/xorcurses
+	mkdir -p $(TARGET_DIR)/usr/share/xorcurses/maps
+	$(INSTALL) -D -m 0644 $(@D)/maps/*.xcm $(TARGET_DIR)/usr/share/xorcurses/maps/
+endef
+
+$(eval $(generic-package))
Signature · 1 line
2.21.0
#4 lore raw

PATCH v2 2/2 package/xorcurses: new package

Hi Thomas,

Quoted 73 lines · Thomas Huth

From: Thomas Huth <[email protected]>

XorCurses is a remake of the 8-bit game 'Xor' by Astral Software. Your task is to roam around a series of mazes where you have to collect all blue masks before finding the exit. You have two 'shields' (players) and you can use either one at any time and switch between them. While the first level is simply a matter of navigation, the following levels introduce further objects like bombs and teleports, which have to be used right to solve the puzzles.

---
  package/Config.in                |  1 +
  package/xorcurses/Config.in      | 11 +++++++++++
  package/xorcurses/xorcurses.hash |  5 +++++
  package/xorcurses/xorcurses.mk   | 25 +++++++++++++++++++++++++
  4 files changed, 42 insertions(+)

create mode 100644 package/xorcurses/Config.in create mode 100644 package/xorcurses/xorcurses.hash create mode 100644 package/xorcurses/xorcurses.mk

package/Config.in +1 -0
index 92ec3ca66e..629376f7c1 100644
@@ -268,6 +268,7 @@ menu "Games"
  	source "package/stella/Config.in"
  	source "package/supertux/Config.in"
  	source "package/supertuxkart/Config.in"
+	source "package/xorcurses/Config.in"
  endmenu
 
  menu "Graphic libraries and applications (graphic/text)"
package/xorcurses/Config.in new file +11 -0
new file mode 100644
index 0000000000..f0b1a7898c
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_XORCURSES
+	bool "xorcurses"
+	select BR2_PACKAGE_NCURSES
+	help
+	  XorCurses is a game remake of the 8-bit game 'Xor'. Your task
+	  is to roam around a series of mazes where you have to collect
+	  all blue masks before finding the exit. Note that the game
+	  needs a terminal with colors, i.e. make sure that the TERM
+	  environment variable is set to "linux" ("vt100" won't work).
+
+	  http://jwm-art.net/?p=XorCurses
package/xorcurses/xorcurses.hash new file +5 -0
new file mode 100644
index 0000000000..38c1c001c1
@@ -0,0 +1,5 @@
+# Locally calculated
+sha512 1782ebf6ae8798b32e0a8e5e20e6d0b44eb619f6e7f015735c6e86205bd545da108c36bff1c9cfc9e9b44dee8f90bacb9df70436991f57f51c2c87e94b3a4725  XorCurses-0.2.2.tar.bz2
+
+# License information is only mentioned in the README file
+sha512 1878313f74d10e97aea8560ca9b28981b7ccf83ade81275eb982684cea006bc55776b6d029d1eca7a7ae20756aed0cfb4f63424634e0b5ad15d052dca3d2eee9  README
package/xorcurses/xorcurses.mk new file +6 -0
new file mode 100644
index 0000000000..aa70b73c08
@@ -0,0 +1,25 @@
+################################################################################
+#
+# XorCurses
+#
+################################################################################
+

package/xorcurses/xorcurses.mk line 16

Quoted 10 lines
package/xorcurses/xorcurses.mk new file +10 -0
+XORCURSES_VERSION = 0.2.2
+XORCURSES_SOURCE = XorCurses-$(XORCURSES_VERSION).tar.bz2
+XORCURSES_SITE = http://www.jwm-art.net/art/archive
+XORCURSES_DEPENDENCIES = ncurses
+XORCURSES_LICENSE = GPL-3.0
+XORCURSES_LICENSE_FILES = README
+
+define XORCURSES_BUILD_CMDS
+	$(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -DDATADIR='\"/usr/share/xorcurses\"' -DVERSION='\"$(XORCURSES_VERSION)\"'"

Here ^^^ the line is too long.

package/xorcurses/xorcurses.mk line 22

Quoted 6 lines
package/xorcurses/xorcurses.mk new file +6 -0
+endef
+
+define XORCURSES_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/xorcurses $(TARGET_DIR)/usr/bin/xorcurses
+	mkdir -p $(TARGET_DIR)/usr/share/xorcurses/maps
+	$(INSTALL) -D -m 0644 $(@D)/maps/*.xcm $(TARGET_DIR)/usr/share/xorcurses/maps/

Here ^^^ the line is too long.

package/xorcurses/xorcurses.mk line 25

Quoted 4 lines
package/xorcurses/xorcurses.mk new file +3 -0
+endef
+
+$(eval $(generic-package))

And please add your DEVELOPERS entry for this package.

Thank you
Best regards

Signature · 2 lines
Giulio Benetti
Benetti Engineering sas
#5 lore raw

v2 cover Frotz and XorCurses

In reply to Thomas Huth
Quoted 2 lines · On Thu, 12 Sep 2019 20:40:11 +0200 Thomas Huth <[email protected]> wrote:

Here are two more games, Frotz and XorCurses, that I've used with buildroot last year ( https://www.qemu-advent-calendar.org/2018/ ).

Nice! So it means all those fun demo images were built with Buildroot ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

v2 cover Frotz and XorCurses

Am Fri, 13 Sep 2019 20:42:30 +0200
schrieb Thomas Petazzoni <[email protected]>:

Quoted 9 lines
Quoted 3 lines · On Thu, 12 Sep 2019 20:40:11 +0200 Thomas Huth <[email protected]> wrote:

Here are two more games, Frotz and XorCurses, that I've used with buildroot last year
( https://www.qemu-advent-calendar.org/2018/ ).

Nice! So it means all those fun demo images were built with Buildroot ?

Most of them - the ones that use a game on top of Linux for non-x86 systems. I.e. I've could post even more of these patches that add additional games, if there is interest, but most of my work is not really in an upstreamable shape yet, so the patches would need quite a bit of work first.

Thomas

#7 lore raw

v2 cover Frotz and XorCurses

In reply to Thomas Huth

Hello Thomas,

Quoted 3 lines · On Thu, 12 Sep 2019 20:40:11 +0200 Thomas Huth <[email protected]> wrote:

Thomas Huth (2):
package/frotz: new package
package/xorcurses: new package

Thanks for those patches! However, you had some comments from Giulio and you never sent a new iteration of the patches. Also, at least frotz has seen several new upstream releases, including changes that seem to fix the Makefile.

Could you respin new iteration of the patches ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com