Date: Sun, 16 Oct 2022 19:18:15 -0600 From: Adam Weinberger <adamw@freebsd.org> To: Dmitry Marakasov <amdmi3@amdmi3.ru> Cc: Adam Weinberger <adamw@freebsd.org>, ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 09c8b6c737f2 - main - games/powder-toy: Use USES=luajit (defaults to luajit-devel) Message-ID: <CAP7rwcjdd0cMkdkY16411AG10qp1gqrQEO9TtDs=Z9S_b5fdgA@mail.gmail.com> In-Reply-To: <Y0yNVvW48un%2BgAzG@hades.panopticon> References: <202210150120.29F1KoYq034805@gitrepo.freebsd.org> <Y0yNVvW48un%2BgAzG@hades.panopticon>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000ed2c6705eb30c0e1
Content-Type: text/plain; charset="UTF-8"
On Sun, Oct 16, 2022 at 5:07 PM Dmitry Marakasov <amdmi3@amdmi3.ru> wrote:
> * Adam Weinberger (adamw@FreeBSD.org) wrote:
>
> > diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile
> > index 9f3669ed3c41..83404aceaedb 100644
> > --- a/games/powder-toy/Makefile
> > +++ b/games/powder-toy/Makefile
> > @@ -1,6 +1,7 @@
> > PORTNAME= powder-toy
> > PORTVERSION= 96.2.350
> > DISTVERSIONPREFIX= v
> > +PORTREVISION= 1
> > CATEGORIES= games
> >
> > MAINTAINER= amdmi3@FreeBSD.org
> > @@ -13,14 +14,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
> >
> > LIB_DEPENDS= libfftw3f.so:math/fftw3-float \
> > libfftw3.so:math/fftw3 \
> > - libluajit-5.1.so:lang/luajit-openresty \
> > libcurl.so:ftp/curl
> >
> > USE_GITHUB= yes
> > GH_ACCOUNT= The-Powder-Toy
> > GH_PROJECT= The-Powder-Toy
> >
> > -USES= compiler:c++11-lang meson pkgconfig python:build
> sdl
> > +USES= compiler:c++11-lang luajit meson pkgconfig
> python:build sdl
> > USE_SDL= sdl2
> >
> > PORTDOCS= README.md changelog.txt
>
> This change is invalid, as it changes dependency from luajit-openresty
> to luajit-devel. Please revert or change it to depend on openresty, as
> luajit is broken and leads to segfaults. Same for minetest, for the
> record.
>
Done. Strange that they behave badly; Powder Toy's repo links specifically
to luajit-devel's repo, and minetest says that it works with luajit 2.0+.
That's the unfortunate part of the luajit fragmentation that we have in the
tree. Because lang/luajit is so old, it's not clear whether a
luajit-openresty dep means "this requires openresty" vs "I don't want to
depend on the old version." They all compile cleanly, so I tried to use
upstreams to guide the conversion.
# Adam
--
Adam Weinberger
adamw@adamw.org // adamw@FreeBSD.org
https://www.adamw.org
--000000000000ed2c6705eb30c0e1
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr"><div dir=3D"ltr"><div class=3D"gmail_default" style=3D"fon=
t-family:arial,sans-serif"><br></div></div><br><div class=3D"gmail_quote"><=
div dir=3D"ltr" class=3D"gmail_attr">On Sun, Oct 16, 2022 at 5:07 PM Dmitry=
Marakasov <<a href=3D"mailto:amdmi3@amdmi3.ru">amdmi3@amdmi3.ru</a>>=
wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px =
0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">* Adam W=
einberger (adamw@FreeBSD.org) wrote:<br>
<br>
> diff --git a/games/powder-toy/Makefile b/games/powder-toy/Makefile<br>
> index 9f3669ed3c41..83404aceaedb 100644<br>
> --- a/games/powder-toy/Makefile<br>
> +++ b/games/powder-toy/Makefile<br>
> @@ -1,6 +1,7 @@<br>
>=C2=A0 PORTNAME=3D=C2=A0 =C2=A0 powder-toy<br>
>=C2=A0 PORTVERSION=3D 96.2.350<br>
>=C2=A0 DISTVERSIONPREFIX=3D=C2=A0 =C2=A0v<br>
> +PORTREVISION=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 1<br>
>=C2=A0 CATEGORIES=3D=C2=A0 games<br>
>=C2=A0 <br>
>=C2=A0 MAINTAINER=3D=C2=A0 amdmi3@FreeBSD.org<br>
> @@ -13,14 +14,13 @@ LICENSE_FILE=3D=C2=A0 =C2=A0 =C2=A0${WRKSRC}/LICEN=
SE<br>
>=C2=A0 <br>
>=C2=A0 LIB_DEPENDS=3D libfftw3f.so:math/fftw3-float \<br>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libfftw3.so:math=
/fftw3 \<br>
> -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libluajit-5.1.so:lang=
/luajit-openresty \<br>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0libcurl.so:ftp/c=
url<br>
>=C2=A0 <br>
>=C2=A0 USE_GITHUB=3D=C2=A0 yes<br>
>=C2=A0 GH_ACCOUNT=3D=C2=A0 The-Powder-Toy<br>
>=C2=A0 GH_PROJECT=3D=C2=A0 The-Powder-Toy<br>
>=C2=A0 <br>
> -USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 compil=
er:c++11-lang meson pkgconfig python:build sdl<br>
> +USES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 compil=
er:c++11-lang luajit meson pkgconfig python:build sdl<br>
>=C2=A0 USE_SDL=3D=C2=A0 =C2=A0 =C2=A0sdl2<br>
>=C2=A0 <br>
>=C2=A0 PORTDOCS=3D=C2=A0 =C2=A0 README.md changelog.txt<br>
<br>
This change is invalid, as it changes dependency from luajit-openresty<br>
to luajit-devel. Please revert or change it to depend on openresty, as<br>
luajit is broken and leads to segfaults. Same for minetest, for the<br>
record.<br></blockquote><div><br></div><div style=3D"font-family:arial,sans=
-serif" class=3D"gmail_default">Done. Strange that they behave badly; Powde=
r Toy's repo links specifically to luajit-devel's repo, and minetes=
t says that it works with luajit 2.0+.</div><div style=3D"font-family:arial=
,sans-serif" class=3D"gmail_default"><br></div><div style=3D"font-family:ar=
ial,sans-serif" class=3D"gmail_default">That's the unfortunate part of =
the luajit fragmentation that we have in the tree. Because lang/luajit is s=
o old, it's not clear whether a luajit-openresty dep means "this r=
equires openresty" vs "I don't want to depend on the old vers=
ion." They all compile cleanly, so I tried to use upstreams to guide t=
he conversion.</div><div style=3D"font-family:arial,sans-serif" class=3D"gm=
ail_default"><br></div><div style=3D"font-family:arial,sans-serif" class=3D=
"gmail_default"># Adam</div><div style=3D"font-family:arial,sans-serif" cla=
ss=3D"gmail_default"><br></div><div style=3D"font-family:arial,sans-serif" =
class=3D"gmail_default"><br></div></div>-- <br><div dir=3D"ltr" class=3D"gm=
ail_signature">Adam Weinberger<br><a href=3D"mailto:adamw@adamw.org" target=
=3D"_blank">adamw@adamw.org</a> // adamw@FreeBSD.org<br><a href=3D"https://=
www.adamw.org" target=3D"_blank">https://www.adamw.org</a></div></div>;
--000000000000ed2c6705eb30c0e1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAP7rwcjdd0cMkdkY16411AG10qp1gqrQEO9TtDs=Z9S_b5fdgA>