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

[Sven-Hendrik Haase]

    Date: Tuesday, August 17, 2021 @ 01:21:32
  Author: svenstaro
Revision: 1001104

upgpkg: ogre 13.0.0-1

Modified:
  ogre/trunk/PKGBUILD

----------+
 PKGBUILD |   48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-17 01:21:20 UTC (rev 1001103)
+++ PKGBUILD	2021-08-17 01:21:32 UTC (rev 1001104)
@@ -1,54 +1,54 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
 pkgname=ogre
-pkgver=2.2.4
-pkgrel=2
+pkgver=13.0.0
+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'
-         'nvidia-cg-toolkit' 'zziplib' 'sdl2' 'glu' 'tinyxml' 'zlib')
+         '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/v${pkgver}.tar.gz"
-        fix-includes.patch)
+source=("$pkgname-$pkgver.tar.gz::https://github.com/OGRECave/ogre/archive/v${pkgver}.tar.gz"
+        https://github.com/OGRECave/ogre/commit/74c5ce3da1054b88a19f8e9f79d4492ec271ea1f.patch)
 optdepends=('python: python bindings')
-sha512sums=('c16dac0c9e02efd45f6c3189e0600b739e551d78f4794160701377a9c1b4e24b4868a774a35c80d7f2cade44abe04128bc46949ca497a44867b55f378ede028b'
-            'a8c70b4ee692cded9c97a0101e59bede0f4c0c2445d075b15bb20e0a3cf1e0c9af3cedde2e3b8524d2430e7b338869eb9d41d5853e9cf1510688a9ddf4f4b19f')
+sha512sums=('b137322251b6d4798b3b2bef8f2a1e81bbe7839fd085425f66ce55dea52f93562dab8ed32ea9f19a431c65783a00a202acea75c1ef207d30d0101ae05166c605'
+            '8b0b3edd71a9322ef62fa34b5d1362e3a5fa58dd2db4233ae26b299d2ddad2b872d59ba0f900fb8f43f757260988826b7ea9eb04f4fd50f603272e6aa89a768b')
 
 prepare() {
-  cd ogre-next-${pkgver}
-  patch -Np1 -i "${srcdir}"/fix-includes.patch
+  cd ogre-${pkgver}
+  patch -Np1 -i "${srcdir}"/74c5ce3da1054b88a19f8e9f79d4492ec271ea1f.patch
 }
 
 build() {
-  cd ogre-next-${pkgver}
+  cd ogre-${pkgver}
 
   cmake \
     -Bbuild \
     -GNinja \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DOGRE_CONFIG_ENABLE_JSON=TRUE \
+    -DOGRE_CONFIG_ENABLE_JSON=ON \
     -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
+    -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 \
+    -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}
+  cd ogre-${pkgver}
 
   # Upstream pls
   # ninja -C build test
@@ -55,14 +55,14 @@
 }
 
 package() {
-  cd ogre-next-${pkgver}
+  cd ogre-${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/SampleBrowser "${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 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
 
 # vim:set ts=2 sw=2 et: