CVS commit: pkgsrc/games/minetest

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/games/minetest
From: "Kevin Bloom" <ktnb%netbsd.org@localhost>
Date: Mon, 12 Aug 2024 15:16:04 +0000

Module Name:    pkgsrc
Committed By:   ktnb
Date:           Mon Aug 12 15:16:04 UTC 2024

Modified Files:
        pkgsrc/games/minetest: Makefile PLIST distinfo
Added Files:
        pkgsrc/games/minetest/patches: patch-irr_src_CIrrDeviceLinux.cpp
            patch-irr_src_os.cpp
Removed Files:
        pkgsrc/games/minetest/patches:
            patch-lib_irrlichtmt_source_Irrlicht_CIrrDeviceLinux.cpp
            patch-lib_irrlichtmt_source_Irrlicht_os.cpp

Log Message:
minetest: udpate to 5.9.0

Packaging Updates:
- irrlicht is now included in the minetest source so there is no
  longer a need to pull it down.
- updated patches to point at the new location for irrlicht.
- cleaned up Makefile

Upstream Updates:
- Rendering performance improvements
- Added godrays shader
- New multithreaded Lua mapgen API to improve performance of custom
  mapgens
- Work in the background on switching to SDL2 for windowing and input
  (but not enabled in this release)


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/games/minetest/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/games/minetest/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/games/minetest/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/games/minetest/patches/patch-irr_src_CIrrDeviceLinux.cpp \
    pkgsrc/games/minetest/patches/patch-irr_src_os.cpp
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/games/minetest/patches/patch-lib_irrlichtmt_source_Irrlicht_CIrrDeviceLinux.cpp \
    pkgsrc/games/minetest/patches/patch-lib_irrlichtmt_source_Irrlicht_os.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/minetest/Makefile
diff -u pkgsrc/games/minetest/Makefile:1.36 pkgsrc/games/minetest/Makefile:1.37
--- pkgsrc/games/minetest/Makefile:1.36 Wed May 29 16:32:42 2024
+++ pkgsrc/games/minetest/Makefile      Mon Aug 12 15:16:03 2024
@@ -1,22 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2024/05/29 16:32:42 adam Exp $
+# $NetBSD: Makefile,v 1.37 2024/08/12 15:16:03 ktnb Exp $
 
-PKGNAME=               minetest-5.8.0
-PKGREVISION=           3
-CATEGORIES=            games
-DIST_SUBDIR=           minetest-${PKGVERSION_NOREV}
-DISTFILES+=            minetest.tar.gz
-
-# This is a fork by the Minetest developers that was stripped-down and
-# customized specifically for use in Minetest.
-# It is intentionally not compatible to upstream and is planned to be
-# eventually absorbed into Minetest.
-# Repository: https://github.com/minetest/irrlicht
-DISTFILES+=            irrlicht.tar.gz
-IRRLICHT_VERSION=      1.9.0mt13
-SITES.minetest.tar.gz= \
-       -https://github.com/minetest/minetest/archive/${PKGVERSION_NOREV}.tar.gz
-SITES.irrlicht.tar.gz= \
-       -https://github.com/minetest/irrlicht/archive/${IRRLICHT_VERSION}.tar.gz
+DISTNAME=      minetest-5.9.0
+CATEGORIES=    games
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=minetest/}
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.minetest.net/
@@ -41,20 +28,6 @@ CMAKE_ARGS+= -DENABLE_POSTGRESQL=FALSE
 CMAKE_ARGS+=   -DENABLE_LEVELDB=FALSE
 CMAKE_ARGS+=   -DENABLE_REDIS=FALSE
 CMAKE_ARGS+=   -DENABLE_SPATIAL=FALSE
-#.include "../../lang/LuaJIT2/platform.mk"
-#.if ${PLATFORM_SUPPORTS_LUAJIT} == "no"
-#CMAKE_ARGS+=  -DENABLE_LUAJIT=FALSE
-#.endif
-# Binaries built with LuaJIT support have been broken since 2015, see:
-# https://github.com/minetest/minetest/issues/2988
-CMAKE_ARGS+=   -DENABLE_LUAJIT=FALSE
-# As described above, use Minetest forked version of irrlicht.
-#CMAKE_ARGS+=  -DIRRLICHT_INCLUDE_DIR=${BUILDLINK_PREFIX.irrlicht}/include/irrlicht
-
-post-extract:
-       ${MV} ${WRKDIR}/irrlicht-${IRRLICHT_VERSION} \
-           ${WRKSRC}/lib/irrlichtmt
-
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/openal-soft/buildlink3.mk"
@@ -68,7 +41,6 @@ post-extract:
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-#.include "../../graphics/irrlicht/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/jsoncpp/buildlink3.mk"

Index: pkgsrc/games/minetest/PLIST
diff -u pkgsrc/games/minetest/PLIST:1.7 pkgsrc/games/minetest/PLIST:1.8
--- pkgsrc/games/minetest/PLIST:1.7     Tue Jan  2 14:18:07 2024
+++ pkgsrc/games/minetest/PLIST Mon Aug 12 15:16:03 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2024/01/02 14:18:07 gdt Exp $
+@comment $NetBSD: PLIST,v 1.8 2024/08/12 15:16:03 ktnb Exp $
 bin/minetest
 bin/minetestserver
 man/man6/minetest.6
@@ -41,6 +41,7 @@ share/locale/jbo/LC_MESSAGES/minetest.mo
 share/locale/jv/LC_MESSAGES/minetest.mo
 share/locale/kk/LC_MESSAGES/minetest.mo
 share/locale/ko/LC_MESSAGES/minetest.mo
+share/locale/kv/LC_MESSAGES/minetest.mo
 share/locale/ky/LC_MESSAGES/minetest.mo
 share/locale/lt/LC_MESSAGES/minetest.mo
 share/locale/lv/LC_MESSAGES/minetest.mo
@@ -64,6 +65,7 @@ share/locale/sr_Cyrl/LC_MESSAGES/minetes
 share/locale/sr_Latn/LC_MESSAGES/minetest.mo
 share/locale/sv/LC_MESSAGES/minetest.mo
 share/locale/sw/LC_MESSAGES/minetest.mo
+share/locale/tok/LC_MESSAGES/minetest.mo
 share/locale/tr/LC_MESSAGES/minetest.mo
 share/locale/tt/LC_MESSAGES/minetest.mo
 share/locale/uk/LC_MESSAGES/minetest.mo
@@ -71,7 +73,7 @@ share/locale/vi/LC_MESSAGES/minetest.mo
 share/locale/yue/LC_MESSAGES/minetest.mo
 share/locale/zh_CN/LC_MESSAGES/minetest.mo
 share/locale/zh_TW/LC_MESSAGES/minetest.mo
-share/metainfo/net.minetest.minetest.appdata.xml
+share/metainfo/net.minetest.minetest.metainfo.xml
 share/minetest/builtin/async/game.lua
 share/minetest/builtin/async/mainmenu.lua
 share/minetest/builtin/client/chatcommands.lua
@@ -84,15 +86,20 @@ share/minetest/builtin/common/chatcomman
 share/minetest/builtin/common/filterlist.lua
 share/minetest/builtin/common/information_formspecs.lua
 share/minetest/builtin/common/item_s.lua
+share/minetest/builtin/common/metatable.lua
 share/minetest/builtin/common/misc_helpers.lua
 share/minetest/builtin/common/mod_storage.lua
 share/minetest/builtin/common/register.lua
 share/minetest/builtin/common/serialize.lua
 share/minetest/builtin/common/strict.lua
+share/minetest/builtin/common/tests/after_spec.lua
 share/minetest/builtin/common/tests/misc_helpers_spec.lua
 share/minetest/builtin/common/tests/serialize_spec.lua
 share/minetest/builtin/common/tests/vector_spec.lua
 share/minetest/builtin/common/vector.lua
+share/minetest/builtin/emerge/env.lua
+share/minetest/builtin/emerge/init.lua
+share/minetest/builtin/emerge/register.lua
 share/minetest/builtin/fstk/buttonbar.lua
 share/minetest/builtin/fstk/dialog.lua
 share/minetest/builtin/fstk/tabview.lua
@@ -106,6 +113,7 @@ share/minetest/builtin/game/detached_inv
 share/minetest/builtin/game/falling.lua
 share/minetest/builtin/game/features.lua
 share/minetest/builtin/game/forceloading.lua
+share/minetest/builtin/game/hud.lua
 share/minetest/builtin/game/init.lua
 share/minetest/builtin/game/item.lua
 share/minetest/builtin/game/item_entity.lua
@@ -114,21 +122,28 @@ share/minetest/builtin/game/misc.lua
 share/minetest/builtin/game/misc_s.lua
 share/minetest/builtin/game/privileges.lua
 share/minetest/builtin/game/register.lua
-share/minetest/builtin/game/statbars.lua
 share/minetest/builtin/game/static_spawn.lua
+share/minetest/builtin/game/tests/test_moveaction.lua
 share/minetest/builtin/game/voxelarea.lua
 share/minetest/builtin/init.lua
 share/minetest/builtin/locale/__builtin.de.tr
+share/minetest/builtin/locale/__builtin.eo.tr
+share/minetest/builtin/locale/__builtin.fr.tr
 share/minetest/builtin/locale/__builtin.id.tr
 share/minetest/builtin/locale/__builtin.it.tr
 share/minetest/builtin/locale/__builtin.ms.tr
+share/minetest/builtin/locale/__builtin.pt_BR.tr
 share/minetest/builtin/locale/__builtin.ru.tr
 share/minetest/builtin/locale/template.txt
 share/minetest/builtin/mainmenu/async_event.lua
 share/minetest/builtin/mainmenu/common.lua
-share/minetest/builtin/mainmenu/content/dlg_contentstore.lua
+share/minetest/builtin/mainmenu/content/contentdb.lua
+share/minetest/builtin/mainmenu/content/dlg_contentdb.lua
+share/minetest/builtin/mainmenu/content/dlg_install.lua
+share/minetest/builtin/mainmenu/content/dlg_overwrite.lua
 share/minetest/builtin/mainmenu/content/init.lua
 share/minetest/builtin/mainmenu/content/pkgmgr.lua
+share/minetest/builtin/mainmenu/content/screenshots.lua
 share/minetest/builtin/mainmenu/content/tests/pkgmgr_spec.lua
 share/minetest/builtin/mainmenu/content/update_detector.lua
 share/minetest/builtin/mainmenu/dlg_config_world.lua
@@ -141,7 +156,6 @@ share/minetest/builtin/mainmenu/dlg_rena
 share/minetest/builtin/mainmenu/dlg_version_info.lua
 share/minetest/builtin/mainmenu/game_theme.lua
 share/minetest/builtin/mainmenu/init.lua
-share/minetest/builtin/mainmenu/misc.lua
 share/minetest/builtin/mainmenu/serverlistmgr.lua
 share/minetest/builtin/mainmenu/settings/components.lua
 share/minetest/builtin/mainmenu/settings/dlg_change_mapgen_flags.lua
@@ -163,6 +177,7 @@ share/minetest/builtin/profiler/sampling
 share/minetest/builtin/settingtypes.txt
 share/minetest/client/shaders/3d_interlaced_merge/opengl_fragment.glsl
 share/minetest/client/shaders/3d_interlaced_merge/opengl_vertex.glsl
+share/minetest/client/shaders/Irrlicht
 share/minetest/client/shaders/bloom_downsample/opengl_fragment.glsl
 share/minetest/client/shaders/bloom_downsample/opengl_vertex.glsl
 share/minetest/client/shaders/bloom_upsample/opengl_fragment.glsl
@@ -171,6 +186,8 @@ share/minetest/client/shaders/blur_h/ope
 share/minetest/client/shaders/blur_h/opengl_vertex.glsl
 share/minetest/client/shaders/blur_v/opengl_fragment.glsl
 share/minetest/client/shaders/blur_v/opengl_vertex.glsl
+share/minetest/client/shaders/cloud_shader/opengl_fragment.glsl
+share/minetest/client/shaders/cloud_shader/opengl_vertex.glsl
 share/minetest/client/shaders/default_shader/opengl_fragment.glsl
 share/minetest/client/shaders/default_shader/opengl_vertex.glsl
 share/minetest/client/shaders/extract_bloom/opengl_fragment.glsl
@@ -197,6 +214,8 @@ share/minetest/client/shaders/stars_shad
 share/minetest/client/shaders/stars_shader/opengl_vertex.glsl
 share/minetest/client/shaders/update_exposure/opengl_fragment.glsl
 share/minetest/client/shaders/update_exposure/opengl_vertex.glsl
+share/minetest/client/shaders/volumetric_light/opengl_fragment.glsl
+share/minetest/client/shaders/volumetric_light/opengl_vertex.glsl
 share/minetest/fonts/Arimo-Bold.ttf
 share/minetest/fonts/Arimo-BoldItalic.ttf
 share/minetest/fonts/Arimo-Italic.ttf

Index: pkgsrc/games/minetest/distinfo
diff -u pkgsrc/games/minetest/distinfo:1.11 pkgsrc/games/minetest/distinfo:1.12
--- pkgsrc/games/minetest/distinfo:1.11 Tue Jan  2 14:18:07 2024
+++ pkgsrc/games/minetest/distinfo      Mon Aug 12 15:16:03 2024
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.11 2024/01/02 14:18:07 gdt Exp $
+$NetBSD: distinfo,v 1.12 2024/08/12 15:16:03 ktnb Exp $
 
-BLAKE2s (minetest-5.8.0/irrlicht.tar.gz) = 01ae00e621c1c3911e436dffa76b16d67aa0e2922b7c0aff9f364bfce100b4f6
-SHA512 (minetest-5.8.0/irrlicht.tar.gz) = 5226d78eaacf8b56eafbbb6359bfb6137f9d6a555a252224e33d39c0d219fcb7d0d29fd3828961eee37d55940f3aa6e767fea31c96fb772dd5eca3889f5ac16e
-Size (minetest-5.8.0/irrlicht.tar.gz) = 754056 bytes
-BLAKE2s (minetest-5.8.0/minetest.tar.gz) = 4c4a2bf3ec87c12bfe248289804f76002eef2dc93cce3413436c0d7cf4f2d084
-SHA512 (minetest-5.8.0/minetest.tar.gz) = 0b376ecc051032ccb542f2f76e2b1f5c351b32f1c211027825b1538095f44cb1447cd0976cb85a4cde4ecb53873bcb9f3778799271ed65b038a031dc137c2aba
-Size (minetest-5.8.0/minetest.tar.gz) = 10419348 bytes
-SHA1 (patch-lib_irrlichtmt_source_Irrlicht_CIrrDeviceLinux.cpp) = b7438ca35758a319fed3f36d01dd699141a63ea7
-SHA1 (patch-lib_irrlichtmt_source_Irrlicht_os.cpp) = 48e29772199a173969b86aca83dee1d9fbe41c0b
+BLAKE2s (minetest-5.9.0.tar.gz) = 813c7b0218297236239b2d419bb7390e6b9cc491a8aef74f1215c7961b181702
+SHA512 (minetest-5.9.0.tar.gz) = 12f741ffc4e3b44fd19e98b288f8ed42a5a4c48a02f09a2ea712199815e5393bb50a9b6719c367036041094f8922af9c56a70585e9b26085fe96c70869d3cdbf
+Size (minetest-5.9.0.tar.gz) = 11984514 bytes
+SHA1 (patch-irr_src_CIrrDeviceLinux.cpp) = ef1133760dee61aaee8dc59690b7644ce45a3390
+SHA1 (patch-irr_src_os.cpp) = fe5cf12adf6b4574e97e8cfee46a07401b87ab90
 SHA1 (patch-src_util_string.cpp) = f240efd440fa540c1f767735892b9177089a8f30

Added files:

Index: pkgsrc/games/minetest/patches/patch-irr_src_CIrrDeviceLinux.cpp
diff -u /dev/null pkgsrc/games/minetest/patches/patch-irr_src_CIrrDeviceLinux.cpp:1.1
--- /dev/null   Mon Aug 12 15:16:04 2024
+++ pkgsrc/games/minetest/patches/patch-irr_src_CIrrDeviceLinux.cpp     Mon Aug 12 15:16:03 2024
@@ -0,0 +1,52 @@
+$NetBSD: patch-irr_src_CIrrDeviceLinux.cpp,v 1.1 2024/08/12 15:16:03 ktnb Exp $
+
+Use FreeBSD's support for NetBSD
+
+--- irr/src/CIrrDeviceLinux.cpp.orig   2024-08-12 14:20:28.251368264 +0000
++++ irr/src/CIrrDeviceLinux.cpp
+@@ -28,6 +28,7 @@
+ #include "IFileSystem.h"
+ #include <X11/XKBlib.h>
+ #include <X11/Xatom.h>
++#include <unistd.h>
+ 
+ #if defined(_IRR_LINUX_X11_XINPUT2_)
+ #include <X11/extensions/XInput2.h>
+@@ -47,9 +48,8 @@
+ 
+ #if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+ #include <fcntl.h>
+-#include <unistd.h>
+ 
+-#ifdef __FreeBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+ #include <sys/joystick.h>
+ #else
+ 
+@@ -1577,7 +1577,7 @@ bool CIrrDeviceLinux::activateJoysticks(
+               if (-1 == info.fd)
+                       continue;
+ 
+-#ifdef __FreeBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+               info.axes = 2;
+               info.buttons = 2;
+ #else
+@@ -1601,7 +1601,7 @@ bool CIrrDeviceLinux::activateJoysticks(
+               returnInfo.Axes = info.axes;
+               returnInfo.Buttons = info.buttons;
+ 
+-#ifndef __FreeBSD__
++#if !defined(__NetBSD__) && !defined(__FreeBSD__)
+               char name[80];
+               ioctl(info.fd, JSIOCGNAME(80), name);
+               returnInfo.Name = name;
+@@ -1633,7 +1633,7 @@ void CIrrDeviceLinux::pollJoysticks()
+       for (u32 j = 0; j < ActiveJoysticks.size(); ++j) {
+               JoystickInfo &info = ActiveJoysticks[j];
+ 
+-#ifdef __FreeBSD__
++#if defined(__NetBSD__) || defined(__FreeBSD__)
+               struct joystick js;
+               if (read(info.fd, &js, sizeof(js)) == sizeof(js)) {
+                       info.persistentData.JoystickEvent.ButtonStates = js.b1 | (js.b2 << 1); /* should be a two-bit field */
Index: pkgsrc/games/minetest/patches/patch-irr_src_os.cpp
diff -u /dev/null pkgsrc/games/minetest/patches/patch-irr_src_os.cpp:1.1
--- /dev/null   Mon Aug 12 15:16:04 2024
+++ pkgsrc/games/minetest/patches/patch-irr_src_os.cpp  Mon Aug 12 15:16:03 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-irr_src_os.cpp,v 1.1 2024/08/12 15:16:03 ktnb Exp $
+
+Add NetBSD's endian functions
+
+--- irr/src/os.cpp.orig        2024-08-12 14:23:31.809803900 +0000
++++ irr/src/os.cpp
+@@ -31,6 +31,11 @@
+ #define bswap_16(X) letoh16(X)
+ #define bswap_32(X) letoh32(X)
+ #define bswap_64(X) letoh64(X)
++#elif defined(__NetBSD__)
++#include <endian.h>
++#define bswap_16(X) htole16(X)
++#define bswap_32(X) htole32(X)
++#define bswap_64(X) htole64(X)
+ #elif !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__PPC__) && !defined(_IRR_WINDOWS_API_)
+ #include <byteswap.h>
+ #else

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index