5 files changed, 42 insertions, 23 deletions

diff --git a/games/taisei/Makefile b/games/taisei/Makefile
index c438022eb93c..638186eb4350 100644
--- a/games/taisei/Makefile
+++ b/games/taisei/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	taisei
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
@@ -14,21 +14,22 @@ LIB_DEPENDS=	libpng.so:graphics/png \
 		libzip.so:archivers/libzip \
 		libwebp.so:graphics/webp \
 		libfreetype.so:print/freetype2 \
-		libopusfile.so:audio/opusfile
+		libopusfile.so:audio/opusfile \
+		libcglm.so:math/cglm
+BUILD_DEPENDS=	glslc:graphics/shaderc
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	taisei-project
-GH_TUPLE=	taisei-project:cglm:ee15b56:cglm/external/cglm \
-		taisei-project:SDL_GameControllerDB:5651071:gamecontrollerdb/external/gamecontrollerdb
+GH_TUPLE=	taisei-project:SDL_GameControllerDB:74e31d7:gamecontrollerdb/external/gamecontrollerdb
 
 USES=		compiler:c11 desktop-file-utils meson pkgconfig \
-		python:3.6+,build sdl shebangfix shared-mime-info
+		python:3.6+,build sdl ssl shebangfix shared-mime-info
 SHEBANG_FILES=	scripts/*.py
-MESON_ARGS=	-Dversion_fallback=${PORTVERSION} -Db_lto=false -Duse_libcrypto=false
+MESON_ARGS=	-Dversion_fallback=${PORTVERSION} -Db_lto=false
+MESON_ARGS+=	--wrap-mode=nofallback
+#MESON_ARGS+=	-DOPENSSLLIB="${OPENSSLLIB}" -DOPENSSLINC="${OPENSSLINC}"
 USE_SDL=	sdl2 ttf2 mixer2
-USE_GCC=	yes
-
-CPPFLAGS+=	-D__BSD_VISIBLE
+#USE_GCC=	yes
 
 PORTDOCS=	*
 PORTDATA=	*
@@ -41,9 +42,4 @@ DOCS_MESON_TRUE=docs
 post-install:
 	@${RM} ${STAGEDIR}${DOCSDIR}/COPYING.txt
 
-post-patch:
-	@${REINPLACE_CMD} -e "/^dep_crypto/ s|.*|\
-		dep_crypto = declare_dependency(link_with:shared_library('${OPENSSLLIB}/libcrypto.so'), include_directories:include_directories('${OPENSSLINC}'))|" \
-		${WRKSRC}/meson.build
-
 .include <bsd.port.mk>
diff --git a/games/taisei/distinfo b/games/taisei/distinfo
index 34ec834d3386..c89a9762d09f 100644
--- a/games/taisei/distinfo
+++ b/games/taisei/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1574095481
-SHA256 (taisei-project-taisei-v1.3.1_GH0.tar.gz) = 6ea04bd56f5cffee91dbcebb08526e8743322d868dd9a077438718d5758ad233
-SIZE (taisei-project-taisei-v1.3.1_GH0.tar.gz) = 70811878
-SHA256 (taisei-project-cglm-ee15b56_GH0.tar.gz) = 5ec0a9574ec3621d563540a9c7ab9225dfed65173aad15668f0fb9e690e60aec
-SIZE (taisei-project-cglm-ee15b56_GH0.tar.gz) = 209318
-SHA256 (taisei-project-SDL_GameControllerDB-5651071_GH0.tar.gz) = 90c5493761116cd31b639dc175aae60c931a8c5f627d3465b04dad973c04d957
-SIZE (taisei-project-SDL_GameControllerDB-5651071_GH0.tar.gz) = 209047
+TIMESTAMP = 1620672730
+SHA256 (taisei-project-taisei-v1.3.2_GH0.tar.gz) = bee5710d5aefcdf99e334909ce18eb22f9b2f73f4b5bd3ec3e5daad3aadc8479
+SIZE (taisei-project-taisei-v1.3.2_GH0.tar.gz) = 70827325
+SHA256 (taisei-project-SDL_GameControllerDB-74e31d7_GH0.tar.gz) = 79ccf0472162c9c1b44aeb0e3b2c122fbaaaed2f5b33c653d29b293f3121068f
+SIZE (taisei-project-SDL_GameControllerDB-74e31d7_GH0.tar.gz) = 23577
diff --git a/games/taisei/files/patch-meson.build b/games/taisei/files/patch-meson.build
new file mode 100644
index 000000000000..9c3124486d54
--- /dev/null
+++ b/games/taisei/files/patch-meson.build
@@ -0,0 +1,14 @@
+--- meson.build.orig	2021-04-30 18:54:50 UTC
++++ meson.build
+@@ -151,8 +151,9 @@ dep_webpdecoder = dependency('libwebpdecoder', version
+ dep_zip         = dependency('libzip',         version : '>=1.2',   required : false, static : static, fallback : ['libzip', 'libzip_dep'])
+ dep_zlib        = dependency('zlib',                                required : true,  static : static, fallback : ['zlib', 'zlib_dep'])
+ dep_cglm        = dependency('cglm',           version : '>=0.7.8', required : true,  static : static, fallback : ['cglm', 'cglm_dep'])
+-dep_crypto      = dependency('libcrypto',                           required : false, static : static)
+-dep_gamemode    = dependency('gamemode',                            required : false, static : static)
++dep_crypto      = cc.find_library('crypto', required : true)  # does not respect OPENSSLLIB/OPENSSLINC
++#dep_crypto      = declare_dependency(link_with:shared_library(get_option('OPENSSLLIB') / 'libcrypto.so'), include_directories:include_directories(get_option('OPENSSLINC')))  # does not work in modern meson
++dep_gamemode    = dependency('', required : false) # no gamemode on freebsd
+ 
+ dep_m           = cc.find_library('m', required : false)
+ 
diff --git a/games/taisei/files/patch-scripts_taiseilib_version.py b/games/taisei/files/patch-scripts_taiseilib_version.py
new file mode 100644
index 000000000000..4ccdff9f20c2
--- /dev/null
+++ b/games/taisei/files/patch-scripts_taiseilib_version.py
@@ -0,0 +1,11 @@
+--- scripts/taiseilib/version.py.orig	2021-04-30 18:54:50 UTC
++++ scripts/taiseilib/version.py
+@@ -57,6 +57,8 @@ def get(*, rootdir=None, fallback=None, args=common.de
+     rootdir = rootdir if rootdir is not None else args.rootdir
+     fallback = fallback if fallback is not None else args.fallback_version
+ 
++    return Version(fallback)
++
+     if rootdir is None:
+         import pathlib
+         rootdir = pathlib.Path(__file__).parent
diff --git a/games/taisei/files/patch-src_meson.build b/games/taisei/files/patch-src_meson.build
index 2b85d0576a9a..9d4f262f6b1e 100644
--- a/games/taisei/files/patch-src_meson.build
+++ b/games/taisei/files/patch-src_meson.build
@@ -1,6 +1,6 @@
---- src/meson.build.orig	2019-09-28 18:31:40 UTC
+--- src/meson.build.orig	2021-04-30 18:54:50 UTC
 +++ src/meson.build
-@@ -325,7 +325,6 @@ else
+@@ -305,7 +305,6 @@ else
      taisei = executable(taisei_basename, taisei_src, version_deps,
          dependencies : taisei_deps,
          c_args : taisei_c_args,