Update to 2.0.0

3 files changed, 52 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2cecf6e0dc90..77e0791d946b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = horde3d
-	pkgdesc = A lightweight next-generation 3D rendering and animation engine.
-	pkgver = 1.0beta5
+	pkgdesc = Horde3D is a small 3D rendering and animation engine. It is written in an effort to create an engine being as lightweight and conceptually clean as possible.
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = http://www.horde3d.org/
 	arch = i686
 	arch = x86_64
 	license = EPL
 	makedepends = cmake
-	makedepends = mesa
-	depends = gcc-libs
+	makedepends = ninja
 	depends = libgl
-	source = Horde3D-482a4c2afb.tar.gz::https://github.com/horde3d/Horde3D/archive/482a4c2afb.tar.gz
-	sha1sums = ad8ed0038bc7d7f3d20e42ba7a9677a54d7ac11d
+	depends = glfw-x11
+	source = https://github.com/horde3d/Horde3D/archive/refs/tags/v2.0.0.tar.gz
+	source = fix-building-under-linux-and-gcc-10.patch
+	sha512sums = 0c267a4ce80c6db4cc18064759aae69761cf39a232e31cc24674092eb35c13439a7df0b984c46a2b93dee446cecc5c266f4a47e78f24577a491bee6582782927
+	sha512sums = 15cac2942803297591ead6cbfa597699b4dffd210bee750a6508338cca98d2bd5e61c6b603a249c780e2119fa6671797839fdf787b217f3619fb72597490f10c
 
 pkgname = horde3d
-
diff --git a/PKGBUILD b/PKGBUILD
index e0fef4d4bed1..344c887fc8b2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,41 @@
 # Maintainer: Davorin Učakar <davorin.ucakar@gmail.com>
 
 pkgname=horde3d
-pkgver=1.0beta5
+pkgver=2.0.0
 pkgrel=1
-pkgdesc='A lightweight next-generation 3D rendering and animation engine.'
+pkgdesc='Horde3D is a small 3D rendering and animation engine. It is written in an effort to create an engine being as lightweight and conceptually clean as possible.'
 url='http://www.horde3d.org/'
 license=('EPL')
 arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libgl')
-makedepends=('cmake' 'mesa')
-source=("Horde3D-482a4c2afb.tar.gz::https://github.com/horde3d/Horde3D/archive/482a4c2afb.tar.gz")
-sha1sums=('ad8ed0038bc7d7f3d20e42ba7a9677a54d7ac11d')
+depends=('libgl' 'glfw-x11')
+makedepends=('cmake' 'ninja')
+source=("https://github.com/horde3d/Horde3D/archive/refs/tags/v${pkgver}.tar.gz"
+        "fix-building-under-linux-and-gcc-10.patch")
+sha512sums=('0c267a4ce80c6db4cc18064759aae69761cf39a232e31cc24674092eb35c13439a7df0b984c46a2b93dee446cecc5c266f4a47e78f24577a491bee6582782927'
+            '15cac2942803297591ead6cbfa597699b4dffd210bee750a6508338cca98d2bd5e61c6b603a249c780e2119fa6671797839fdf787b217f3619fb72597490f10c')
+
+prepare() {
+  cd "${srcdir}/Horde3D-${pkgver}"
+  patch -p1 -i "../fix-building-under-linux-and-gcc-10.patch"
+}
+
+build() {
+  mkdir -p "${srcdir}/build" && cd "${srcdir}/build"
 
-build()
-{
-  mkdir -p ${srcdir}/build && cd ${srcdir}/build
-  
   cmake \
+    -G Ninja \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_C_FLAGS="${CFLAGS/-O2/-Ofast}" \
     -D CMAKE_CXX_FLAGS="${CXXFLAGS/-O2/-Ofast}" \
-    ../Horde3D-482a4c2afb
+    ../Horde3D-${pkgver}
 
-  make
+  ninja
 }
 
-package()
-{
-  cd ${srcdir}/build
-
-  make install DESTDIR=${pkgdir}
-
-  cd ${srcdir}/Horde3D-482a4c2afb
+package() {
+  cd "${srcdir}/build"
+  DESTDIR="${pkgdir}" ninja install
 
-  install -Dm755 Horde3D/Binaries/Linux/ColladaConv ${pkgdir}/usr/bin/ColladaConv
+  install -Dm755 "${srcdir}/build/Binaries/Linux/Release/ColladaConv" "${pkgdir}"/usr/bin/ColladaConv
 }
diff --git a/fix-building-under-linux-and-gcc-10.patch b/fix-building-under-linux-and-gcc-10.patch
new file mode 100644
index 000000000000..7e1e34b6bff8
--- /dev/null
+++ b/fix-building-under-linux-and-gcc-10.patch
@@ -0,0 +1,21 @@
+commit 7013522c51a6937433c8579170a1836efdb5033d
+Author: Irdis <algts@inbox.ru>
+Date:   Wed Apr 21 22:10:08 2021 +0300
+
+    Fix compiling under Linux and gcc 10.
+
+diff --git a/Horde3D/Source/Shared/utPlatform.h b/Horde3D/Source/Shared/utPlatform.h
+index 3dc852d..a54d9fc 100644
+--- a/Horde3D/Source/Shared/utPlatform.h
++++ b/Horde3D/Source/Shared/utPlatform.h
+@@ -184,7 +184,10 @@ namespace StaticAssert
+ // Locale independent version of atof (taking always dot as decimal separator)
+ #if defined( PLATFORM_MAC ) || defined ( PLATFORM_IOS )
+ 	#include <xlocale.h>
++#elif defined( PLATFORM_LINUX )
++    #include <cstdlib>
+ #endif
++
+ inline float toFloat(const char* str)
+ {
+ #ifdef PLATFORM_WIN