Date: Monday, October 26, 2020 @ 07:31:27 Author: svenstaro Revision: 733831
upgpkg: ogre 2.2.4-1 Added: ogre/trunk/fix-includes.patch Modified: ogre/trunk/PKGBUILD --------------------+ PKGBUILD | 30 +++++++++++++++++------------- fix-includes.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-26 06:34:13 UTC (rev 733830) +++ PKGBUILD 2020-10-26 07:31:27 UTC (rev 733831) @@ -1,6 +1,6 @@ # Maintainer: Sven-Hendrik Haase <[email protected]> pkgname=ogre -pkgver=2.1 +pkgver=2.2.4 pkgrel=1 pkgdesc='Scene-oriented, flexible 3D engine written in C++' arch=('x86_64') @@ -10,18 +10,22 @@ 'nvidia-cg-toolkit' 'zziplib' 'sdl2' 'glu' 'tinyxml' 'zlib') makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'python' 'ninja' 'cppunit') install=ogre.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre-next/archive/${pkgver}.tar.gz";) +source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre-next/archive/v${pkgver}.tar.gz"; + fix-includes.patch) optdepends=('python: python bindings') -sha512sums=('9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5') +sha512sums=('c16dac0c9e02efd45f6c3189e0600b739e551d78f4794160701377a9c1b4e24b4868a774a35c80d7f2cade44abe04128bc46949ca497a44867b55f378ede028b' + 'a8c70b4ee692cded9c97a0101e59bede0f4c0c2445d075b15bb20e0a3cf1e0c9af3cedde2e3b8524d2430e7b338869eb9d41d5853e9cf1510688a9ddf4f4b19f') prepare() { - mkdir ogre-next-${pkgver}/build + cd ogre-next-${pkgver} + patch -Np1 -i "${srcdir}"/fix-includes.patch } build() { - cd ogre-next-${pkgver}/build + cd ogre-next-${pkgver} - cmake .. \ + cmake \ + -Bbuild \ -GNinja \ -DCMAKE_INSTALL_PREFIX=/usr \ -DOGRE_CONFIG_ENABLE_JSON=TRUE \ @@ -32,8 +36,8 @@ -DOGRE_BUILD_TESTS=TRUE \ -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE - ninja - ninja OgreDoc + ninja -C build + ninja -C build OgreDoc # All of these are broken # -DOGRE_BUILD_COMPONENT_TERRAIN=ON \ # -DOGRE_BUILD_COMPONENT_VOLUME=ON \ @@ -44,21 +48,21 @@ } check() { - cd ogre-next-${pkgver}/build + cd ogre-next-${pkgver} # Upstream pls - # ninja test + # ninja -C build test } package() { - cd ogre-next-${pkgver}/build + cd ogre-next-${pkgver} - DESTDIR="${pkgdir}" ninja install + DESTDIR="${pkgdir}" ninja -C build install mkdir -p "${pkgdir}"/opt/ogre/samples mv "${pkgdir}"/usr/bin/Sample_* "${pkgdir}"/opt/ogre/samples mv "${pkgdir}"/usr/bin/Test_* "${pkgdir}"/opt/ogre/samples - install -Dm644 ../Docs/License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html + install -Dm644 Docs/License.html "${pkgdir}"/usr/share/licenses/${pkgname}/License.html } # vim:set ts=2 sw=2 et: Added: fix-includes.patch =================================================================== --- fix-includes.patch (rev 0) +++ fix-includes.patch 2020-10-26 07:31:27 UTC (rev 733831) @@ -0,0 +1,37 @@ +diff --git a/OgreMain/include/Threading/OgreDefaultWorkQueueStandard.h b/OgreMain/include/Threading/OgreDefaultWorkQueueStandard.h +index 89184c450..9a606231d 100644 +--- a/OgreMain/include/Threading/OgreDefaultWorkQueueStandard.h ++++ b/OgreMain/include/Threading/OgreDefaultWorkQueueStandard.h +@@ -27,6 +27,7 @@ THE SOFTWARE + #define __OgreDefaultWorkQueueStandard_H__ + + #include "../OgreWorkQueue.h" ++#include "ogrestd/vector.h" + + namespace Ogre + { +diff --git a/OgreMain/src/OgrePlatformInformation.cpp b/OgreMain/src/OgrePlatformInformation.cpp +index f4a8462d2..d6b00d120 100644 +--- a/OgreMain/src/OgrePlatformInformation.cpp ++++ b/OgreMain/src/OgrePlatformInformation.cpp +@@ -44,7 +44,7 @@ THE SOFTWARE. + #if OGRE_PLATFORM == OGRE_PLATFORM_ANDROID + #include <linux/sysctl.h> + #else +- #include <sys/sysctl.h> ++ #include <linux/sysctl.h> + #endif + #endif + +diff --git a/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Terra.cpp b/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Terra.cpp +index f39b4232e..9ae3039b0 100644 +--- a/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Terra.cpp ++++ b/Samples/2.0/Tutorials/Tutorial_Terrain/src/Terra/Terra.cpp +@@ -17,6 +17,7 @@ + #include "OgreDescriptorSetTexture.h" + #include "OgreHlmsManager.h" + #include "OgreRoot.h" ++#include "OgreHlmsDatablock.h" + + namespace Ogre + {
