From 7583a8af7e49e988acd3e7cedd4d87d87d64a017 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Wed, 19 May 2021 22:15:50 +0300 Subject: [PATCH] minetest: update to 5.4.1. By ericonr: - fix configure args and hostmakedepends to actually enable gettext for our build - remove configure args that match their defaults (documented in README.md) - add _revision to VERSION_EXTRA for a bit more free debugging info, if necessary - fix minetest_game unpacking to not leave a folder in builddir after the package's been built, not extract the archive twice and not require tar in hostmakedepends (it never was actually required, it could have been replaced by bsdtar) Closes: #31000 [via git-merge-pr] --- srcpkgs/minetest/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/minetest/template b/srcpkgs/minetest/template index 15a26e0d1ef..197ee68e4e5 100644 --- a/srcpkgs/minetest/template +++ b/srcpkgs/minetest/template @@ -1,11 +1,10 @@ # Template file for 'minetest' pkgname=minetest -version=5.3.0 +version=5.4.1 revision=1 build_style=cmake -configure_args="-DRUN_IN_PLACE=0 -DENABLE_GETTEXT=1 -DENABLE_FREETYPE=1 - -DBUILD_SERVER=TRUE" -hostmakedepends="pkg-config tar" +configure_args="-DBUILD_SERVER=TRUE -DVERSION_EXTRA=_${revision}" +hostmakedepends="pkg-config gettext" makedepends="MesaLib-devel freetype-devel gmp-devel irrlicht-devel libcurl-devel libjpeg-turbo-devel libopenal-devel libvorbis-devel lua52-devel sqlite-devel" @@ -16,8 +15,8 @@ license="LGPL-2.1-or-later" homepage="https://www.minetest.net" distfiles="https://github.com/minetest/minetest/archive/${version}.tar.gz https://github.com/minetest/minetest_game/archive/${version}.tar.gz>minetest_game-${version}.tar.gz" -checksum="65dc2049f24c93fa544500f310a61e289c1b8fa47bf60877b746a2c27a7238d6 - 06c6c1d4b97af211dd0fa518a3e68a205f594e9816a4b2477e48d4d21d278e2d" +checksum="de9e4410583c845c104b4be25f9d0b8743d8573c120149b8910ae2519f9ab14e + b4bfa0755b88230cf4bdb6af6a0951dd1248f6cdf87fecc340e43ac12c80b0b2" # LuaJIT enabled causes PIE to # be broken/not-used on aarch64* @@ -26,9 +25,12 @@ case "$XBPS_TARGET_MACHINE" in *) makedepends+=" LuaJIT-devel" ;; esac +post_extract() { + mv ../minetest_game-${version} . +} + pre_install() { # Install the minetest_game subgame. - tar -xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/minetest_game-${version}.tar.gz vmkdir usr/share/minetest/games/minetest_game vcopy minetest_game-${version}/* usr/share/minetest/games/minetest_game }