Omar Polo <[email protected]> writes: > Hello, > > Please find attached a patch to update taisei to the latest version. > 1.3.2 requires a new build-time dependency: math/cglm (tarball > attached.) > > Builds and runs fine on amdgpu. > > I need a little help from some meson hacker because it adds an > optimisation flag that I can't neutralize. (src/meson.build explicitly > adds a -O but it's only in the emscripten codepath.) > > build log if it helps: https://tmp.omarpolo.com/games-taisei.log
Sorry for the lack of info, I forgot to mention quite a few things. Let
me try again:
Here's the changelog for the release:
https://taisei-project.org/news/0013_v1.3.2
https://github.com/taisei-project/taisei/releases/tag/v1.3.2
It's a maintenance release with bugfix, optimization and minor features
backported from the 1.4 tree. It should be replay-compatible with the
initial 1.3.
An extraneous "-O0" gets added before the default CFLAGS "-O2 -pipe" and
I can't neutralize it. I find out that it's controlled by the meson
`optimization' option, but can't find where it's actually added.
taisei now requires cglm. It only uses the macros from the headers so
it isn't linked to the library. math/cglm is:
% pkg_info cglm
Information for inst:cglm-0.8.4
Comment:
highly optimized graphics math library
Description:
cglm is an highly optimized 2D and 3D math library, also know as OpenGL
Mathematics (glm) for C. cglm provides lot of utils to help math
operations to be fast and quick to write.
Maintainer: The OpenBSD ports mailing-list <[email protected]>
WWW: https://github.com/recp/cglm
for some reason outside my understanding meson fails to decipher the
cglm version, so I neutered the version check.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/games/taisei/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 23 Feb 2021 19:39:23 -0000 1.8
+++ Makefile 14 Nov 2021 12:59:49 -0000
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS = amd64 aarch64 i386
COMMENT = clone of the touhou games
-VERSION = v1.3.1
+VERSION = v1.3.2
DISTNAME = taisei-${VERSION}
PKGNAME = taisei-${VERSION:S/^v//}
@@ -29,6 +29,8 @@ MODULES = devel/meson \
lang/python
MODPY_RUNDEP = No
+
+BUILD_DEPENDS = math/cglm
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/games/taisei/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 8 Feb 2020 11:04:15 -0000 1.2
+++ distinfo 14 Nov 2021 12:12:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (taisei-v1.3.1.tar.xz) = hlg6OnEAk+YwFKWua2glGgacslraBsb41zT4XzGtyYU=
-SIZE (taisei-v1.3.1.tar.xz) = 70763196
+SHA256 (taisei-v1.3.2.tar.xz) = 28BfG1wxmB2HERMKwoM1W3v61AOJX0CWprt+mj1zo7w=
+SIZE (taisei-v1.3.2.tar.xz) = 70481856
Index: patches/patch-meson_build
===================================================================
RCS file: patches/patch-meson_build
diff -N patches/patch-meson_build
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-meson_build 14 Nov 2021 12:29:13 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+don't be picky about cglm version
+
+Index: meson.build
+--- meson.build.orig
++++ meson.build
+@@ -150,7 +150,7 @@ dep_webp = dependency('libwebp', version
+ dep_webpdecoder = dependency('libwebpdecoder', version : '>=0.5', required
: false, static : static)
+ 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_cglm = dependency('cglm', required
: true, static : static, fallback : ['cglm', 'cglm_dep'])
+ dep_crypto = dependency('libcrypto', required
: false, static : static)
+ dep_gamemode = dependency('gamemode', required
: false, static : static)
+
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/games/taisei/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 8 Feb 2020 11:04:15 -0000 1.4
+++ pkg/PLIST 14 Nov 2021 12:54:13 -0000
@@ -535,6 +535,7 @@ share/taisei/00-taisei.pkgdir/shader/hea
share/taisei/00-taisei.pkgdir/shader/ingame_menu.frag.glsl
share/taisei/00-taisei.pkgdir/shader/ingame_menu.prog
share/taisei/00-taisei.pkgdir/shader/interface/
+share/taisei/00-taisei.pkgdir/shader/interface/fxaa.glslh
share/taisei/00-taisei.pkgdir/shader/interface/healthbar.glslh
share/taisei/00-taisei.pkgdir/shader/interface/reimu_gap.glslh
share/taisei/00-taisei.pkgdir/shader/interface/spellcard.glslh
@@ -582,6 +583,7 @@ share/taisei/00-taisei.pkgdir/shader/lib
share/taisei/00-taisei.pkgdir/shader/lib/blur/blur9.glslh
share/taisei/00-taisei.pkgdir/shader/lib/defs.glslh
share/taisei/00-taisei.pkgdir/shader/lib/fxaa.glslh
+share/taisei/00-taisei.pkgdir/shader/lib/legacy_compat.glslh
share/taisei/00-taisei.pkgdir/shader/lib/render_context.glslh
share/taisei/00-taisei.pkgdir/shader/lib/sprite_default.vert.glslh
share/taisei/00-taisei.pkgdir/shader/lib/sprite_main.frag.glslh
cglm.tar.gz
Description: Binary data
