Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the runtime 21.08 and new Irrlicht (irrlichtmt) #34

Merged
merged 16 commits into from
Jan 31, 2022
Merged
24 changes: 0 additions & 24 deletions irrlicht-link-against-needed-libs.patch

This file was deleted.

163 changes: 0 additions & 163 deletions irrlicht-use-system-libs.patch

This file was deleted.

30 changes: 15 additions & 15 deletions net.minetest.Minetest.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
app-id: net.minetest.Minetest
runtime: org.freedesktop.Platform
runtime-version: "20.08"
runtime-version: "21.08"
default-branch: stable
farribeiro marked this conversation as resolved.
Show resolved Hide resolved
sdk: org.freedesktop.Sdk
command: minetest
rename-appdata-file: net.minetest.minetest.appdata.xml
Expand All @@ -24,20 +25,14 @@ cleanup:

modules:
- name: libirrlicht
buildsystem: simple
build-commands:
- make -C source/Irrlicht NDEBUG=1 sharedlib
- make -C source/Irrlicht INSTALL_DIR=/app/lib install
buildsystem: cmake-ninja
build-opts:
- -C source/Irrlicht
- INSTALL_DIR=/app/lib
sources:
- type: archive
url: http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.4.zip
sha256: f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433

- type: patch
path: irrlicht-use-system-libs.patch

- type: patch
path: irrlicht-link-against-needed-libs.patch
url: https://github.com/minetest/irrlicht/archive/1.9.0mt3.tar.gz
sha256: 6188a9a4f4ee785091ce650068d358ebb33bb82170ec53a5d101fe060144ffcc

- name: libluajit
no-autogen: true
Expand All @@ -57,8 +52,8 @@ modules:
config-opts:
- "-DENABLE_CURSES=0"
- "-DENABLE_GETTEXT=1"
- "-DIRRLICHT_LIBRARY=/app/lib/libIrrlicht.so"
- "-DIRRLICHT_INCLUDE_DIR=/app/include/irrlicht"
- "-DIRRLICHT_LIBRARY=/app/lib/libIrrlichtMt.so"
- "-DIRRLICHT_INCLUDE_DIR=/app/include/irrlichtmt"
cleanup:
- "/share/minetest/games/minimal"
sources:
Expand All @@ -70,3 +65,8 @@ modules:
url: https://github.com/minetest/minetest_game/archive/5.4.1.tar.gz
sha256: b4bfa0755b88230cf4bdb6af6a0951dd1248f6cdf87fecc340e43ac12c80b0b2
dest: games/minetest_game

- type: archive
url: https://github.com/minetest/irrlicht/archive/1.9.0mt3.tar.gz
sha256: 6188a9a4f4ee785091ce650068d358ebb33bb82170ec53a5d101fe060144ffcc
dest: lib/irrlichtmt