[arch-commits] Commit in ogre/trunk (PKGBUILD ogre.install)

[Sven-Hendrik Haase]

    Date: Monday, April 27, 2020 @ 20:40:50
  Author: svenstaro
Revision: 621938

upgpkg: ogre 2.1-1

Modified:
  ogre/trunk/PKGBUILD
  ogre/trunk/ogre.install

--------------+
 PKGBUILD     |   65 ++++++++++++++++++++++++++++++++++-----------------------
 ogre.install |    2 -
 2 files changed, 40 insertions(+), 27 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-27 20:30:49 UTC (rev 621937)
+++ PKGBUILD	2020-04-27 20:40:50 UTC (rev 621938)
@@ -1,51 +1,64 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
 pkgname=ogre
-pkgver=1.12.6
+pkgver=2.1
 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' 'openexr' 'pugixml'
-         'nvidia-cg-toolkit' 'zziplib' 'sdl2' 'glu' 'tinyxml')
-makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'python' 'swig' 'systemd' 'git' 'mono')
+depends=('freeimage' 'freetype2' 'libxaw' 'libxrandr' 'openexr' 'rapidjson'
+         'nvidia-cg-toolkit' 'zziplib' 'sdl2' 'glu' 'tinyxml' 'zlib')
+makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'python' 'ninja' 'cppunit')
 install=ogre.install
-replaces=('ogre-docs')
-source=("https://github.com/OGRECave/ogre/archive/v${pkgver}.tar.gz"
-        "git+https://github.com/ocornut/imgui.git#commit=688cf868ea83db6c2958dd6bf7a20d471d00940b")
-optdepends=('cppunit: unit testing'
-            'python: python bindings')
-sha512sums=('2d62f86a94b5b066abc53ecfb7d98381fd684c180c630b99b58cf486069d2407c6c9e2c35f2baf315ba9bd887d6f507c8cc6663a50c97c4ee63f454e33e0450d'
-            'SKIP')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre-next/archive/${pkgver}.tar.gz")
+optdepends=('python: python bindings')
+sha512sums=('9802e3bf20ddb09453524d1ddafa7a2083dfd0e609563f478fe31b087dd06d463f69800b9c6485cb3db92d98f282ef67ace3e272c1ef531e982ea9f719617fb5')
 
 prepare() {
-  mkdir ogre-${pkgver}/build
-
-  cp -r "${srcdir}"/imgui ogre-${pkgver}/Components/Overlay/src/
+  mkdir ogre-next-${pkgver}/build
 }
 
 build() {
-  cd ogre-${pkgver}/build
+  cd ogre-next-${pkgver}/build
 
   cmake .. \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DOGRE_BUILD_DEPENDENCIES=FALSE \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DOGRE_BUILD_PLUGIN_FREEIMAGE=TRUE \
-    -DOGRE_BUILD_PLUGIN_EXRCODEC=TRUE
+    -DOGRE_CONFIG_ENABLE_JSON=TRUE \
+    -DOGRE_CONFIG_THREADS=1 \
+    -DOGRE_CONFIG_THREAD_PROVIDER="std" \
+    -DOGRE_BUILD_COMPONENT_PLANAR_REFLECTIONS=ON \
+    -DOGRE_USE_BOOST=TRUE \
+    -DOGRE_BUILD_TESTS=TRUE \
+    -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE
 
-  make
-  make OgreDoc
+  ninja
+  ninja 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}/build
+
+  # Upstream pls
+  # ninja test
+}
+
 package() {
+  cd ogre-next-${pkgver}/build
 
-  cd ogre-${pkgver}/build
+  DESTDIR="${pkgdir}" ninja install
 
-  make DESTDIR="${pkgdir}" install
-
-  mv "${pkgdir}"/usr/bin/SampleBrowser "${pkgdir}"/usr/bin/OgreSampleBrowser
-  install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+  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:

Modified: ogre.install
===================================================================
--- ogre.install	2020-04-27 20:30:49 UTC (rev 621937)
+++ ogre.install	2020-04-27 20:40:50 UTC (rev 621938)
@@ -1,3 +1,3 @@
 post_install() {
-    echo "To view the OGRE samples just run OgreSampleBrowser"
+    echo "Ogre samples are in /opt/ogre/samples"
 }