This update fixes several bugs, introduces game behaviour changes and
provides new elements.
I've been playing it successfully in offline mode, never tried any of
the online stuff.
Upstream now links against stdc++ itself so we no longer need to patch
c++abi in for libunwind, but perhaps I'm missing something here.
Feedback? OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/tome4/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 22 Aug 2019 10:06:46 -0000 1.21
+++ Makefile 26 Feb 2020 20:17:07 -0000
@@ -10,13 +10,12 @@ ONLY_FOR_ARCHS = i386 amd64
COMMENT-main = graphical sdl rogue-like game
COMMENT-data = data for Tales of Maj'Eyal
-V = 1.5.10
+V = 1.6.7
PKGNAME-main = tome4-${V}
PKGNAME-data = tome4-data-${V}
CATEGORIES = games x11
-REVISION-main = 0
-MASTER_SITES = http://te4.org/dl/t-engine/ \
+MASTER_SITES = https://te4.org/dl/t-engine/ \
http://distfiles-openbsd.perso.pw/
DISTNAME = t-engine4-src-${V}
EXTRACT_SUFX = .tar.bz2
@@ -29,7 +28,7 @@ MAINTAINER = Solene Rapenne <solene@pers
# GPLV3+ and bundled MIT, zlib, BSD in games/thirdparty/licenses/
PERMIT_PACKAGE = Yes
-WANTLIB-main = GL GLU SDL2 SDL2_image SDL2_ttf openal c m \
+WANTLIB-main = GL GLU SDL2 SDL2_image SDL2_ttf openal c c++ m \
png pthread vorbisfile
BUILD_DEPENDS = devel/premake4
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/tome4/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 27 May 2018 20:26:56 -0000 1.7
+++ distinfo 26 Feb 2020 19:15:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (t-engine4-src-1.5.10.tar.bz2) =
p20p0sC5ZOmrEhhzBBxVkw2xoMza+HcijcumLuBrhVU=
-SIZE (t-engine4-src-1.5.10.tar.bz2) = 422659741
+SHA256 (t-engine4-src-1.6.7.tar.bz2) =
yESQDoIxal8lr9qNzyB6EMxUAH6m5QfyTyLDouuGAwk=
+SIZE (t-engine4-src-1.6.7.tar.bz2) = 434651872
Index: patches/lld-linking
===================================================================
RCS file: /cvs/ports/games/tome4/patches/lld-linking,v
retrieving revision 1.1
diff -u -p -r1.1 lld-linking
--- patches/lld-linking 31 Oct 2018 09:48:18 -0000 1.1
+++ patches/lld-linking 26 Feb 2020 20:17:20 -0000
@@ -1,15 +1,97 @@
$OpenBSD: lld-linking,v 1.1 2018/10/31 09:48:18 solene Exp $
-link against libc++abi to access libunwind symbols needed by luajit
+Remove hardcoded optimization level.
Index: build/te4core.lua
--- build/te4core.lua.orig
+++ build/te4core.lua
-@@ -50,6 +50,7 @@ project "TEngine"
- if _OPTIONS.relpath == "64" then defines{"TE4_RELPATH64"} end
+@@ -41,7 +41,6 @@ project "TEngine"
+ if _OPTIONS.discord then defines { "DISCORD_TE4" } end
+ defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" }
+ defines { [[TENGINE_HOME_PATH='".t-engine"']],
"TE4CORE_VERSION="..TE4CORE_VERSION }
+- --buildoptions { "-O3" }
- links { "m" }
-+ links { "c++abi" }
+ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath
-Wl,\\\$\$ORIGIN/lib "} end
+ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath
-Wl,\\\$\$ORIGIN/lib64 "} end
+@@ -197,9 +196,9 @@ elseif _OPTIONS.lua == "jit2" then
- if _OPTIONS.no_rwops_size then defines{"NO_RWOPS_SIZE"} end
+ local arch_test
+ if _OPTIONS.wincross then
+- arch_test = os.capture("i686-pc-mingw32-gcc -E
../src/luajit2/src/lj_arch.h -dM", true)
++ arch_test = os.capture("i686-pc-mingw32-cc -E
../src/luajit2/src/lj_arch.h -dM", true)
+ else
+- arch_test = os.capture("gcc -E
../src/luajit2/src/lj_arch.h -dM", true)
++ arch_test = os.capture("cc -E
../src/luajit2/src/lj_arch.h -dM", true)
+ end
+ if string.find(arch_test, "LJ_TARGET_X64") then
+@@ -233,16 +232,16 @@ elseif _OPTIONS.lua == "jit2" then
+ configuration {"Debug"}
+ if _OPTIONS.wincross then
+ postbuildcommands {
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
+- 'gcc -o ../bin/Debug/minilua
../obj/Debug/minilua/minilua.cross.o -m32 -L/usr/lib32
-L/Test/xcompile/local/lib -lm',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
++ 'cc -o ../bin/Debug/minilua
../obj/Debug/minilua/minilua.cross.o -m32 -L/usr/lib32
-L/Test/xcompile/local/lib -lm',
+ }
+ end
+ postbuildcommands { "cp ../bin/Debug/minilua
../src/luajit2/src/host/", }
+ configuration {"Release"}
+ if _OPTIONS.wincross then
+ postbuildcommands {
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/minilua/minilua.cross.o" -c
"../src/luajit2/src/host/minilua.c"',
+- 'gcc -o ../bin/Release/minilua
../obj/Release/minilua/minilua.cross.o -m32 -L/usr/lib32
-L/Test/xcompile/local/lib -lm',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/minilua/minilua.cross.o" -c
"../src/luajit2/src/host/minilua.c"',
++ 'cc -o ../bin/Release/minilua
../obj/Release/minilua/minilua.cross.o -m32 -L/usr/lib32
-L/Test/xcompile/local/lib -lm',
+ }
+ end
+ postbuildcommands { "cp ../bin/Release/minilua
../src/luajit2/src/host/", }
+@@ -256,9 +255,9 @@ elseif _OPTIONS.lua == "jit2" then
+ local dasm_flags = ""
+ local arch_test
+ if _OPTIONS.wincross then
+- arch_test = os.capture("i686-pc-mingw32-gcc -E
../src/luajit2/src/lj_arch.h -dM", true)
++ arch_test = os.capture("i686-pc-mingw32-cc -E
../src/luajit2/src/lj_arch.h -dM", true)
+ else
+- arch_test = os.capture("gcc -E
../src/luajit2/src/lj_arch.h -dM", true)
++ arch_test = os.capture("cc -E
../src/luajit2/src/lj_arch.h -dM", true)
+ end
+
+ if string.find(arch_test, "LJ_TARGET_X64") then
+@@ -335,24 +334,24 @@ elseif _OPTIONS.lua == "jit2" then
+ configuration {"Debug"}
+ if _OPTIONS.wincross then
+ postbuildcommands {
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm_lib.cross.o" -c
"../src/luajit2/src/host/buildvm_lib.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm_asm.cross.o" -c
"../src/luajit2/src/host/buildvm_asm.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm_peobj.cross.o" -c
"../src/luajit2/src/host/buildvm_peobj.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm_fold.cross.o" -c
"../src/luajit2/src/host/buildvm_fold.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
+- 'gcc -o ../bin/Debug/buildvm
../obj/Debug/buildvm/buildvm_lib.cross.o
../obj/Debug/buildvm/buildvm_asm.cross.o
../obj/Debug/buildvm/buildvm_peobj.cross.o
../obj/Debug/buildvm/buildvm_fold.cross.o ../obj/Debug/buildvm/buildvm.cross.o
-m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm_lib.cross.o" -c
"../src/luajit2/src/host/buildvm_lib.c"',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm_asm.cross.o" -c
"../src/luajit2/src/host/buildvm_asm.c"',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm_peobj.cross.o" -c
"../src/luajit2/src/host/buildvm_peobj.c"',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm_fold.cross.o" -c
"../src/luajit2/src/host/buildvm_fold.c"',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Debug/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
++ 'cc -o ../bin/Debug/buildvm
../obj/Debug/buildvm/buildvm_lib.cross.o
../obj/Debug/buildvm/buildvm_asm.cross.o
../obj/Debug/buildvm/buildvm_peobj.cross.o
../obj/Debug/buildvm/buildvm_fold.cross.o ../obj/Debug/buildvm/buildvm.cross.o
-m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
+ }
+ end
+ postbuildcommands { "cp ../bin/Debug/buildvm
../src/luajit2/src/", }
+ configuration {"Release"}
+ if _OPTIONS.wincross then
+ postbuildcommands {
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm_lib.cross.o" -c
"../src/luajit2/src/host/buildvm_lib.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm_asm.cross.o" -c
"../src/luajit2/src/host/buildvm_asm.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm_peobj.cross.o" -c
"../src/luajit2/src/host/buildvm_peobj.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm_fold.cross.o" -c
"../src/luajit2/src/host/buildvm_fold.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm.cross.o" -c
"../src/luajit2/src/host/buildvm.c"',
+- 'gcc -o ../bin/Release/buildvm
../obj/Release/buildvm/buildvm_lib.cross.o
../obj/Release/buildvm/buildvm_asm.cross.o
../obj/Release/buildvm/buildvm_peobj.cross.o
../obj/Release/buildvm/buildvm_fold.cross.o
../obj/Release/buildvm/buildvm.cross.o -m32 -L/usr/lib32
-L/Test/xcompile/local/lib',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm_lib.cross.o" -c
"../src/luajit2/src/host/buildvm_lib.c"',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm_asm.cross.o" -c
"../src/luajit2/src/host/buildvm_asm.c"',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm_peobj.cross.o" -c
"../src/luajit2/src/host/buildvm_peobj.c"',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm_fold.cross.o" -c
"../src/luajit2/src/host/buildvm_fold.c"',
++ 'cc -MMD -MP -DGLEW_STATIC
-DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src
-I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp
-I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2
-I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o
"../obj/Release/buildvm/buildvm.cross.o" -c
"../src/luajit2/src/host/buildvm.c"',
++ 'cc -o ../bin/Release/buildvm
../obj/Release/buildvm/buildvm_lib.cross.o
../obj/Release/buildvm/buildvm_asm.cross.o
../obj/Release/buildvm/buildvm_peobj.cross.o
../obj/Release/buildvm/buildvm_fold.cross.o
../obj/Release/buildvm/buildvm.cross.o -m32 -L/usr/lib32
-L/Test/xcompile/local/lib',
+ }
+ end
+ postbuildcommands { "cp ../bin/Release/buildvm
../src/luajit2/src/", }
Index: patches/patch-build_te4core_lua
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-build_te4core_lua,v
retrieving revision 1.2
diff -u -p -r1.2 patch-build_te4core_lua
--- patches/patch-build_te4core_lua 29 Apr 2018 10:21:35 -0000 1.2
+++ patches/patch-build_te4core_lua 7 Jan 2020 10:28:01 -0000
@@ -1,4 +1,7 @@
$OpenBSD: patch-build_te4core_lua,v 1.2 2018/04/29 10:21:35 solene Exp $
+
+Remove hardcoded optimization level.
+
Index: build/te4core.lua
--- build/te4core.lua.orig
+++ build/te4core.lua
Index: patches/patch-premake4_lua
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-premake4_lua,v
retrieving revision 1.3
diff -u -p -r1.3 patch-premake4_lua
--- patches/patch-premake4_lua 29 Apr 2018 10:21:35 -0000 1.3
+++ patches/patch-premake4_lua 7 Jan 2020 10:29:31 -0000
@@ -1,4 +1,8 @@
$OpenBSD: patch-premake4_lua,v 1.3 2018/04/29 10:21:35 solene Exp $
+
+Fix library and include paths.
+Remove hardcoded optimization flags/levels.
+
Index: premake4.lua
--- premake4.lua.orig
+++ premake4.lua
@@ -18,7 +22,7 @@ Index: premake4.lua
}
if _OPTIONS.wincross then
-@@ -87,8 +90,9 @@ configuration "Debug"
+@@ -107,8 +110,9 @@ configuration "Debug"
configuration "Release"
defines { "NDEBUG=1" }
Index: patches/patch-src_getself_c
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-src_getself_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_getself_c
--- patches/patch-src_getself_c 11 Nov 2017 11:24:42 -0000 1.3
+++ patches/patch-src_getself_c 7 Jan 2020 10:33:17 -0000
@@ -1,5 +1,7 @@
$OpenBSD: patch-src_getself_c,v 1.3 2017/11/11 11:24:42 kirby Exp $
+Use realpath(3).
+
Index: src/getself.c
--- src/getself.c.orig
+++ src/getself.c
Index: patches/patch-src_glew_h
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-src_glew_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_glew_h
--- patches/patch-src_glew_h 31 Jan 2019 14:08:25 -0000 1.1
+++ patches/patch-src_glew_h 7 Jan 2020 10:39:51 -0000
@@ -1,5 +1,8 @@
$OpenBSD: patch-src_glew_h,v 1.1 2019/01/31 14:08:25 naddy Exp $
+Cope with Mesa >= 18.2.5 which has newer OpenGL headers from Khronos which
+change the include guards.
+
Index: src/glew.h
--- src/glew.h.orig
+++ src/glew.h
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/games/tome4/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-main
--- pkg/PLIST-main 4 Sep 2018 12:46:13 -0000 1.7
+++ pkg/PLIST-main 5 Jan 2020 21:31:33 -0000
@@ -1,8 +1,81 @@
@comment $OpenBSD: PLIST-main,v 1.7 2018/09/04 12:46:13 espie Exp $
@bin bin/tome4
share/doc/pkg-readmes/${PKGSTEM}
+share/tome4/_realtime/
+share/tome4/_realtime/class/
+share/tome4/_realtime/class/Actor.lua
+share/tome4/_realtime/class/Game.lua
+share/tome4/_realtime/class/Grid.lua
+share/tome4/_realtime/class/NPC.lua
+share/tome4/_realtime/class/Player.lua
+share/tome4/_realtime/class/interface/
+share/tome4/_realtime/class/interface/Combat.lua
+share/tome4/_realtime/data/
+share/tome4/_realtime/data/birth/
+share/tome4/_realtime/data/birth/descriptors.lua
+share/tome4/_realtime/data/damage_types.lua
+share/tome4/_realtime/data/general/
+share/tome4/_realtime/data/general/grids/
+share/tome4/_realtime/data/general/grids/basic.lua
+share/tome4/_realtime/data/general/npcs/
+share/tome4/_realtime/data/general/npcs/kobold.lua
+share/tome4/_realtime/data/gfx/
+share/tome4/_realtime/data/gfx/particles/
+share/tome4/_realtime/data/gfx/particles/acid.lua
+share/tome4/_realtime/data/rooms/
+share/tome4/_realtime/data/rooms/pilar.lua
+share/tome4/_realtime/data/rooms/simple.lua
+share/tome4/_realtime/data/talents.lua
+share/tome4/_realtime/data/timed_effects.lua
+share/tome4/_realtime/data/zones/
+share/tome4/_realtime/data/zones/dungeon/
+share/tome4/_realtime/data/zones/dungeon/grids.lua
+share/tome4/_realtime/data/zones/dungeon/npcs.lua
+share/tome4/_realtime/data/zones/dungeon/objects.lua
+share/tome4/_realtime/data/zones/dungeon/traps.lua
+share/tome4/_realtime/data/zones/dungeon/zone.lua
+share/tome4/_realtime/dialogs/
+share/tome4/_realtime/dialogs/DeathDialog.lua
+share/tome4/_realtime/dialogs/Quit.lua
+share/tome4/_realtime/init.lua
+share/tome4/_realtime/load.lua
share/tome4/bootstrap/
share/tome4/bootstrap/boot.lua
+share/tome4/class/
+share/tome4/class/Actor.lua
+share/tome4/class/Game.lua
+share/tome4/class/Grid.lua
+share/tome4/class/NPC.lua
+share/tome4/class/Player.lua
+share/tome4/class/interface/
+share/tome4/class/interface/Combat.lua
+share/tome4/data/
+share/tome4/data/birth/
+share/tome4/data/birth/descriptors.lua
+share/tome4/data/damage_types.lua
+share/tome4/data/general/
+share/tome4/data/general/grids/
+share/tome4/data/general/grids/basic.lua
+share/tome4/data/general/npcs/
+share/tome4/data/general/npcs/kobold.lua
+share/tome4/data/gfx/
+share/tome4/data/gfx/particles/
+share/tome4/data/gfx/particles/acid.lua
+share/tome4/data/rooms/
+share/tome4/data/rooms/pilar.lua
+share/tome4/data/rooms/simple.lua
+share/tome4/data/talents.lua
+share/tome4/data/timed_effects.lua
+share/tome4/data/zones/
+share/tome4/data/zones/dungeon/
+share/tome4/data/zones/dungeon/grids.lua
+share/tome4/data/zones/dungeon/npcs.lua
+share/tome4/data/zones/dungeon/objects.lua
+share/tome4/data/zones/dungeon/traps.lua
+share/tome4/data/zones/dungeon/zone.lua
+share/tome4/dialogs/
+share/tome4/dialogs/DeathDialog.lua
+share/tome4/dialogs/Quit.lua
share/tome4/game/addons/
share/tome4/game/addons/tome-addon-dev.teaa
share/tome4/game/addons/tome-items-vault.teaa
@@ -18,6 +91,30 @@ share/tome4/game/profile-thread/UserChat
share/tome4/game/profile-thread/init.lua
share/tome4/game/thirdparty/
share/tome4/game/thirdparty/Json2.lua
+share/tome4/game/thirdparty/algorithms/
+share/tome4/game/thirdparty/algorithms/LICENSE
+share/tome4/game/thirdparty/algorithms/binarysearch.lua
+share/tome4/game/thirdparty/algorithms/data/
+share/tome4/game/thirdparty/algorithms/data/hashmap.lua
+share/tome4/game/thirdparty/algorithms/data/hashset.lua
+share/tome4/game/thirdparty/algorithms/data/list.lua
+share/tome4/game/thirdparty/algorithms/data/maxpq.lua
+share/tome4/game/thirdparty/algorithms/data/minpq.lua
+share/tome4/game/thirdparty/algorithms/data/queue.lua
+share/tome4/game/thirdparty/algorithms/data/redblacktree.lua
+share/tome4/game/thirdparty/algorithms/data/stack.lua
+share/tome4/game/thirdparty/algorithms/shuffling.lua
+share/tome4/game/thirdparty/algorithms/sorting/
+share/tome4/game/thirdparty/algorithms/sorting/heapsort.lua
+share/tome4/game/thirdparty/algorithms/sorting/insertion.lua
+share/tome4/game/thirdparty/algorithms/sorting/mergesort.lua
+share/tome4/game/thirdparty/algorithms/sorting/quicksort.lua
+share/tome4/game/thirdparty/algorithms/sorting/quicksort3ways.lua
+share/tome4/game/thirdparty/algorithms/sorting/selection.lua
+share/tome4/game/thirdparty/algorithms/sorting/shellsort.lua
+share/tome4/game/thirdparty/algorithms/tries/
+share/tome4/game/thirdparty/algorithms/tries/rwaytries.lua
+share/tome4/game/thirdparty/algorithms/unionfind.lua
share/tome4/game/thirdparty/cef3/
share/tome4/game/thirdparty/cef3/cef.pak
share/tome4/game/thirdparty/cef3/locales/
@@ -101,6 +198,7 @@ share/tome4/game/thirdparty/licenses/lib
share/tome4/game/thirdparty/licenses/libpng.txt
share/tome4/game/thirdparty/licenses/libvorbis.txt
share/tome4/game/thirdparty/licenses/lpeg.txt
+share/tome4/game/thirdparty/licenses/lua-algorithms.txt
share/tome4/game/thirdparty/licenses/luabitop.txt
share/tome4/game/thirdparty/licenses/luamd5.txt
share/tome4/game/thirdparty/licenses/luaprofiler.txt
@@ -110,6 +208,7 @@ share/tome4/game/thirdparty/licenses/lxp
share/tome4/game/thirdparty/licenses/physfs.txt
share/tome4/game/thirdparty/licenses/tcod.txt
share/tome4/game/thirdparty/licenses/tween.txt
+share/tome4/game/thirdparty/licenses/utf8proc.txt
share/tome4/game/thirdparty/licenses/zlib.txt
share/tome4/game/thirdparty/lpeg/
share/tome4/game/thirdparty/lpeg/re.lua
@@ -145,3 +244,6 @@ share/tome4/game/thirdparty/socket/smtp.
share/tome4/game/thirdparty/socket/tp.lua
share/tome4/game/thirdparty/socket/url.lua
share/tome4/game/thirdparty/tween.lua
+share/tome4/game/thirdparty/vector.lua
+share/tome4/init.lua
+share/tome4/load.lua
Index: pkg/README-main
===================================================================
RCS file: /cvs/ports/games/tome4/pkg/README-main,v
retrieving revision 1.2
diff -u -p -r1.2 README-main
--- pkg/README-main 4 Sep 2018 12:46:13 -0000 1.2
+++ pkg/README-main 5 Jan 2020 22:24:42 -0000
@@ -7,3 +7,25 @@ $OpenBSD: README-main,v 1.2 2018/09/04 1
If you have troubles running the game, you can try --safe-mode
parameter. The full list of available parameters can be found on the
project's wiki: https://te4.org/wiki/Command_Line_Arguments
+
+-Mmodule Automatically load and run module instead of going to the boot
menu
+-uname Use name for the character name instead of prompting,
+ and either load that character's saved game or create a new game
+ with that name.
+-n Force creating a new game, overwriting any previous saved game
+ for the given character name
+-Eargs Passes extra arguments to the game module (?)
+--xpos x Create the game window at the given X coordinate
+--ypos y Create the game window at the given Y coordinate
+--flushâstdout Write to te4_log.txt immediately instead of buffering output.
+ This facilitates debugging but can slow T-Engine4 down.
+--no-debug Disables most output to te4_log.txt
+--safe-mode Disables many graphical effects and reverts to minimal screen
+ size and graphics settings
+--home path Use the given directory instead of your default operating
+ system home directory. T-Engine's settings and saved games will
+ be saved in a subdirectory under this home directory, as
+ described here. For example, this can be used to set up a
+ separate directory for developing modules, with cheat enabled
+ and with less "stuff" so it loads faster, without interfering
+ with your regular ToME saved games.
