Massive changes to fix things such as the new IrrlichtMt library.

2 files changed, 39 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3dc3a4f02e1..a93bb469d6e8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = minetest-git-leveldb
-	pkgdesc = Minecraft-inspired building game (with LuaJIT, LevelDB, Redis, and PostgreSQL support)
-	pkgver = 20190320.38ea0890e
+	pkgdesc = Minecraft-inspired building game (with LuaJIT, LevelDB and Redis support)
+	pkgver = 20210421.3e2145d66
 	pkgrel = 1
 	url = http://www.minetest.net/
 	install = install
@@ -9,7 +9,7 @@ pkgbase = minetest-git-leveldb
 	license = GPL
 	makedepends = git
 	makedepends = cmake
-	makedepends = clang
+	makedepends = ninja
 	depends = bzip2
 	depends = libpng
 	depends = libjpeg
@@ -17,7 +17,6 @@ pkgbase = minetest-git-leveldb
 	depends = sqlite
 	depends = openal
 	depends = libvorbis
-	depends = irrlicht
 	depends = curl
 	depends = freetype2
 	depends = luajit
@@ -26,7 +25,6 @@ pkgbase = minetest-git-leveldb
 	depends = hiredis
 	depends = spatialindex
 	depends = gmp
-	depends = postgresql
 	provides = minetest
 	provides = minetest-common
 	provides = minetest-server
@@ -35,6 +33,8 @@ pkgbase = minetest-git-leveldb
 	conflicts = minetest-server
 	source = git://github.com/minetest/minetest.git
 	source = git://github.com/minetest/minetest_game.git
+	source = git://github.com/minetest/irrlicht.git
+	sha1sums = SKIP
 	sha1sums = SKIP
 	sha1sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 7fefb3427a2e..589085d68151 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
-# Maintainer:  Martin C. Doege <mdoege at compuserve dot com>
+# Maintainer:  ROllerozxa (temporaryemail4meh [gee mail])
+# Contributor: Martin C. Doege <mdoege at compuserve dot com>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Konsta Kokkinen <kray@tsundere.fi>
-
 pkgname=minetest-git-leveldb
 _pkgname=minetest
-pkgver=20190320.38ea0890e
+pkgver=20210421.3e2145d66
 pkgrel=1
-pkgdesc='Minecraft-inspired building game (with LuaJIT, LevelDB, Redis, and PostgreSQL support)'
+pkgdesc='Minecraft-inspired building game (with LuaJIT, LevelDB and Redis support)'
 url='http://www.minetest.net/'
 license=('GPL')
 arch=('i686' 'x86_64')
-makedepends=('git' 'cmake' 'clang')
-depends=('bzip2' 'libpng' 'libjpeg' 'mesa' 'sqlite' 'openal' 'libvorbis'
-         'irrlicht' 'curl' 'freetype2' 'luajit' 'leveldb' 'gettext' 'hiredis'
-         'spatialindex' 'gmp' 'postgresql')
-source=('git://github.com/minetest/'minetest{,_game}.git)
-sha1sums=('SKIP' 'SKIP')
+makedepends=('git' 'cmake' 'ninja')
+depends=('bzip2' 'libpng' 'libjpeg' 'mesa' 'sqlite' 'openal' 'libvorbis' 'curl'
+		'freetype2' 'luajit' 'leveldb' 'gettext' 'hiredis' 'spatialindex' 'gmp')
+source=('git://github.com/minetest/'minetest{,_game}.git
+		'git://github.com/minetest/irrlicht.git')
+sha1sums=('SKIP' 'SKIP' 'SKIP')
 
 conflicts=("${_pkgname}"{,-common,-server})
 provides=("${_pkgname}"{,-common,-server})
@@ -26,23 +26,34 @@ pkgver() {
 	git log -1 --format='%cd.%h' --date=short | tr -d -
 }
 
-prepare() {
-	cd "${srcdir}"
-	rm -fr minetest/games/minetest_game
-	mkdir -p minetest/games/minetest_game
-	cp -a minetest_game/* minetest/games/minetest_game
-}
-
 build() {
+	cd "${srcdir}/irrlicht"
+	cmake -G Ninja . \
+		-DBUILD_SHARED_LIBS=ON
+	ninja
+
 	cd "${srcdir}/${_pkgname}"
-	CC=clang CXX=clang++ cmake . \
-		-DCMAKE_INSTALL_PREFIX=/usr -DENABLE_FREETYPE=on -DENABLE_LEVELDB=on \
-		-DENABLE_CURL=on -DENABLE_GETTEXT=on -DENABLE_REDIS=on \
-		-DENABLE_POSTGRESQL=on
-	make
+	cmake -G Ninja . \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_CLIENT=1 \
+		-DENABLE_GETTEXT=1 \
+		-DENABLE_FREETYPE=1 \
+		-DENABLE_LEVELDB=1 \
+		-DENABLE_POSTGRESQL=0 \
+		-DENABLE_SPATIAL=1 \
+		-DENABLE_REDIS=1 \
+		-DIRRLICHT_INCLUDE_DIR="${srcdir}/irrlicht/include/" \
+		-DIRRLICHT_LIBRARY="${srcdir}/irrlicht/lib/Linux/libIrrlichtMt.so"
+	ninja
 }
 
 package() {
 	cd "${srcdir}/${_pkgname}"
-	make DESTDIR="${pkgdir}" install
+	DESTDIR="${pkgdir}" ninja install
+	cp -a "${srcdir}/minetest_game/" "${pkgdir}/usr/share/minetest/games/"
+
+	cd "${srcdir}/irrlicht"
+	DESTDIR="${pkgdir}" ninja install
+	mv "${pkgdir}/usr/local/lib/" "${pkgdir}/usr/"
+	mv "${pkgdir}/usr/local/include/" "${pkgdir}/usr/"
 }