Skip to content

Commit 8fedf28

Browse files
authored
Merge pull request #35 from sergiusens/candidate
chore: migrate to luanti and its latest version
2 parents 7356d03 + 291444b commit 8fedf28

File tree

3 files changed

+38
-55
lines changed

3 files changed

+38
-55
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[Desktop Entry]
2-
Name=Minetest
3-
GenericName=Minetest
2+
Name=Luanti
3+
GenericName=Luanti
44
Comment=Multiplayer infinite-world block sandbox
5-
Exec=minetest
6-
Icon=${SNAP}/meta/gui/minetest.svg
5+
Exec=luanti
6+
Icon=${SNAP}/meta/gui/luanti.svg
77
Terminal=false
88
Type=Application
99
Categories=Game;

snap/snapcraft.yaml

Lines changed: 34 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,41 @@
1-
name: minetest
2-
version: 5.10.0
1+
name: luanti
2+
version: 5.12.0
33

4-
summary: Open source voxel game engine
4+
summary: Open source voxel game engine (formerly minetest)
55
description: |
6-
Minetest is a minecraft-inspired game written from scratch and licensed under the LGPL (version 2.1 or later). It supports both survival and creative modes along with multiplayer support, dynamic lighting, and an "infinite" map generator.
6+
An open source voxel game engine. Play one of our many games, mod a game to your liking,
7+
make your own game, or play on a multiplayer server.
78
89
**Authors**
910
10-
This snap package is maintained by the Snapcrafters community. It is not necessarily endorsed or officially supported by the developers of the application itself.
11+
This snap package is maintained by the Snapcrafters community.
12+
It is not necessarily endorsed or officially supported by the
13+
developers of the application itself.
1114
1215
license: LGPL-2.1-or-later
13-
website: https://www.minetest.net/
14-
contact: https://github.com/snapcrafters/minetest/issues
15-
issues: https://github.com/snapcrafters/minetest/issues
16-
source-code: https://github.com/snapcrafters/minetest
17-
icon: snap/gui/minetest.svg
16+
website: https://luanti.org
17+
contact: https://github.com/snapcrafters/luanti/issues
18+
issues: https://github.com/snapcrafters/luanti/issues
19+
source-code: https://github.com/snapcrafters/luanti
20+
icon: snap/gui/luanti.svg
1821

19-
base: core22
22+
base: core24
2023
compression: lzo
2124
grade: stable
2225
confinement: strict
2326

24-
architectures:
25-
- build-on: amd64
26-
- build-on: armhf
27-
- build-on: arm64
27+
platforms:
28+
amd64:
29+
armhf:
30+
arm64:
2831

2932
apps:
30-
minetest:
33+
luanti:
3134
extensions: [gnome]
3235
environment:
3336
HOME: "$SNAP_USER_COMMON"
3437
DISABLE_WAYLAND: 1
35-
command: bin/launcher
38+
command: usr/bin/luanti
3639
plugs:
3740
- audio-playback
3841
- desktop
@@ -49,22 +52,14 @@ apps:
4952
- x11
5053

5154
parts:
52-
launcher:
53-
plugin: dump
54-
source: ./snap/local
55-
source-type: local
56-
57-
minetest:
55+
luanti:
5856
plugin: cmake
59-
source: https://github.com/minetest/minetest.git
57+
source: https://github.com/luanti-org/luanti.git
6058
source-tag: $SNAPCRAFT_PROJECT_VERSION
6159
cmake-parameters:
6260
- -DCMAKE_BUILD_TYPE=Release
6361
- -DCMAKE_INSTALL_PREFIX=/usr
6462
- -DRUN_IN_PLACE=FALSE
65-
override-pull: |
66-
craftctl default
67-
git clone --depth=1 --branch=1.9.0mt13 https://github.com/minetest/irrlicht lib/irrlichtmt
6863
build-packages:
6964
- cmake
7065
- g++
@@ -90,31 +85,19 @@ parts:
9085
- libzstd-dev
9186
- zlib1g-dev
9287
stage-packages:
93-
- libcurl3-gnutls
94-
- libfreetype6
95-
- libgl1-mesa-dri
96-
- libgl1-mesa-glx
97-
- libjpeg-turbo8
88+
- libsdl2-2.0-0
89+
- libxss1
90+
- libdecor-0-0
91+
- libopenal1
92+
- libsamplerate0
93+
- libsndio7.0
9894
- libjsoncpp25
9995
- libleveldb1d
10096
- libluajit-5.1-2
101-
- libopenal1
102-
- libopengl0
103-
- libpng16-16
104-
- libpulse0
10597
- libsnappy1v5
106-
- libvorbisfile3
107-
- libx11-6
108-
- libx11-xcb1
109-
- libxcb-dri2-0
110-
- libxcb-dri3-0
111-
- libxcb-glx0
112-
- libxcb-present0
113-
- libxcb-sync1
114-
- libxdamage1
115-
- libxext6
116-
- libxfixes3
117-
- libxi6
118-
- libxshmfence1
119-
- libxxf86vm1
120-
- libzstd1
98+
prime:
99+
- -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libpulse-simple.so.0.1.1
100+
- -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libicutest.so.74.2
101+
- -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libicuio.so.74.2
102+
- -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libicutu.so.74.2
103+
- -usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/libicui18n.so.74.2

0 commit comments

Comments
 (0)