Re: UPDATE: games/minetest to 5.8.0
Anthony J. Bentley writes:
> Here's an updated diff, which I'll commit in a few days unless
> someone objects.
I've committed this. A few days? Eh...
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/minetest/Makefile,v
> diff -u -p -r1.39 Makefile
> --- Makefile 26 Sep 2023 09:41:38 - 1.39
> +++ Makefile 17 Apr 2024 09:43:24 -
> @@ -1,38 +1,33 @@
> COMMENT =infinite-world block sandbox game
>
> -V = 5.6.0
> -GAME_V = 5.6.0
> -IRRLICHTMT_V = 1.9.0mt7
> -
> -DISTNAME = minetest-${V}
> -CATEGORIES = games x11
> -REVISION = 0
> +V = 5.8.0
> +PKGNAME =minetest-${V}
> +
> +DIST_TUPLE +=github minetest minetest ${V} .
> +DIST_TUPLE +=github minetest irrlicht 1.9.0mt13 lib/irrlichtmt
> +DIST_TUPLE +=github minetest minetest_game 5.8.0 games/minetest_game
> +
> +CATEGORIES = games x11
>
> HOMEPAGE = https://www.minetest.net/
>
> # source LGPLv2.1/ datas CC BY-SA 3.0
> PERMIT_PACKAGE = Yes
>
> -WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 Xext Xi c curl
> -WANTLIB += curses form freetype gmp iconv intl jpeg jsoncpp lua5.1
> -WANTLIB += m ogg openal png pq spatialindex sqlite3 vorbis vorbisfile
> -WANTLIB += z zstd
> +WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 Xi c curl curses form freetype
> +WANTLIB += gmp iconv intl jpeg jsoncpp luajit-5.1 m ogg openal png pq
> +WANTLIB += spatialindex sqlite3 vorbis vorbisfile z zstd
>
> COMPILER = base-clang ports-gcc base-gcc
>
> -SITES = https://github.com/minetest/
> -
> -DISTFILES = minetest-{minetest/archive/}${V}${EXTRACT_SUFX} \
> - minetest-game-{minetest_game/archive/}${GAME_V}${EXTRAC
> T_SUFX} \
> - irrlichtmt-{irrlicht/archive/}${IRRLICHTMT_V}${EXTRACT_
> SUFX}
> -
> -MODULES =devel/cmake \
> - lang/lua
> +MODULES =devel/cmake
>
> CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
> CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
> -CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DENABLE_LUAJIT=FALSE
> -CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
> +CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DBUILD_SERVER=TRUE
> +
> +# luajit
> +USE_NOBTCFI =Yes
>
> CXXFLAGS += -I${X11BASE}/include
> MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
> @@ -42,8 +37,8 @@ BUILD_DEPENDS = devel/gettext,-tools
> RUN_DEPENDS =devel/desktop-file-utils \
> x11/gtk+4,-guic
>
> -LIB_DEPENDS =${MODLUA_LIB_DEPENDS} \
> - audio/openal \
> +LIB_DEPENDS =audio/openal \
> + lang/luajit \
> audio/libvorbis \
> archivers/zstd \
> devel/gettext,-runtime \
> @@ -60,18 +55,11 @@ TEST_DEPENDS =${FULLPKGNAME}:${BUILD_P
> TEST_ENV += HOME=${WRKBUILD}/test \
> LC_CTYPE="en_US.UTF-8"
>
> -post-extract:
> - mv ${WRKDIR}/irrlicht-${IRRLICHTMT_V} \
> - ${WRKSRC}/lib/irrlichtmt
> -
> -# Use system cmake modules
> -post-patch:
> - rm ${WRKSRC}/cmake/Modules/FindLua*
> -
> post-install:
> - mv ${WRKDIR}/minetest_game-${GAME_V}/ \
> - ${PREFIX}/share/minetest/games/minetest_game
> - chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetes
> t_game
> + mkdir -p ${PREFIX}/share/minetest/games
> + mv ${WRKDIST}/games \
> + ${PREFIX}/share/minetest/
> + chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/gamesm/*
>
> do-test:
> mkdir -p ${WRKBUILD}/test
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/minetest/distinfo,v
> diff -u -p -r1.13 distinfo
> --- distinfo 21 Aug 2022 08:58:35 - 1.13
> +++ distinfo 17 Apr 2024 09:43:24 -
> @@ -1,6 +1,6 @@
> -SHA256 (irrlichtmt-1.9.0mt7.tar.gz) = wSzb1KhS4ebr97oieJqgV6Gn8tWF3YGiQSpi9X
> oOJhk=
> -SHA256 (minetest-5.6.0.tar.gz) = P9vAyNn2oYwSlUugyu21SKIvNnUg9Z0HmASiHeA0epE
> =
> -SHA256 (minetest-game-5.6.0.tar.gz) = /ZkdQsJT2zgFWcWTorA18i4HqB+Ge1OAovBF6a
> TQTIc=
> -SIZE (irrlichtmt-1.9.0mt7.tar.gz) = 909510
> -SIZE (minetest-5.6.0.tar.gz) = 9922682
> -SIZE (minetest-game-5.6.0.tar.gz) = 2590530
> +SHA256 (minetest-irrlicht-1.9.0mt13.tar.gz) = L96OJxRJiCELnA/x4gKQWDTZ0lqqY8
> 5FJ2P9cXEJatw=
> +SHA256 (minetest-minetest-5.8.0.tar.gz) = YQyFok13rNwwQ6add3vtnmwAFpQGygnfIq
> 1JD+DWjAw=
> +SHA256 (minetest-minetest_game-5.8.0.tar.gz) = M6O7Q7CEl6C9svSfFAooKeWC1cFsC
> tUr4VlcgD9waRI=
> +SIZE (minetest-irrlicht-1.9.0mt13.tar.gz) = 754056
> +SIZE (minetest-minetest-5.8.0.tar.gz) = 10419348
> +SIZE (minetest-minetest_gam
Re: UPDATE: games/minetest to 5.8.0
On Thu, 30 May 2024 07:35:13 +0100
Fabien ROMANO wrote:
> [sic] I would prefer to keep $*_V in the port, maybe just
> bikesheding but looks cleaner to me.
>
> V = 5.8.0
> GAME_V = 5.8.0
> IRRLICHTMT_V =1.9.0mt13
> DIST_TUPLE += github minetest minetest ${V} .
> DIST_TUPLE += github minetest minetest_game ${GAME_V}
> games/minetest_game DIST_TUPLE += github minetest irrlicht
> ${IRRLICHTMT_V} lib/irrlichtmt
>
There is a diff with this change added here. I agree. I hastily threw
together this port update. This is much cleaner. Bikeshedding or not,
its a good nit.
> > ===> Building package for minetest-5.8.0
> > Create /usr/ports/packages/amd64/all/minetest-5.8.0.tgz
> > Creating package minetest-5.8.0
> > /home/_pobj/minetest-5.8.0/fake-amd64/usr/local/man/man6/minetestserver.6:
> > Cannot find NAME section
> > /home/_pobj/minetest-5.8.0/fake-amd64/usr/local/man/man6/minetestserver.6:
> > No one-line description, using filename "minetestserver" Link to
> > /usr/ports/packages/amd64/ftp/minetest-5.8.0.tgz
>
> cat /usr/ports/pobj/minetest-5.8.0/minetest-5.8.0/doc/minetestserver.6
>
> .so man6/minetest.6
>
> I guess this is not the way to point 'man minetestserver' into
> 'minetest.6' ? Except the complaint during make package, it works,
> any advise ?
>
I believe this is from the generated build.ninja's doing. Should I patch
CMakeLists.txt or is this fine as-is?
Also might be worth asking if 5.6.0 had this issue as well. Perhaps an
upstream PR is in my future?
Thanks
--
-iz (they/them)
> i like to say mundane things,
> there are too many uninteresting things
> that go unnoticed.
izder456 (dot) neocities (dot) org
diff --git Makefile Makefile
index c359bb848..e4851c6cb 100644
--- Makefile
+++ Makefile
@@ -1,38 +1,36 @@
COMMENT = infinite-world block sandbox game
-V = 5.6.0
-GAME_V = 5.6.0
-IRRLICHTMT_V = 1.9.0mt7
+PKGNAME = minetest-${V}
-DISTNAME = minetest-${V}
-CATEGORIES = games x11
-REVISION = 0
+V = 5.8.0
+GAME_V = 5.8.0
+IRRLCHTMT_V = 1.9.0mt13
-HOMEPAGE = https://www.minetest.net/
+DIST_TUPLE += github minetest minetest ${V} .
+DIST_TUPLE += github minetest minetest_game ${GAME_V} games/minetest_game
+DIST_TUPLE += github minetest irrlicht ${IRRLCHTMT_V} lib/irrlichtmt
+
+CATEGORIES = games x11
+
+HOMEPAGE = https://www.minetest.net/
# source LGPLv2.1/ datas CC BY-SA 3.0
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 Xext Xi c curl
-WANTLIB += curses form freetype gmp iconv intl jpeg jsoncpp lua5.1
-WANTLIB += m ogg openal png pq spatialindex sqlite3 vorbis vorbisfile
-WANTLIB += z zstd
+WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 Xi c curl curses form freetype
+WANTLIB += gmp iconv intl jpeg jsoncpp luajit-5.1 m ogg openal png pq
+WANTLIB += spatialindex sqlite3 vorbis vorbisfile z zstd
COMPILER = base-clang ports-gcc base-gcc
-SITES = https://github.com/minetest/
-
-DISTFILES = minetest-{minetest/archive/}${V}${EXTRACT_SUFX} \
- minetest-game-{minetest_game/archive/}${GAME_V}${EXTRACT_SUFX} \
- irrlichtmt-{irrlicht/archive/}${IRRLICHTMT_V}${EXTRACT_SUFX}
-
-MODULES = devel/cmake \
- lang/lua
+MODULES = devel/cmake
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
-CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DENABLE_LUAJIT=FALSE
-CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
+CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DBUILD_SERVER=TRUE
+
+# luajit
+USE_NOBTCFI = Yes
CXXFLAGS += -I${X11BASE}/include
MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
@@ -42,8 +40,8 @@ BUILD_DEPENDS = devel/gettext,-tools
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
-LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} \
- audio/openal \
+LIB_DEPENDS = audio/openal \
+ lang/luajit \
audio/libvorbis \
archivers/zstd \
devel/gettext,-runtime \
@@ -60,18 +58,11 @@ TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
TEST_ENV += HOME=${WRKBUILD}/test \
LC_CTYPE="en_US.UTF-8"
-post-extract:
- mv ${WRKDIR}/irrlicht-${IRRLICHTMT_V} \
- ${WRKSRC}/lib/irrlichtmt
-
-# Use system cmake modules
-post-patch:
- rm ${WRKSRC}/cmake/Modules/FindLua*
-
post-install:
- mv ${WRKDIR}/minetest_game-${GAME_V}/ \
- ${PREFIX}/share/minetest/games/minetest_game
- chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game
+ mkdir -p ${PREFIX}/share/minetest/games
+ mv ${WRKDIST}/games \
+ ${PREFIX}/share/minetest/
+ chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/gamesm/*
do-test:
mkdir -p ${WRKBUILD}/test
diff --git distinfo distinfo
index 08f8f924f..1ac767a40 100644
--- distinfo
+++ distinfo
@@ -1,6 +1,6 @@
-SHA256 (irrlichtmt-1.9.0mt7.tar.gz) = wSzb1KhS4ebr97oieJqgV6Gn8tWF3YGiQSpi9XoOJhk=
-SHA256 (minetest-5.6.0.tar.gz) = P9vAyNn2oYwSlUugyu21SKIvNnUg9Z0HmASiHeA0epE=
-SHA256 (minetest-game-5.6.0.tar.gz) = /ZkdQsJT2zgFWcWTorA18i4HqB+Ge1OAovBF6aTQTIc=
-SIZE (irrlichtmt-1.9.0mt7.tar.gz)
Re: UPDATE: games/minetest to 5.8.0
Solene Rapenne writes: > using updated diff from > https://marc.info/?l=openbsd-ports&m=171334749408321&q=mbox > > I get a compilation error, here are the last 200 lines > ... > /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CI > rrDeviceLinux.cpp:335:31: error: use of undeclared identifier 'getpid' > long pid = static_cast(getpid()); Looks like you're missing patch-lib_irrlichtmt_source_Irrlicht_CIrrDeviceLinux_cpp which is in the message you linked to. Most likely you had no patches/ directory and patch(1) chose to create the new file in the parent (see https://marc.info/?l=openbsd-ports&m=171628004714049&w=2). > 4 warnings and 1 error generated. > ninja: build stopped: subcommand failed. That is the only error, the rest of the 200 lines were just warnings.
Re: UPDATE: games/minetest to 5.8.0
On 2024/05/30 07:35, Fabien ROMANO wrote: > Haaa ok, thx for explanation, thus the port needs either. > > ONLY_FOR_ARCHS = aarch64 arm amd64 i386 powerpc No need for that: if luajit is not available, the dependency cannot be satisfied, so it won't be built anyway. > I have issues with googlesource, I understand your point. Github use a big > cache > to avoid generating new tarballs or they just care about timestamp ? Crazy but > handy CI/testing (not for releases, I agree !). They have caches, and they mostly try to avoid changes in the software stack that would result in differing tarballs, but don't guarantee it. We've certainly had times when people fetching from github in different parts of the world got different files. The archives can vary depending on commit activity too. Either later commits on a tag, or from embedded 'short' commit hashes (there are options to allow including them in git-archive files) which can get longer if a later commit means that an old short tag is now ambiguous. > This port is using a release, not a commit id, which is a fixed tarballs from > github, this is perfectly fine ? Releases by default just have links to on-the-fly/cached git-archive files (the "source code .tar.gz" links) but project owners can also upload "release artefacts" - the named files you'll see in some projects - the latter are stable. On 2024/05/30 00:42, Anthony J. Bentley wrote: > Switching away from Lua is necessary because newer minetest decided to > stop supporting system installations of Lua. So the choice is to either > build the Lua embedded in minetest, or switch to system luajit. ah, gotcha. Probably not worth the complexity in this case - now that luajit's updated to the 2.1 branch it covers archs where minetest might be useful.
Re: UPDATE: games/minetest to 5.8.0
Fabien ROMANO writes: > This port is using a release, not a commit id, which is a fixed tarballs from > github, this is perfectly fine ? GitHub tarballs generated from tags have the same stability problems as GitHub tarballs generated from commit IDs. It's impractical to avoid them completely (because having porters generate their own static tarballs for every piece of software that doesn't provide a real static release tarball is a big ask, and also interferes with update checkers like portroach). But it's always better to convince GitHub upstreams to routinely generate a static tarball and add it as an attachment to the GitHub releases section.
Re: UPDATE: games/minetest to 5.8.0
Stuart Henderson writes:
> On 2024/05/29 20:11, Fabien ROMANO wrote:
> > By curiosity, lang/lua (5.1.5) doesn't USE_NOBTCFI, there is no JIT ?
> > Why its required for minetest (lua 5.1.4), some patches they bring ?
>
> This diff changes minetest from using lua (no jit, works on most
> archs) to luajit (restricted archs and doesn't do BTCFI landing pads
> yet). (It could alternatively pull in bsd.port.arch.mk and test
> ${PROPERTIES:Mluajit} to decide which to use).
Switching away from Lua is necessary because newer minetest decided to
stop supporting system installations of Lua. So the choice is to either
build the Lua embedded in minetest, or switch to system luajit.
Re: UPDATE: games/minetest to 5.8.0
On 30/05/2024 00:04, Stuart Henderson wrote:
> On 2024/05/29 20:11, Fabien ROMANO wrote:
>> By curiosity, lang/lua (5.1.5) doesn't USE_NOBTCFI, there is no JIT ?
>> Why its required for minetest (lua 5.1.4), some patches they bring ?
>
> This diff changes minetest from using lua (no jit, works on most
> archs) to luajit (restricted archs and doesn't do BTCFI landing pads
> yet). (It could alternatively pull in bsd.port.arch.mk and test
> ${PROPERTIES:Mluajit} to decide which to use).
Haaa ok, thx for explanation, thus the port needs either.
ONLY_FOR_ARCHS = aarch64 arm amd64 i386 powerpc
Or something like this.
.include
.if ${PROPERTIES:Mluajit}
LIB_DEPENDS+= lang/luajit
WANTLIB+= luajit-5.1
USE_NOBTCFI=Yes
.else
CONFIGURE_ARGS+= -DENABLE_LUAJIT=FALSE
.endif
>
>> DIST_TUPLE are pretty cool.
>
> Would be even cooler if people didn't rely on inconsistent automated
> git-archive production on websites and distributed fixed tarballs
> instead.
>
I have issues with googlesource, I understand your point. Github use a big cache
to avoid generating new tarballs or they just care about timestamp ? Crazy but
handy CI/testing (not for releases, I agree !).
Still the DIST_TUPLE syntax/implementation is uber cool.
This port is using a release, not a commit id, which is a fixed tarballs from
github, this is perfectly fine ?
Otherwise I would prefer to keep $*_V in the port, maybe just bikesheding but
looks cleaner to me.
V = 5.8.0
GAME_V =5.8.0
IRRLICHTMT_V = 1.9.0mt13
DIST_TUPLE += github minetest minetest ${V} .
DIST_TUPLE += github minetest minetest_game ${GAME_V} games/minetest_game
DIST_TUPLE += github minetest irrlicht ${IRRLICHTMT_V} lib/irrlichtmt
> ===> Building package for minetest-5.8.0
> Create /usr/ports/packages/amd64/all/minetest-5.8.0.tgz
> Creating package minetest-5.8.0
> /home/_pobj/minetest-5.8.0/fake-amd64/usr/local/man/man6/minetestserver.6:
> Cannot find NAME section
> /home/_pobj/minetest-5.8.0/fake-amd64/usr/local/man/man6/minetestserver.6: No
> one-line description, using filename "minetestserver"
> Link to /usr/ports/packages/amd64/ftp/minetest-5.8.0.tgz
cat /usr/ports/pobj/minetest-5.8.0/minetest-5.8.0/doc/minetestserver.6
.so man6/minetest.6
I guess this is not the way to point 'man minetestserver' into 'minetest.6' ?
Except the complaint during make package, it works, any advise ?
Re: UPDATE: games/minetest to 5.8.0
On 2024/05/29 20:11, Fabien ROMANO wrote:
> By curiosity, lang/lua (5.1.5) doesn't USE_NOBTCFI, there is no JIT ?
> Why its required for minetest (lua 5.1.4), some patches they bring ?
This diff changes minetest from using lua (no jit, works on most
archs) to luajit (restricted archs and doesn't do BTCFI landing pads
yet). (It could alternatively pull in bsd.port.arch.mk and test
${PROPERTIES:Mluajit} to decide which to use).
> DIST_TUPLE are pretty cool.
Would be even cooler if people didn't rely on inconsistent automated
git-archive production on websites and distributed fixed tarballs
instead.
Re: UPDATE: games/minetest to 5.8.0
Patches are missing, cvs add ?
By curiosity, lang/lua (5.1.5) doesn't USE_NOBTCFI, there is no JIT ?
Why its required for minetest (lua 5.1.4), some patches they bring ?
DIST_TUPLE are pretty cool.
On 29/05/2024 19:23, izder456 wrote:
> On 2024-05-29 06:39, Solene Rapenne wrote:
>> On Mon, May 27, 2024 at 05:50:28PM GMT, izder456 wrote:
>>> On Sun, 26 May 2024 19:55:12 -0500
>>> izder456 wrote:
>>>
>>> > On Wed, 17 Apr 2024 03:52:48 -0600
>>> > "Anthony J. Bentley" wrote:
>>> > > Here's an updated diff, which I'll commit in a few days unless
>>> > > someone objects.
>>> >
>>> > Thanks for the diff.
>>> >
>>> > Any update? I saw this wasn't committed yet. Figured I should "BUMP"
>>> > you. :))
>>> >
>>> > Thanks.
>>> >
>>>
>>> Please commit... Thanks.
>>>
>>> Its appreciated.
>>>
>>> --
>>> -iz (they/them)
>>>
>>> > i like to say mundane things,
>>> > there are too many uninteresting things
>>> > that go unnoticed.
>>>
>>> izder456 (dot) neocities (dot) org
>>>
>>
>> using updated diff from
>> https://marc.info/?l=openbsd-ports&m=171334749408321&q=mbox
>>
>> I get a compilation error, here are the last 200 lines
>> /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CIrrDeviceLinux.cpp:5:
>> In file included from
>> /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CIrrDeviceLinux.h:9:
>> In file included from
>> /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CIrrDeviceStub.h:7:
>> In file included from
>> /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/IrrlichtDevice.h:10:
>> In file included from
>> /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/IVideoDriver.h:9:
>> In file included from
>> /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/ITexture.h:12:
>> In file included from
>> /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/path.h:7:
>> /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/irrString.h:982:7:
>> warning: 'wstring_convert>' is deprecated
>> [-Wdeprecated-declarations]
>> std::wstring_convert> conv;
>> ^
>> /usr/include/c++/v1/locale:3603:28: note:
>> 'wstring_convert>' has been explicitly marked
>> deprecated here
>> class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 wstring_convert
>> ^
>> /usr/include/c++/v1/__config:808:41: note: expanded from macro
>> '_LIBCPP_DEPRECATED_IN_CXX17'
>> # define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED
>> ^
>> /usr/include/c++/v1/__config:781:49: note: expanded from macro
>> '_LIBCPP_DEPRECATED'
>> # define _LIBCPP_DEPRECATED __attribute__((deprecated))
>> ^
>> /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CIrrDeviceLinux.cpp:335:31:
>> error: use of undeclared identifier 'getpid'
>> long pid = static_cast(getpid());
>> ^
>> 4 warnings and 1 error generated.
>> ninja: build stopped: subcommand failed.
/tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CIrrDeviceLinux.cpp
#include
>>
>> *** Error 1 in games/minetest (/data/ports/devel/cmake/cmake.port.mk:50
>> 'do-build': @cd /tmp/pobj_mfs/minetest-5.8.0/build-amd64 && exec /us...)
>> *** Error 2 in games/minetest (/data/ports/infrastructure/mk/bsd.port.mk:3057
>> '/tmp/pobj_mfs/minetest-5.8.0/build-amd64/.build_done': @cd /d...)
>> *** Error 2 in games/minetest (/data/ports/infrastructure/mk/bsd.port.mk:2704
>> 'build': @lock=minetest-5.8.0; export _LOCKS_HELD=" minetest-...)
>> ===> Exiting games/minetest with an error
>> *** Error 1 in /data/ports (infrastructure/mk/bsd.port.subdir.mk:144 'build':
>> @: ${echo_msg:=echo}; : ${target:=build}; for i in ; do eva...)
> Ended at 1716982617.45
>> max_stuck=4.08/clean=0.06/depends=7.06/show-prepare-results=0.91/checksum=0.14/patch=0.52/configure=4.10/build=54.30
>> Error: job failed with 512 on localhost at 1716982617
>
> I wasn't having this issue, and i have it built locally even.
>
> I'll attach a new diff in case something changed on my end locally.
Re: UPDATE: games/minetest to 5.8.0
On 2024-05-29 06:39, Solene Rapenne wrote: On Mon, May 27, 2024 at 05:50:28PM GMT, izder456 wrote: On Sun, 26 May 2024 19:55:12 -0500 izder456 wrote: > On Wed, 17 Apr 2024 03:52:48 -0600 > "Anthony J. Bentley" wrote: > > Here's an updated diff, which I'll commit in a few days unless > > someone objects. > > Thanks for the diff. > > Any update? I saw this wasn't committed yet. Figured I should "BUMP" > you. :)) > > Thanks. > Please commit... Thanks. Its appreciated. -- -iz (they/them) > i like to say mundane things, > there are too many uninteresting things > that go unnoticed. izder456 (dot) neocities (dot) org using updated diff from https://marc.info/?l=openbsd-ports&m=171334749408321&q=mbox I get a compilation error, here are the last 200 lines ^ /usr/include/c++/v1/__config:808:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' #define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED ^ /usr/include/c++/v1/__config:781:49: note: expanded from macro '_LIBCPP_DEPRECATED' # define _LIBCPP_DEPRECATED __attribute__((deprecated)) ^ 4 warnings generated. [41/699] /tmp/pobj_mfs/minetest-5.8.0/bin/c++ -DIRRLICHT_API="" -DIRRLICHT_EXPORTS -DIRR_ENABLE_BUILTIN_FONT -D_IRR_COMPILE_WITH_GLX_MANAGER_ -D_IRR_COMPILE_WITH_OPENGL_ -D_IRR_COMPILE_WITH_X11_DEVICE_ -D_IRR_LINUX_PLATFORM_ -D_IRR_OPENGL_USE_EXTPOINTER_ -D_IRR_POSIX_API_ -D_IRR_STATIC_LIB_ -I/tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include -I/tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht -I/usr/local/include -O2 -pipe -I/usr/X11R6/include -O3 -std=gnu++17 -fPIC -Wall -pipe -fno-exceptions -fno-rtti -MD -MT lib/irrlichtmt/source/Irrlicht/CMakeFiles/IRRIOOBJ.dir/CWriteFile.cpp.o -MF lib/irrlichtmt/source/Irrlicht/CMakeFiles/IRRIOOBJ.dir/CWriteFile.cpp.o.d -o lib/irrlichtmt/source/Irrlicht/CMakeFiles/IRRIOOBJ.dir/CWriteFile.cpp.o -c /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.cpp In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.cpp:5: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.h:8: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/IWriteFile.h:9: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/path.h:7: /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/irrString.h:970:28: warning: 'codecvt_utf8' is deprecated [-Wdeprecated-declarations] std::wstring_convert> conv; ^ /usr/include/c++/v1/codecvt:187:28: note: 'codecvt_utf8' has been explicitly marked deprecated here class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 codecvt_utf8 ^ /usr/include/c++/v1/__config:808:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' #define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED ^ /usr/include/c++/v1/__config:781:49: note: expanded from macro '_LIBCPP_DEPRECATED' # define _LIBCPP_DEPRECATED __attribute__((deprecated)) ^ In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.cpp:5: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.h:8: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/IWriteFile.h:9: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/path.h:7: /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/irrString.h:970:7: warning: 'wstring_convert>' is deprecated [-Wdeprecated-declarations] std::wstring_convert> conv; ^ /usr/include/c++/v1/locale:3603:28: note: 'wstring_convert>' has been explicitly marked deprecated here class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 wstring_convert ^ /usr/include/c++/v1/__config:808:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' #define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED ^ /usr/include/c++/v1/__config:781:49: note: expanded from macro '_LIBCPP_DEPRECATED' # define _LIBCPP_DEPRECATED __attribute__((deprecated)) ^ In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.cpp:5: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.h:8: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/IWriteFile.h:9: In file included from /tmp/pobj_mfs/minetest-5.8.
Re: UPDATE: games/minetest to 5.8.0
On Mon, May 27, 2024 at 05:50:28PM GMT, izder456 wrote: > On Sun, 26 May 2024 19:55:12 -0500 > izder456 wrote: > > > On Wed, 17 Apr 2024 03:52:48 -0600 > > "Anthony J. Bentley" wrote: > > > Here's an updated diff, which I'll commit in a few days unless > > > someone objects. > > > > Thanks for the diff. > > > > Any update? I saw this wasn't committed yet. Figured I should "BUMP" > > you. :)) > > > > Thanks. > > > > Please commit... Thanks. > > Its appreciated. > > -- > -iz (they/them) > > > i like to say mundane things, > > there are too many uninteresting things > > that go unnoticed. > > izder456 (dot) neocities (dot) org > using updated diff from https://marc.info/?l=openbsd-ports&m=171334749408321&q=mbox I get a compilation error, here are the last 200 lines ^ /usr/include/c++/v1/__config:808:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' #define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED ^ /usr/include/c++/v1/__config:781:49: note: expanded from macro '_LIBCPP_DEPRECATED' # define _LIBCPP_DEPRECATED __attribute__((deprecated)) ^ 4 warnings generated. [41/699] /tmp/pobj_mfs/minetest-5.8.0/bin/c++ -DIRRLICHT_API="" -DIRRLICHT_EXPORTS -DIRR_ENABLE_BUILTIN_FONT -D_IRR_COMPILE_WITH_GLX_MANAGER_ -D_IRR_COMPILE_WITH_OPENGL_ -D_IRR_COMPILE_WITH_X11_DEVICE_ -D_IRR_LINUX_PLATFORM_ -D_IRR_OPENGL_USE_EXTPOINTER_ -D_IRR_POSIX_API_ -D_IRR_STATIC_LIB_ -I/tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include -I/tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht -I/usr/local/include -O2 -pipe -I/usr/X11R6/include -O3 -std=gnu++17 -fPIC -Wall -pipe -fno-exceptions -fno-rtti -MD -MT lib/irrlichtmt/source/Irrlicht/CMakeFiles/IRRIOOBJ.dir/CWriteFile.cpp.o -MF lib/irrlichtmt/source/Irrlicht/CMakeFiles/IRRIOOBJ.dir/CWriteFile.cpp.o.d -o lib/irrlichtmt/source/Irrlicht/CMakeFiles/IRRIOOBJ.dir/CWriteFile.cpp.o -c /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.cpp In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.cpp:5: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.h:8: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/IWriteFile.h:9: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/path.h:7: /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/irrString.h:970:28: warning: 'codecvt_utf8' is deprecated [-Wdeprecated-declarations] std::wstring_convert> conv; ^ /usr/include/c++/v1/codecvt:187:28: note: 'codecvt_utf8' has been explicitly marked deprecated here class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 codecvt_utf8 ^ /usr/include/c++/v1/__config:808:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' #define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED ^ /usr/include/c++/v1/__config:781:49: note: expanded from macro '_LIBCPP_DEPRECATED' # define _LIBCPP_DEPRECATED __attribute__((deprecated)) ^ In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.cpp:5: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.h:8: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/IWriteFile.h:9: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/path.h:7: /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/irrString.h:970:7: warning: 'wstring_convert>' is deprecated [-Wdeprecated-declarations] std::wstring_convert> conv; ^ /usr/include/c++/v1/locale:3603:28: note: 'wstring_convert>' has been explicitly marked deprecated here class _LIBCPP_TEMPLATE_VIS _LIBCPP_DEPRECATED_IN_CXX17 wstring_convert ^ /usr/include/c++/v1/__config:808:41: note: expanded from macro '_LIBCPP_DEPRECATED_IN_CXX17' #define _LIBCPP_DEPRECATED_IN_CXX17 _LIBCPP_DEPRECATED ^ /usr/include/c++/v1/__config:781:49: note: expanded from macro '_LIBCPP_DEPRECATED' # define _LIBCPP_DEPRECATED __attribute__((deprecated)) ^ In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.cpp:5: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/source/Irrlicht/CWriteFile.h:8: In file included from /tmp/pobj_mfs/minetest-5.8.0/minetest-5.8.0/lib/irrlichtmt/include/IWriteFile.h:9: In file included from /tmp/pobj_mfs/minetes
Re: UPDATE: games/minetest to 5.8.0
On Sun, 26 May 2024 19:55:12 -0500 izder456 wrote: > On Wed, 17 Apr 2024 03:52:48 -0600 > "Anthony J. Bentley" wrote: > > Here's an updated diff, which I'll commit in a few days unless > > someone objects. > > Thanks for the diff. > > Any update? I saw this wasn't committed yet. Figured I should "BUMP" > you. :)) > > Thanks. > Please commit... Thanks. Its appreciated. -- -iz (they/them) > i like to say mundane things, > there are too many uninteresting things > that go unnoticed. izder456 (dot) neocities (dot) org
Re: UPDATE: games/minetest to 5.8.0
On Wed, 17 Apr 2024 03:52:48 -0600 "Anthony J. Bentley" wrote: > Here's an updated diff, which I'll commit in a few days unless > someone objects. Thanks for the diff. Any update? I saw this wasn't committed yet. Figured I should "BUMP" you. :)) Thanks. -- -iz (they/them) > i like to say mundane things, > there are too many uninteresting things > that go unnoticed. izder456 (dot) neocities (dot) org
Re: UPDATE: games/minetest to 5.8.0
On Wed, 17 Apr 2024 03:52:48 -0600 "Anthony J. Bentley" wrote: > Thanks for this diff. A few things: > > - USE_NOBTCFI required after switch to luajit (crashes on BTI > hardware otherwise) > - build fails due to missing include for getpid() call Good catch, I have limited time and access to arch resources. Thanks for this > - delete REVISION since the version number changed Oh, okay. Small oversight on my part. > Here's an updated diff, which I'll commit in a few days unless > someone objects. > > [kerned out] > I definitely don't object. Thanks for the diff! Best- -- -iz (they/them) > i like to say mundane things, > there are too many uninteresting things > that go unnoticed. izder456 (dot) neocities (dot) org
Re: UPDATE: games/minetest to 5.8.0
izder456 writes:
> > I am still looking to upgrade these. OK to merge?
>
> Whoops, forgot to attach the .diff with all the changes, here:
Thanks for this diff. A few things:
- USE_NOBTCFI required after switch to luajit (crashes on BTI
hardware otherwise)
- build fails due to missing include for getpid() call
- delete REVISION since the version number changed
- it's generally preferred not to reformat WANTLIB whitespace
Here's an updated diff, which I'll commit in a few days unless
someone objects.
Index: Makefile
===
RCS file: /cvs/ports/games/minetest/Makefile,v
diff -u -p -r1.39 Makefile
--- Makefile26 Sep 2023 09:41:38 - 1.39
+++ Makefile17 Apr 2024 09:43:24 -
@@ -1,38 +1,33 @@
COMMENT = infinite-world block sandbox game
-V =5.6.0
-GAME_V = 5.6.0
-IRRLICHTMT_V = 1.9.0mt7
-
-DISTNAME = minetest-${V}
-CATEGORIES = games x11
-REVISION = 0
+V =5.8.0
+PKGNAME = minetest-${V}
+
+DIST_TUPLE += github minetest minetest ${V} .
+DIST_TUPLE += github minetest irrlicht 1.9.0mt13 lib/irrlichtmt
+DIST_TUPLE += github minetest minetest_game 5.8.0 games/minetest_game
+
+CATEGORIES = games x11
HOMEPAGE = https://www.minetest.net/
# source LGPLv2.1/ datas CC BY-SA 3.0
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 Xext Xi c curl
-WANTLIB += curses form freetype gmp iconv intl jpeg jsoncpp lua5.1
-WANTLIB += m ogg openal png pq spatialindex sqlite3 vorbis vorbisfile
-WANTLIB += z zstd
+WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 Xi c curl curses form freetype
+WANTLIB += gmp iconv intl jpeg jsoncpp luajit-5.1 m ogg openal png pq
+WANTLIB += spatialindex sqlite3 vorbis vorbisfile z zstd
COMPILER = base-clang ports-gcc base-gcc
-SITES =https://github.com/minetest/
-
-DISTFILES =minetest-{minetest/archive/}${V}${EXTRACT_SUFX} \
-
minetest-game-{minetest_game/archive/}${GAME_V}${EXTRACT_SUFX} \
-
irrlichtmt-{irrlicht/archive/}${IRRLICHTMT_V}${EXTRACT_SUFX}
-
-MODULES = devel/cmake \
- lang/lua
+MODULES = devel/cmake
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
-CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DENABLE_LUAJIT=FALSE
-CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
+CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DBUILD_SERVER=TRUE
+
+# luajit
+USE_NOBTCFI = Yes
CXXFLAGS +=-I${X11BASE}/include
MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
@@ -42,8 +37,8 @@ BUILD_DEPENDS = devel/gettext,-tools
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
-LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} \
- audio/openal \
+LIB_DEPENDS = audio/openal \
+ lang/luajit \
audio/libvorbis \
archivers/zstd \
devel/gettext,-runtime \
@@ -60,18 +55,11 @@ TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_P
TEST_ENV +=HOME=${WRKBUILD}/test \
LC_CTYPE="en_US.UTF-8"
-post-extract:
- mv ${WRKDIR}/irrlicht-${IRRLICHTMT_V} \
- ${WRKSRC}/lib/irrlichtmt
-
-# Use system cmake modules
-post-patch:
- rm ${WRKSRC}/cmake/Modules/FindLua*
-
post-install:
- mv ${WRKDIR}/minetest_game-${GAME_V}/ \
- ${PREFIX}/share/minetest/games/minetest_game
- chown -R ${SHAREOWN}:${SHAREGRP}
${PREFIX}/share/minetest/games/minetest_game
+ mkdir -p ${PREFIX}/share/minetest/games
+ mv ${WRKDIST}/games \
+ ${PREFIX}/share/minetest/
+ chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/gamesm/*
do-test:
mkdir -p ${WRKBUILD}/test
Index: distinfo
===
RCS file: /cvs/ports/games/minetest/distinfo,v
diff -u -p -r1.13 distinfo
--- distinfo21 Aug 2022 08:58:35 - 1.13
+++ distinfo17 Apr 2024 09:43:24 -
@@ -1,6 +1,6 @@
-SHA256 (irrlichtmt-1.9.0mt7.tar.gz) =
wSzb1KhS4ebr97oieJqgV6Gn8tWF3YGiQSpi9XoOJhk=
-SHA256 (minetest-5.6.0.tar.gz) = P9vAyNn2oYwSlUugyu21SKIvNnUg9Z0HmASiHeA0epE=
-SHA256 (minetest-game-5.6.0.tar.gz) =
/ZkdQsJT2zgFWcWTorA18i4HqB+Ge1OAovBF6aTQTIc=
-SIZE (irrlichtmt-1.9.0mt7.tar.gz) = 909510
-SIZE (minetest-5.6.0.tar.gz) = 9922682
-SIZE (minetest-game-5.6.0.tar.gz) = 2590530
+SHA256 (minetest-irrlicht-1.9.0mt13.tar.gz) =
L96OJxRJiCELnA/x4gKQWDTZ0lqqY85FJ2P9cXEJatw=
+SHA256 (minetest-minetest-5.8.0.tar.gz) =
YQyFok13rNwwQ6add3vtnmwAFpQGygnfIq1JD+DWjAw=
+SHA256 (minetest-minetest_game-5.8.0.tar.gz) =
M6O7Q7CEl6
Re: UPDATE: games/minetest to 5.8.0
On Thu, 04 Apr 2024 22:47:29 +0200
izder456 wrote:
> On 2024-03-09 22:00, izder456 wrote:
> > On Tue, 5 Mar 2024 23:08:04 +0100
> > Fabien ROMANO wrote:
> >
> >> Hi izder,
> >>
> >> On 04/03/2024 17:58, izder456 wrote:
> >> > Hello ports@,
> >> >
> >> > Attached is a tarball of the update.
> >> >
> >> > I took a line from FreeBSD's port system for gmp stuff, as we can
> >> > also use system gmp fine. I also patched a file so `getpid()` is
> >> > properly referenced from `unistd.h`. May be good to PR this patch
> >> > upstream?
> >> >
> >> > This port seems rather-ish complex, so I didn't do the DIST_TUPLE
> >> > stuff as I am no expert.
> >> >
> >> > OK to merge?
> >> >
> >>
> >> There is what I have done on my side, feel free to use at your own.
> >> Not sure about gmp stuff from freebsd.
> >> It was weeks ago and I ran into grahic card issue so I did not test
> >> again.
> >>
> >> I also added patches from lang/lua to the build (not needed ?)
> >>
> >> [diff]
> >>
> >
> > Thanks for the lang/lua stuff, I needed to use
> > -DENABLE_LUAJIT=FALSE in the CONFIGURE_ARGS without them. Looks
> > like the default -DENABLE_LUAJIT=TRUE works fine here, just needed
> > a little patching. (CMake complains a little, but eh, whatevs)
> >
> > I also swapped the DISTFILES to DIST_TUPLE here for simplicity's
> > sake. Thanks for the lang/lua tips.
> >
> > attached is the diff with the above changes.
> >
> > OK?
>
> I am still looking to upgrade these. OK to merge?
Whoops, forgot to attach the .diff with all the changes, here:
--
-iz (they/them)
> i like to say mundane things,
> there are too many uninteresting things
> that go unnoticed.
izder456 (dot) neocities (dot) org
diff --git games/minetest/Makefile games/minetest/Makefile
index c359bb848..2cbfe429f 100644
--- games/minetest/Makefile
+++ games/minetest/Makefile
@@ -1,11 +1,14 @@
COMMENT = infinite-world block sandbox game
-V = 5.6.0
-GAME_V = 5.6.0
-IRRLICHTMT_V = 1.9.0mt7
+V = 5.8.0
+PKGNAME = minetest-${V}
+
+DIST_TUPLE += github minetest minetest ${V} .
+DIST_TUPLE += github minetest irrlicht 1.9.0mt13 lib/irrlichtmt
+DIST_TUPLE += github minetest minetest_game 5.8.0 games/minetest_game
+
+CATEGORIES = games x11
-DISTNAME = minetest-${V}
-CATEGORIES = games x11
REVISION = 0
HOMEPAGE = https://www.minetest.net/
@@ -13,26 +16,17 @@ HOMEPAGE = https://www.minetest.net/
# source LGPLv2.1/ datas CC BY-SA 3.0
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 Xext Xi c curl
-WANTLIB += curses form freetype gmp iconv intl jpeg jsoncpp lua5.1
-WANTLIB += m ogg openal png pq spatialindex sqlite3 vorbis vorbisfile
-WANTLIB += z zstd
+WANTLIB += ${COMPILER_LIBCXX} GL GLU X11 Xi c curl curses form png
+WANTLIB += freetype gmp iconv intl jpeg jsoncpp luajit-5.1 m ogg
+WANTLIB += openal pq spatialindex sqlite3 vorbis vorbisfile z zstd
COMPILER = base-clang ports-gcc base-gcc
-SITES = https://github.com/minetest/
-
-DISTFILES = minetest-{minetest/archive/}${V}${EXTRACT_SUFX} \
- minetest-game-{minetest_game/archive/}${GAME_V}${EXTRACT_SUFX} \
- irrlichtmt-{irrlicht/archive/}${IRRLICHTMT_V}${EXTRACT_SUFX}
-
-MODULES = devel/cmake \
- lang/lua
+MODULES = devel/cmake
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
-CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DENABLE_LUAJIT=FALSE
-CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
+CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DBUILD_SERVER=TRUE
CXXFLAGS += -I${X11BASE}/include
MODCMAKE_LDFLAGS = -L${X11BASE}/lib -L${LOCALBASE}/lib
@@ -42,8 +36,8 @@ BUILD_DEPENDS = devel/gettext,-tools
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
-LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} \
- audio/openal \
+LIB_DEPENDS = audio/openal \
+ lang/luajit \
audio/libvorbis \
archivers/zstd \
devel/gettext,-runtime \
@@ -60,18 +54,11 @@ TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
TEST_ENV += HOME=${WRKBUILD}/test \
LC_CTYPE="en_US.UTF-8"
-post-extract:
- mv ${WRKDIR}/irrlicht-${IRRLICHTMT_V} \
- ${WRKSRC}/lib/irrlichtmt
-
-# Use system cmake modules
-post-patch:
- rm ${WRKSRC}/cmake/Modules/FindLua*
-
post-install:
- mv ${WRKDIR}/minetest_game-${GAME_V}/ \
- ${PREFIX}/share/minetest/games/minetest_game
- chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game
+ mkdir -p ${PREFIX}/share/minetest/games
+ mv ${WRKDIST}/games \
+ ${PREFIX}/share/minetest/
+ chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/gamesm/*
do-test:
mkdir -p ${WRKBUILD}/test
diff --git games/minetest/distinfo games/minetest/distinfo
index 08f8f924f..1ac767a40 100644
--- games/minetest/distinfo
+++ games/minetest/distinfo
@@ -1,6 +1,6 @@
-SHA256 (irrlichtmt-1.9.0mt7.tar.gz) = wSzb1KhS4ebr97oieJqgV6Gn8tWF3YGiQSpi9XoOJhk=
-SHA256 (minetest-5.6.0.tar.gz) = P9vAyNn2oYwSlUugyu21SKIvNnUg9Z0HmASiHeA0epE=
-SHA256 (minetest-game-5.6.0.tar.gz) = /Zk
Re: UPDATE: games/minetest to 5.8.0
On 2024-03-09 22:00, izder456 wrote: On Tue, 5 Mar 2024 23:08:04 +0100 Fabien ROMANO wrote: Hi izder, On 04/03/2024 17:58, izder456 wrote: > Hello ports@, > > Attached is a tarball of the update. > > I took a line from FreeBSD's port system for gmp stuff, as we can > also use system gmp fine. I also patched a file so `getpid()` is > properly referenced from `unistd.h`. May be good to PR this patch > upstream? > > This port seems rather-ish complex, so I didn't do the DIST_TUPLE > stuff as I am no expert. > > OK to merge? > There is what I have done on my side, feel free to use at your own. Not sure about gmp stuff from freebsd. It was weeks ago and I ran into grahic card issue so I did not test again. I also added patches from lang/lua to the build (not needed ?) [diff] Thanks for the lang/lua stuff, I needed to use -DENABLE_LUAJIT=FALSE in the CONFIGURE_ARGS without them. Looks like the default -DENABLE_LUAJIT=TRUE works fine here, just needed a little patching. (CMake complains a little, but eh, whatevs) I also swapped the DISTFILES to DIST_TUPLE here for simplicity's sake. Thanks for the lang/lua tips. attached is the diff with the above changes. OK? I am still looking to upgrade these. OK to merge?
Re: UPDATE: games/minetest to 5.8.0
On Tue, 5 Mar 2024 23:08:04 +0100
Fabien ROMANO wrote:
> Hi izder,
>
> On 04/03/2024 17:58, izder456 wrote:
> > Hello ports@,
> >
> > Attached is a tarball of the update.
> >
> > I took a line from FreeBSD's port system for gmp stuff, as we can
> > also use system gmp fine. I also patched a file so `getpid()` is
> > properly referenced from `unistd.h`. May be good to PR this patch
> > upstream?
> >
> > This port seems rather-ish complex, so I didn't do the DIST_TUPLE
> > stuff as I am no expert.
> >
> > OK to merge?
> >
>
> There is what I have done on my side, feel free to use at your own.
> Not sure about gmp stuff from freebsd.
> It was weeks ago and I ran into grahic card issue so I did not test
> again.
>
> I also added patches from lang/lua to the build (not needed ?)
>
> [diff]
>
Thanks for the lang/lua stuff, I needed to use -DENABLE_LUAJIT=FALSE in
the CONFIGURE_ARGS without them. Looks like the default
-DENABLE_LUAJIT=TRUE works fine here, just needed a little patching.
(CMake complains a little, but eh, whatevs)
I also swapped the DISTFILES to DIST_TUPLE here for simplicity's sake.
Thanks for the lang/lua tips.
attached is the diff with the above changes.
OK?
--
-iz (they/them)
> i like to say mundane things,
> there are too many uninteresting things
> that go unnoticed.
izder456 (dot) neocities (dot) org
diff --git games/minetest/Makefile games/minetest/Makefile
index c359bb848..37295c56b 100644
--- games/minetest/Makefile
+++ games/minetest/Makefile
@@ -1,11 +1,13 @@
COMMENT = infinite-world block sandbox game
-V = 5.6.0
-GAME_V = 5.6.0
-IRRLICHTMT_V = 1.9.0mt7
+V = 5.8.0
+PKGNAME = minetest-${V}
-DISTNAME = minetest-${V}
-CATEGORIES = games x11
+DIST_TUPLE += github minetest minetest ${V} .
+DIST_TUPLE += github minetest irrlicht 1.9.0mt13 lib/irrlichtmt
+DIST_TUPLE += github minetest minetest_game 5.8.0 games/minetest_game
+
+CATEGORIES = games
REVISION = 0
HOMEPAGE = https://www.minetest.net/
@@ -13,25 +15,17 @@ HOMEPAGE = https://www.minetest.net/
# source LGPLv2.1/ datas CC BY-SA 3.0
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 Xext Xi c curl
-WANTLIB += curses form freetype gmp iconv intl jpeg jsoncpp lua5.1
-WANTLIB += m ogg openal png pq spatialindex sqlite3 vorbis vorbisfile
-WANTLIB += z zstd
+WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE SM X11 Xext Xi c curl
+WANTLIB += curses form freetype gmp iconv intl jpeg jsoncpp
+WANTLIB += m ogg openal png pq spatialindex sqlite3 vorbis vorbisfile
+WANTLIB += z zstd
COMPILER = base-clang ports-gcc base-gcc
-SITES = https://github.com/minetest/
-
-DISTFILES = minetest-{minetest/archive/}${V}${EXTRACT_SUFX} \
- minetest-game-{minetest_game/archive/}${GAME_V}${EXTRACT_SUFX} \
- irrlichtmt-{irrlicht/archive/}${IRRLICHTMT_V}${EXTRACT_SUFX}
-
-MODULES = devel/cmake \
- lang/lua
+MODULES = devel/cmake
CONFIGURE_ARGS = -DENABLE_GETTEXT=ON -DCUSTOM_MANDIR=${PREFIX}/man
CONFIGURE_ARGS+= -DENABLE_REDIS=FALSE -DENABLE_LEVELDB=FALSE
-CONFIGURE_ARGS+= -DENABLE_SYSTEM_JSONCPP=TRUE -DENABLE_LUAJIT=FALSE
CONFIGURE_ARGS+= -DBUILD_SERVER=TRUE
CXXFLAGS += -I${X11BASE}/include
@@ -42,8 +36,7 @@ BUILD_DEPENDS = devel/gettext,-tools
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+4,-guic
-LIB_DEPENDS = ${MODLUA_LIB_DEPENDS} \
- audio/openal \
+LIB_DEPENDS = audio/openal \
audio/libvorbis \
archivers/zstd \
devel/gettext,-runtime \
@@ -60,17 +53,10 @@ TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
TEST_ENV += HOME=${WRKBUILD}/test \
LC_CTYPE="en_US.UTF-8"
-post-extract:
- mv ${WRKDIR}/irrlicht-${IRRLICHTMT_V} \
- ${WRKSRC}/lib/irrlichtmt
-
-# Use system cmake modules
-post-patch:
- rm ${WRKSRC}/cmake/Modules/FindLua*
-
post-install:
- mv ${WRKDIR}/minetest_game-${GAME_V}/ \
- ${PREFIX}/share/minetest/games/minetest_game
+ mkdir -p ${PREFIX}/share/minetest/games
+ mv ${WRKDIST}/games \
+ ${PREFIX}/share/minetest/
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game
do-test:
diff --git games/minetest/distinfo games/minetest/distinfo
index 08f8f924f..1ac767a40 100644
--- games/minetest/distinfo
+++ games/minetest/distinfo
@@ -1,6 +1,6 @@
-SHA256 (irrlichtmt-1.9.0mt7.tar.gz) = wSzb1KhS4ebr97oieJqgV6Gn8tWF3YGiQSpi9XoOJhk=
-SHA256 (minetest-5.6.0.tar.gz) = P9vAyNn2oYwSlUugyu21SKIvNnUg9Z0HmASiHeA0epE=
-SHA256 (minetest-game-5.6.0.tar.gz) = /ZkdQsJT2zgFWcWTorA18i4HqB+Ge1OAovBF6aTQTIc=
-SIZE (irrlichtmt-1.9.0mt7.tar.gz) = 909510
-SIZE (minetest-5.6.0.tar.gz) = 9922682
-SIZE (minetest-game-5.6.0.tar.gz) = 2590530
+SHA256 (minetest-irrlicht-1.9.0mt13.tar.gz) = L96OJxRJiCELnA/x4gKQWDTZ0lqqY85FJ2P9cXEJatw=
+SHA256 (minetest-minetest-5.8.0.tar.gz) = YQyFok13rNwwQ6add3vtnmwAFpQGygnfIq1JD+DWjAw=
+SHA256 (minetest-minetest_game-5.8.0.tar.gz) = M6O7Q7CEl6C9svSfFAooKeWC1cFsCtUr4VlcgD9waRI=
+SIZE (minetest-irrlicht-1.9.0mt13.tar.gz) = 754056
+SIZE (minetest-minetest-5.8.0.tar.gz) = 10419348
+SIZE (minetest-minetest_game-5.8
Re: UPDATE: games/minetest to 5.8.0
On Mon, 4 Mar 2024 17:08:09 +
Stuart Henderson wrote:
>
> Please send diffs not tarballs for updates.
>
Ok- sorry.
I use the git mirror (internet speed and familiarity concerns), so
hopefully this is close enough to the mirrored CVS tree.
here it is.
--
-iz (they/them)
> i like to say mundane things,
> there are too many uninteresting things
> that go unnoticed.
izder456 (dot) neocities (dot) org
diff --git games/minetest/Makefile games/minetest/Makefile
index c359bb848..aae6e051b 100644
--- games/minetest/Makefile
+++ games/minetest/Makefile
@@ -1,8 +1,8 @@
COMMENT = infinite-world block sandbox game
-V = 5.6.0
-GAME_V = 5.6.0
-IRRLICHTMT_V = 1.9.0mt7
+V = 5.8.0
+GAME_V = 5.8.0
+IRRLICHTMT_V = 1.9.0mt13
DISTNAME = minetest-${V}
CATEGORIES = games x11
@@ -63,12 +63,12 @@ TEST_ENV += HOME=${WRKBUILD}/test \
post-extract:
mv ${WRKDIR}/irrlicht-${IRRLICHTMT_V} \
${WRKSRC}/lib/irrlichtmt
-
-# Use system cmake modules
-post-patch:
- rm ${WRKSRC}/cmake/Modules/FindLua*
+# make sure no bundled gmp is used (took line from FreeBSD)
+ rm -Rf ${WRKSRC}/lib/gmp ${WRKSRC}/lib/jsoncpp
+# bundled lua is OK, there's no option to use system one
post-install:
+ mkdir -p ${PREFIX}/share/minetest/games
mv ${WRKDIR}/minetest_game-${GAME_V}/ \
${PREFIX}/share/minetest/games/minetest_game
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game
diff --git games/minetest/distinfo games/minetest/distinfo
index 08f8f924f..bab65928f 100644
--- games/minetest/distinfo
+++ games/minetest/distinfo
@@ -1,6 +1,6 @@
-SHA256 (irrlichtmt-1.9.0mt7.tar.gz) = wSzb1KhS4ebr97oieJqgV6Gn8tWF3YGiQSpi9XoOJhk=
-SHA256 (minetest-5.6.0.tar.gz) = P9vAyNn2oYwSlUugyu21SKIvNnUg9Z0HmASiHeA0epE=
-SHA256 (minetest-game-5.6.0.tar.gz) = /ZkdQsJT2zgFWcWTorA18i4HqB+Ge1OAovBF6aTQTIc=
-SIZE (irrlichtmt-1.9.0mt7.tar.gz) = 909510
-SIZE (minetest-5.6.0.tar.gz) = 9922682
-SIZE (minetest-game-5.6.0.tar.gz) = 2590530
+SHA256 (irrlichtmt-1.9.0mt13.tar.gz) = L96OJxRJiCELnA/x4gKQWDTZ0lqqY85FJ2P9cXEJatw=
+SHA256 (minetest-5.8.0.tar.gz) = YQyFok13rNwwQ6add3vtnmwAFpQGygnfIq1JD+DWjAw=
+SHA256 (minetest-game-5.8.0.tar.gz) = M6O7Q7CEl6C9svSfFAooKeWC1cFsCtUr4VlcgD9waRI=
+SIZE (irrlichtmt-1.9.0mt13.tar.gz) = 754056
+SIZE (minetest-5.8.0.tar.gz) = 10419348
+SIZE (minetest-game-5.8.0.tar.gz) = 2608281
diff --git games/minetest/pkg/PLIST games/minetest/pkg/PLIST
index 0993431cc..fe89834d9 100644
--- games/minetest/pkg/PLIST
+++ games/minetest/pkg/PLIST
@@ -5,18 +5,19 @@
share/applications/net.minetest.minetest.desktop
share/doc/minetest/
share/doc/minetest/README.md
-share/doc/minetest/client_lua_api.txt
-share/doc/minetest/lua_api.txt
-share/doc/minetest/menu_lua_api.txt
+share/doc/minetest/client_lua_api.md
+share/doc/minetest/lua_api.md
+share/doc/minetest/menu_lua_api.md
share/doc/minetest/minetest.conf.example
-share/doc/minetest/texture_packs.txt
-share/doc/minetest/world_format.txt
+share/doc/minetest/texture_packs.md
+share/doc/minetest/world_format.md
share/icons/hicolor/128x128/apps/minetest.png
share/icons/hicolor/scalable/apps/minetest.svg
share/locale/be/LC_MESSAGES/minetest.mo
share/locale/bg/LC_MESSAGES/minetest.mo
share/locale/ca/LC_MESSAGES/minetest.mo
share/locale/cs/LC_MESSAGES/minetest.mo
+share/locale/cy/LC_MESSAGES/minetest.mo
share/locale/da/LC_MESSAGES/minetest.mo
share/locale/de/LC_MESSAGES/minetest.mo
share/locale/el/LC_MESSAGES/minetest.mo
@@ -24,20 +25,26 @@ share/locale/eo/LC_MESSAGES/minetest.mo
share/locale/es/LC_MESSAGES/minetest.mo
share/locale/et/LC_MESSAGES/minetest.mo
share/locale/eu/LC_MESSAGES/minetest.mo
+share/locale/fa/LC_MESSAGES/minetest.mo
share/locale/fi/LC_MESSAGES/minetest.mo
share/locale/fil/
share/locale/fil/LC_MESSAGES/
share/locale/fil/LC_MESSAGES/minetest.mo
share/locale/fr/LC_MESSAGES/minetest.mo
+share/locale/ga/LC_MESSAGES/minetest.mo
share/locale/gd/LC_MESSAGES/minetest.mo
share/locale/gl/LC_MESSAGES/minetest.mo
share/locale/hu/LC_MESSAGES/minetest.mo
+share/locale/ia/LC_MESSAGES/minetest.mo
share/locale/id/LC_MESSAGES/minetest.mo
share/locale/it/LC_MESSAGES/minetest.mo
share/locale/ja/LC_MESSAGES/minetest.mo
share/locale/jbo/
share/locale/jbo/LC_MESSAGES/
share/locale/jbo/LC_MESSAGES/minetest.mo
+share/locale/jv/
+share/locale/jv/LC_MESSAGES/
+share/locale/jv/LC_MESSAGES/minetest.mo
share/locale/kk/LC_MESSAGES/minetest.mo
share/locale/ko/LC_MESSAGES/minetest.mo
share/locale/ky/LC_MESSAGES/minetest.mo
@@ -46,6 +53,8 @@ share/locale/lv/LC_MESSAGES/minetest.mo
share/locale/lzh/
share/locale/lzh/LC_MESSAGES/
share/locale/lzh/LC_MESSAGES/minetest.mo
+share/locale/mi/LC_MESSAGES/minetest.mo
+share/locale/mn/LC_MESSAGES/minetest.mo
share/locale/mr/LC_MESSAGES/minetest.mo
share/locale/ms/LC_MESSAGES/minetest.mo
share/locale/nb/LC_MESSAGES/minetest.mo
@@ -96,8 +105,10 @@ share/minetest/builtin/common/after.lua
share/minetest/builtin/common/chatcommands.lua
share/minetest/builtin/common/filterlist.lua
share/minetest/builtin/c
Re: UPDATE: games/minetest to 5.8.0
On 2024/03/04 10:58, izder456 wrote: > Hello ports@, > > Attached is a tarball of the update. > > I took a line from FreeBSD's port system for gmp stuff, as we can also > use system gmp fine. I also patched a file so `getpid()` is properly > referenced from `unistd.h`. May be good to PR this patch upstream? > > This port seems rather-ish complex, so I didn't do the DIST_TUPLE stuff > as I am no expert. > > OK to merge? > > -- > -iz (they/them) > > > i like to say mundane things, > > there are too many uninteresting things > > that go unnoticed. > > izder456 (dot) neocities (dot) org Please send diffs not tarballs for updates.
UPDATE: games/minetest to 5.8.0
Hello ports@, Attached is a tarball of the update. I took a line from FreeBSD's port system for gmp stuff, as we can also use system gmp fine. I also patched a file so `getpid()` is properly referenced from `unistd.h`. May be good to PR this patch upstream? This port seems rather-ish complex, so I didn't do the DIST_TUPLE stuff as I am no expert. OK to merge? -- -iz (they/them) > i like to say mundane things, > there are too many uninteresting things > that go unnoticed. izder456 (dot) neocities (dot) org minetest-5.8.0p0.tgz Description: application/compressed-tar
