HI there! Can you add LuaJIT support to libquvi: > luajit? ( dev-lang/luajit:2 ) > !luajit? ( >=dev-lang/lua-5.1[deprecated] ) and to libquvi-scripts: > luajit? ( dev-lang/luajit:2 ) > !luajit? ( >=dev-lua/LuaBitOp-1.0.1 ) Reproducible: Always
(means, also add "luajit" to IUSE)
btw, it also be nice to add that in src_configure (before mycmakeargs) too: local lua="lua" use luajit && lua="luajit" export CFLAGS="${CFLAGS} $($(tc-getPKG_CONFIG) --cflags ${lua})" export liblua_CFLAGS="$($(tc-getPKG_CONFIG) --cflags ${lua})" export liblua_LIBS="$($(tc-getPKG_CONFIG) --variable libdir ${lua})" export LDFLAGS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs ${lua})" // assumes inherit toolchain-funcs
So upstream does not support luajit? I think the relevant changes should go upstream too.
Since libquvi is multilib now, this will require multilib luajit... and multilib luajit require fixing #513344 first.
actually, it do support work with luajit, just it doesn't recognize it as Lua ;) Talking about multilib LuaJIT — I can fix that (actually, I already did it for vcs-versions in Lua overlay), but I can't guarantee rmartins approve that...
ping? #513344 is fixed now, if any.
Seems to still be a good idea to avoid keeping old lua versions installed, especially on net servers... For media-libs/libquvi-0.9.4-r100, a small patch in configure.ac is required: --- libquvi-0.9.4/configure.ac 2021-10-20 13:44:09.834182117 +0200 +++ libquvi-0.9.4/configure.ac 2021-10-20 13:46:23.611188250 +0200 @@ -85,7 +85,9 @@ AC_SUBST([VALGRIND]) PKG_CHECK_MODULES([liblua], [lua >= 5.1], [], [ PKG_CHECK_MODULES([liblua], [lua51 >= 5.1], [], [ PKG_CHECK_MODULES([liblua], [lua5.1 >= 5.1], [], [ - PKG_CHECK_MODULES(liblua, [lua-5.1 >= 5.1])]) + PKG_CHECK_MODULES([liblua], [lua-5.1 >= 5.1], [], [ + PKG_CHECK_MODULES(liblua, [luajit])]) + ]) ]) ]) PKG_CHECK_MODULES([libproxy], [libproxy-1.0 >= 0.3.1]) Then the ebuild can be changed: --- media-libs/libquvi/libquvi-0.9.4-r100.ebuild 2021-01-24 05:09:20.000000000 +0100 +++ media-libs/libquvi/libquvi-0.9.4-r100.ebuild 2021-11-03 15:05:58.762820340 +0100 @@ -3,8 +3,8 @@ EAPI=7 -LUA_COMPAT=( lua5-1 ) -LUA_REQ_USE="deprecated" +LUA_COMPAT=( lua5-1 luajit ) +#LUA_REQ_USE="deprecated" inherit autotools lua-single For =media-libs/libquvi-scripts-0.9.20131130-r100, only adding luajit in LUA_COMPAT seems required: --- media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild 2021-01-24 05:09:20.000000000 +0100 +++ media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r100.ebuild 2021-10-22 09:01:43.519805086 +0200 @@ -3,7 +3,7 @@ EAPI=7 -LUA_COMPAT=( lua5-1 ) +LUA_COMPAT=( lua5-1 luajit ) inherit lua-single
It seems that those 2 packages can also be built against lua version 5.4, updating the LUA_COMPAT variable patch up to: +LUA_COMPAT=( lua5-1 lua5-4 luajit )
Created attachment 824567 [details, diff] this patch is required for lua version 5.4 build... My mistake: this patch would have to be applied conditionally when compiling for lua version 5.4
Jocelyn, can you, please, made a PR with that changes on GitHub and ping me, and I'll merge it?
Created attachment 845563 [details, diff] Updated patch for lua 5.4 support with fixes and version checks While trying to improve the patch to make it able to compile with luajit and lua version 5.4, I discovered issues with this later version. This new patch allows libquvi to succesfully pass all tests.
Created attachment 845565 [details, diff] Update ebuild patch for libquvi
As far as I can see, upstream seems dead. I found some forks on github but there seems not to be any activity then I don't know where to submit the patches...
I mean a PR on https://github.com/gentoo/gentoo with fixed ebuilds (and bumped rev-numbers)
OK, I never did use github before. Did a pull request for libquvi and libquvi-scripts with revision dump up to r101.
Here: https://github.com/gentoo/gentoo/pull/28894
(In reply to Jocelyn Mayer from comment #16) > Here: https://github.com/gentoo/gentoo/pull/28894 Thanks! I'll review shortly.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385b637dbb7a250a1b4b4bf5ef7936ca49ecfbd3 commit 385b637dbb7a250a1b4b4bf5ef7936ca49ecfbd3 Author: Jocelyn-MAYER <l_indien@mailmagic.fr> AuthorDate: 2022-12-29 17:43:57 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2022-12-29 18:21:30 +0000 media-libs/libquvi-scripts: Allow build using luajit and lua version 5.4 Closes: https://bugs.gentoo.org/504876 Signed-off-by: Jocelyn-MAYER <l_indien@mailmagic.fr> Signed-off-by: Sam James <sam@gentoo.org> .../libquvi-scripts-0.9.20131130-r101.ebuild | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5021931af5a2e8eafa31dc0d503ba3ce50dfd2 commit 2b5021931af5a2e8eafa31dc0d503ba3ce50dfd2 Author: Jocelyn-MAYER <l_indien@mailmagic.fr> AuthorDate: 2022-12-29 17:28:00 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2022-12-29 18:21:30 +0000 media-libs/libquvi: support luajit and lua5.4 libquvi used to build only with lua version 5.1 - the configure.ac file is to be patched in order to be able to build with luajit - the second patch allow build with lua version 5.4 Closes: https://bugs.gentoo.org/504876 Signed-off-by: Jocelyn-MAYER <l_indien@mailmagic.fr> Signed-off-by: Sam James <sam@gentoo.org> .../files/libquvi-0.9.4-luaL_setfuncs_ver.patch | 70 ++++++++++++++++++++++ .../libquvi/files/libquvi-0.9.4-luajit.patch | 15 +++++ media-libs/libquvi/libquvi-0.9.4-r101.ebuild | 69 +++++++++++++++++++++ 3 files changed, 154 insertions(+)
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b2483454e7498e1145014b3d23fd2eddb7db628 commit 6b2483454e7498e1145014b3d23fd2eddb7db628 Author: Sam James <sam@gentoo.org> AuthorDate: 2022-12-29 18:30:52 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2022-12-29 18:30:52 +0000 media-libs/libquvi: EAPI 8, adjust LUA_COMPAT Closes: https://bugs.gentoo.org/504876 Signed-off-by: Sam James <sam@gentoo.org> media-libs/libquvi/libquvi-0.9.4-r101.ebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee7111f1e3ef3c0e2ce0f7aaaa094cd7ee4a4ba commit eee7111f1e3ef3c0e2ce0f7aaaa094cd7ee4a4ba Author: Sam James <sam@gentoo.org> AuthorDate: 2022-12-29 18:30:20 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2022-12-29 18:30:20 +0000 media-libs/libquvi-scripts: EAPI 8, adjust LUA_COMPAT Closes: https://bugs.gentoo.org/504876 Signed-off-by: Sam James <sam@gentoo.org> media-libs/libquvi-scripts/libquvi-scripts-0.9.20131130-r101.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
