head 1.3; access; symbols pkgsrc-2024Q3:1.2.0.2 pkgsrc-2024Q3-base:1.2; locks; strict; comment @// @; 1.3 date 2024.11.16.01.57.06; author ktnb; state dead; branches; next 1.2; commitid N8rUqN8cVoVtoOxF; 1.2 date 2024.09.16.14.29.04; author ktnb; state Exp; branches; next 1.1; commitid uAqVH5DD8F51w2qF; 1.1 date 2024.08.12.15.16.03; author ktnb; state Exp; branches; next ; commitid AcFDYdUBUX1TTxlF; desc @@ 1.3 log @luanti: update to 5.10.0 Packaging changes: - games/minetest -> games/luanti - made myself (ktnb) maintainer Upstream changes: - name change - many updates to the client and scripting parts https://dev.minetest.net/Changelog#5.9.1_.E2.86.92_5.10.0 @ text @$NetBSD: patch-irr_src_CIrrDeviceLinux.cpp,v 1.2 2024/09/16 14:29:04 ktnb Exp $ Use FreeBSD's support for NetBSD --- irr/src/CIrrDeviceLinux.cpp.orig 2024-09-16 13:40:09.623642575 +0000 +++ irr/src/CIrrDeviceLinux.cpp @@@@ -28,6 +28,7 @@@@ #include "IFileSystem.h" #include #include +#include #if defined(_IRR_LINUX_X11_XINPUT2_) #include @@@@ -52,7 +53,7 @@@@ #if defined _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ #include -#ifdef __FreeBSD__ +#if defined(__NetBSD__) || defined(__FreeBSD__) #include #else @@@@ -1580,7 +1581,7 @@@@ bool CIrrDeviceLinux::activateJoysticks( if (-1 == info.fd) continue; -#ifdef __FreeBSD__ +#if defined(__NetBSD__) || defined(__FreeBSD__) info.axes = 2; info.buttons = 2; #else @@@@ -1604,7 +1605,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; @@@@ -1636,7 +1637,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 */ @ 1.2 log @minetest: update to 5.9.1 bug fixes @ text @d1 1 a1 1 $NetBSD: patch-irr_src_CIrrDeviceLinux.cpp,v 1.1 2024/08/12 15:16:03 ktnb Exp $ @ 1.1 log @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) @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- irr/src/CIrrDeviceLinux.cpp.orig 2024-08-12 14:20:28.251368264 +0000 d15 1 a15 2 @@@@ -47,9 +48,8 @@@@ a17 1 -#include d24 1 a24 1 @@@@ -1577,7 +1577,7 @@@@ bool CIrrDeviceLinux::activateJoysticks( d33 1 a33 1 @@@@ -1601,7 +1601,7 @@@@ bool CIrrDeviceLinux::activateJoysticks( d42 1 a42 1 @@@@ -1633,7 +1633,7 @@@@ void CIrrDeviceLinux::pollJoysticks() @