Omar Polo <o...@omarpolo.com> writes:

> Omar Polo <o...@omarpolo.com> 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.
>>
>> [...]
>
> 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.

I found out that this happens with other meson ports (e.g. x11/picom)
so... I guess is fine?  The flags ends up being "-O0 -O2 -pipe".

> 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 <ports@openbsd.org>
>
> 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.

I've find out that upstream forgot to substitute a variable and the pc
file ended up being slightly odd.  With that fixed, games/taisei is
happy.

Updated patch and cglm tarball attached, OK/comments?

Cheers!


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: 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

Attachment: cglm.tar.gz
Description: Binary data

Reply via email to