Re: update games/minetest to 5.3.0

2020-08-20 Thread Sebastien Marie 
On Wed, Aug 19, 2020 at 10:25:54AM +0200, Sebastien Marie wrote:
> Hi,
> 
> Here an update of games/minetest to 5.3.0 (released on 9 July 2020).
> 
> Tested on amd64 with minetest-game (included in the port).
> 

New diff.

It seems the detection of luajit doesn't work well currently (it is already the
case with current version in ports): it is lua which was used instead of
expected luajit. I spent some time to understand the problem and finally give
up (cmake is hard)... So the updated diff explicitly avoids luajit and link to 
lua.

It should enable the build on more platforms, as the dependency on lang/luajit
is removed.

While here, I also link to jsoncpp version from ports instead of embedded
version.

And also added a test target which runs units tests. I disabled
TestThreading::testThreadKill test as it is abording the test run (it was
already the case with previous version): it tries to unlock an unlocked mutex.

Now, only 1 test fails (on 205):
Test assertion failed: utf8_to_wide(wrap_rows(str, 20)) != L""
at test_utilities.cpp:338
[FAIL] testWrapRows - 1ms


Built and tested on amd64, and build only on sparc64.

Comments or OK ?
-- 
Sebastien Marie


diff 84d72dabc0d940d2f64f068796bb6357ec970260 /home/semarie/repos/openbsd/ports
blob - 5415e8ba5ddae17e655a540b695046f754bb09b1
file + games/minetest/Makefile
--- games/minetest/Makefile
+++ games/minetest/Makefile
@@ -1,22 +1,19 @@
 # $OpenBSD: Makefile,v 1.31 2020/05/26 20:01:01 rsadowski Exp $
 
 COMMENT =  infinite-world block sandbox game
-# minetest_game is still 0.4.17
-# this is engine's bug fix release
-GAME_V =   0.4.17
-V =${GAME_V}.1
+GAME_V =   5.3.0
+V =${GAME_V}
 DISTNAME = minetest-${V}
 CATEGORIES =   games x11
-REVISION = 5
 
-HOMEPAGE = http://www.minetest.net/
+HOMEPAGE = https://www.minetest.net/
 
 # source LGPLv2.1/ datas CC BY-SA 3.0
 PERMIT_PACKAGE =   Yes
 
 WANTLIB += ${COMPILER_LIBCXX} GL GLU ICE Irrlicht SM X11 Xext
 WANTLIB += Xxf86vm bz2 c curl curses form freetype gmp iconv intl
-WANTLIB += jpeg luajit-${MODLUA_VERSION} m ogg openal png pq
+WANTLIB += jsoncpp jpeg ${MODLUA_WANTLIB} m ogg openal png pq
 WANTLIB += spatialindex sqlite3 vorbis vorbisfile z
 
 COMPILER = base-clang ports-gcc base-gcc
@@ -31,6 +28,7 @@ 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_ENV +=   CXXFLAGS="-I${X11BASE}/include"
 
@@ -39,25 +37,32 @@ BUILD_DEPENDS = devel/gettext,-tools
 RUN_DEPENDS =  devel/desktop-file-utils \
x11/gtk+3,-guic
 
-LIB_DEPENDS =  audio/openal \
+LIB_DEPENDS =  ${MODLUA_LIB_DEPENDS} \
+   audio/openal \
+   devel/jsoncpp \
devel/gmp \
databases/sqlite3 \
databases/postgresql \
geo/spatialindex \
audio/libvorbis \
-   lang/luajit \
net/curl \
x11/irrlicht
 
-NO_TEST =  Yes
+TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
+TEST_ENV +=HOME=${WRKBUILD}/test
 
 # Use system cmake modules
-pre-configure:
+post-patch:
rm ${WRKSRC}/cmake/Modules/FindLua*
 
 post-install:
mv ${WRKDIR}/minetest_game-${GAME_V}/ \
-   ${PREFIX}/share/minetest/games/minetest_game
+   ${PREFIX}/share/minetest/games/minetest_game
chown -R ${SHAREOWN}:${SHAREGRP} 
${PREFIX}/share/minetest/games/minetest_game
+
+do-test:
+   mkdir -p ${WRKBUILD}/test
+   cd ${WRKBUILD} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+   ${LOCALBASE}/bin/minetest --run-unittests
 
 .include 
blob - cec609b94f22a71694a14c6c22fe49a4cc7c984a
file + games/minetest/distinfo
--- games/minetest/distinfo
+++ games/minetest/distinfo
@@ -1,4 +1,4 @@
-SHA256 (minetest-0.4.17.1.tar.gz) = 
zSXUDFP0kjJe2r0vY5clD0CmHLn+Sh1N1usDDg0c61k=
-SHA256 (minetest-game-0.4.17.tar.gz) = 
8KsHy0fBVAsgFr92o24u7Ciw6ngnv2b8VEfgxeXUSV0=
-SIZE (minetest-0.4.17.1.tar.gz) = 7758675
-SIZE (minetest-game-0.4.17.tar.gz) = 1356784
+SHA256 (minetest-5.3.0.tar.gz) = ZdwgSfJMk/pURQDzEKYeKJwbj6R79gh3t0aiwnpyONY=
+SHA256 (minetest-game-5.3.0.tar.gz) = 
BsbB1Ll68hHdD6UYo+aKIF9ZTpgWpLJHfkjU0h0nji0=
+SIZE (minetest-5.3.0.tar.gz) = 10828893
+SIZE (minetest-game-5.3.0.tar.gz) = 1904865
blob - 5a57080640b59dc1a313e901c1234525ffd8aa60
file + /dev/null
--- games/minetest/patches/patch-cmake_Modules_FindGMP_cmake
+++ games/minetest/patches/patch-cmake_Modules_FindGMP_cmake
@@ -1,16 +0,0 @@
-$OpenBSD: patch-cmake_

update games/minetest to 5.3.0

2020-08-19 Thread Sebastien Marie 
Hi,

Here an update of games/minetest to 5.3.0 (released on 9 July 2020).

Tested on amd64 with minetest-game (included in the port).

Comments or OK ?
-- 
Sebastien Marie


diff 84d72dabc0d940d2f64f068796bb6357ec970260 /home/semarie/repos/openbsd/ports
blob - 5415e8ba5ddae17e655a540b695046f754bb09b1
file + games/minetest/Makefile
--- games/minetest/Makefile
+++ games/minetest/Makefile
@@ -1,15 +1,12 @@
 # $OpenBSD: Makefile,v 1.31 2020/05/26 20:01:01 rsadowski Exp $
 
 COMMENT =  infinite-world block sandbox game
-# minetest_game is still 0.4.17
-# this is engine's bug fix release
-GAME_V =   0.4.17
-V =${GAME_V}.1
+GAME_V =   5.3.0
+V =${GAME_V}
 DISTNAME = minetest-${V}
 CATEGORIES =   games x11
-REVISION = 5
 
-HOMEPAGE = http://www.minetest.net/
+HOMEPAGE = https://www.minetest.net/
 
 # source LGPLv2.1/ datas CC BY-SA 3.0
 PERMIT_PACKAGE =   Yes
@@ -57,7 +54,7 @@ pre-configure:
 
 post-install:
mv ${WRKDIR}/minetest_game-${GAME_V}/ \
-   ${PREFIX}/share/minetest/games/minetest_game
+   ${PREFIX}/share/minetest/games/minetest_game
chown -R ${SHAREOWN}:${SHAREGRP} 
${PREFIX}/share/minetest/games/minetest_game
 
 .include 
blob - cec609b94f22a71694a14c6c22fe49a4cc7c984a
file + games/minetest/distinfo
--- games/minetest/distinfo
+++ games/minetest/distinfo
@@ -1,4 +1,4 @@
-SHA256 (minetest-0.4.17.1.tar.gz) = 
zSXUDFP0kjJe2r0vY5clD0CmHLn+Sh1N1usDDg0c61k=
-SHA256 (minetest-game-0.4.17.tar.gz) = 
8KsHy0fBVAsgFr92o24u7Ciw6ngnv2b8VEfgxeXUSV0=
-SIZE (minetest-0.4.17.1.tar.gz) = 7758675
-SIZE (minetest-game-0.4.17.tar.gz) = 1356784
+SHA256 (minetest-5.3.0.tar.gz) = ZdwgSfJMk/pURQDzEKYeKJwbj6R79gh3t0aiwnpyONY=
+SHA256 (minetest-game-5.3.0.tar.gz) = 
BsbB1Ll68hHdD6UYo+aKIF9ZTpgWpLJHfkjU0h0nji0=
+SIZE (minetest-5.3.0.tar.gz) = 10828893
+SIZE (minetest-game-5.3.0.tar.gz) = 1904865
blob - 5a57080640b59dc1a313e901c1234525ffd8aa60
file + /dev/null
--- games/minetest/patches/patch-cmake_Modules_FindGMP_cmake
+++ games/minetest/patches/patch-cmake_Modules_FindGMP_cmake
@@ -1,16 +0,0 @@
-$OpenBSD: patch-cmake_Modules_FindGMP_cmake,v 1.1 2018/06/25 20:44:13 landry 
Exp $
-
-fix libgmp detection
-
-Index: cmake/Modules/FindGMP.cmake
 cmake/Modules/FindGMP.cmake.orig
-+++ cmake/Modules/FindGMP.cmake
-@@ -3,7 +3,7 @@ mark_as_advanced(GMP_LIBRARY GMP_INCLUDE_DIR)
- set(USE_SYSTEM_GMP FALSE)
- 
- if(ENABLE_SYSTEM_GMP)
--  find_library(GMP_LIBRARY NAMES libgmp.so)
-+  find_library(GMP_LIBRARY NAMES gmp)
-   find_path(GMP_INCLUDE_DIR NAMES gmp.h)
- 
-   if(GMP_LIBRARY AND GMP_INCLUDE_DIR)
blob - 0e79867f0cf850d43f23a592ce73aa6519a4ca10
file + /dev/null
--- games/minetest/patches/patch-src_CMakeLists_txt
+++ games/minetest/patches/patch-src_CMakeLists_txt
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_CMakeLists_txt,v 1.13 2018/06/25 20:02:06 landry Exp $
-Index: src/CMakeLists.txt
 src/CMakeLists.txt.orig
-+++ src/CMakeLists.txt
-@@ -756,14 +756,12 @@ else()
-   set(OTHER_FLAGS "${OTHER_FLAGS} -mthreads -fexceptions")
-   endif()
- 
--  set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} 
${WARNING_FLAGS} ${OTHER_FLAGS} -Wall -pipe -funroll-loops")
-+  set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG ${RELEASE_WARNING_FLAGS} 
${WARNING_FLAGS} ${OTHER_FLAGS} -Wall")
-   if(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
-   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Os")
--  else()
--  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 
-ffast-math -fomit-frame-pointer")
-   endif(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
-   set(CMAKE_CXX_FLAGS_SEMIDEBUG "-g -O1 -Wall -Wabi ${WARNING_FLAGS} 
${OTHER_FLAGS}")
--  set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wabi ${WARNING_FLAGS} 
${OTHER_FLAGS}")
-+  set(CMAKE_CXX_FLAGS_DEBUG "-g -Wall -Wabi ${WARNING_FLAGS} 
${OTHER_FLAGS}")
- 
-   if(USE_GPROF)
-   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg")
blob - /dev/null
file + games/minetest/patches/patch-src_porting_cpp
--- games/minetest/patches/patch-src_porting_cpp
+++ games/minetest/patches/patch-src_porting_cpp
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/porting.cpp
+--- src/porting.cpp.orig
 src/porting.cpp
+@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software 
+ 
+ #include "porting.h"
+ 
+-#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__DragonFly__)
++#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__DragonFly__) || 
defined(__OpenBSD__)
+   #include 
+   #include 
+   extern char **environ;
blob - f999a82a3f4a6582e82b75eb30e56cec7ece9a48
file + games/minetest/pkg/PLIST
--- games/minetest/pkg/PLIST
+++ games/minetest/pkg/PLIST
@@ -5,7 +5,8 @@
 @man man/man6/minetestserver.6
 share/applications/net.minetest.minetest.desktop
 share/doc/minetest/
-share/doc/minetest/README.tx