[arch-commits] Commit in (6 files)

Sven-Hendrik Haase svenstaro at gemini.archlinux.org
Tue Aug 17 01:21:21 UTC 2021


    Date: Tuesday, August 17, 2021 @ 01:21:20
  Author: svenstaro
Revision: 1001103

Add ogre-next as opposed to classic ogre

Added:
  ogre-next/
  ogre-next/repos/
  ogre-next/trunk/
  ogre-next/trunk/PKGBUILD
  ogre-next/trunk/fix-includes.patch
  ogre-next/trunk/ogre-next.install

--------------------+
 PKGBUILD           |   69 +++++++++++++++++++++++++++++++++++++++++++++++++++
 fix-includes.patch |   37 +++++++++++++++++++++++++++
 ogre-next.install  |    3 ++
 3 files changed, 109 insertions(+)

Added: ogre-next/trunk/PKGBUILD
===================================================================
--- ogre-next/trunk/PKGBUILD	                        (rev 0)
+++ ogre-next/trunk/PKGBUILD	2021-08-17 01:21:20 UTC (rev 1001103)
@@ -0,0 +1,69 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+pkgname=ogre-next
+pkgver=2.2.4
+pkgrel=1
+pkgdesc='Scene-oriented, flexible 3D engine written in C++'
+arch=('x86_64')
+url='http://www.ogre3d.org'
+license=('custom:MIT')
+depends=('freeimage' 'freetype2' 'libxaw' 'libxrandr' 'rapidjson'
+         'zziplib' 'sdl2' 'glu' 'tinyxml' 'zlib')
+makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'python' 'ninja' 'cppunit')
+conflicts=('ogre')
+install=ogre-next.install
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre-next/archive/v${pkgver}.tar.gz"
+        fix-includes.patch)
+optdepends=('python: python bindings')
+sha512sums=('c16dac0c9e02efd45f6c3189e0600b739e551d78f4794160701377a9c1b4e24b4868a774a35c80d7f2cade44abe04128bc46949ca497a44867b55f378ede028b'
+            'a8c70b4ee692cded9c97a0101e59bede0f4c0c2445d075b15bb20e0a3cf1e0c9af3cedde2e3b8524d2430e7b338869eb9d41d5853e9cf1510688a9ddf4f4b19f')
+
+prepare() {
+  cd ogre-next-${pkgver}
+  patch -Np1 -i "${srcdir}"/fix-includes.patch
+}
+
+build() {
+  cd ogre-next-${pkgver}
+
+  cmake \
+    -Bbuild \
+    -GNinja \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOGRE_CONFIG_ENABLE_JSON=ON \
+    -DOGRE_CONFIG_THREADS=1 \
+    -DOGRE_CONFIG_THREAD_PROVIDER="std" \
+    -DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=ON \
+    -DOGRE_USE_BOOST=ON \
+    -DOGRE_BUILD_TESTS=ON \
+    -DOGRE_INSTALL_SAMPLES_SOURCE=ON
+
+  ninja -C build
+  ninja -C build OgreDoc
+  # All of these are broken
+  # -DOGRE_BUILD_COMPONENT_TERRAIN=ON \
+  # -DOGRE_BUILD_COMPONENT_VOLUME=ON \
+  # -DOGRE_BUILD_COMPONENT_PAGING=ON \
+  # -DOGRE_BUILD_COMPONENT_PROPERTY=ON \
+  # -DOGRE_BUILD_COMPONENT_RTSHADERSYSTEM=ON \
+  # -DOGRE_BUILD_COMPONENT_SCENE_FORMAT=ON \
+}
+
+check() {
+  cd ogre-next-${pkgver}
+
+  # Upstream pls
+  # ninja -C build test
+}
+
+package() {
+  cd ogre-next-${pkgver}
+
+  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
+}
+
+# vim:set ts=2 sw=2 et:

Added: ogre-next/trunk/fix-includes.patch
===================================================================
--- ogre-next/trunk/fix-includes.patch	                        (rev 0)
+++ ogre-next/trunk/fix-includes.patch	2021-08-17 01:21:20 UTC (rev 1001103)
@@ -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
+ {

Added: ogre-next/trunk/ogre-next.install
===================================================================
--- ogre-next/trunk/ogre-next.install	                        (rev 0)
+++ ogre-next/trunk/ogre-next.install	2021-08-17 01:21:20 UTC (rev 1001103)
@@ -0,0 +1,3 @@
+post_install() {
+    echo "Ogre samples are in /opt/ogre/samples"
+}



More information about the arch-commits mailing list