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

[Sven-Hendrik Haase]

    Date: Saturday, November 9, 2019 @ 14:22:47
  Author: svenstaro
Revision: 524830

upgpkg: ogre 1.12.3-1

Modified:
  ogre/trunk/PKGBUILD

----------+
 PKGBUILD |   46 +++++++++++++++-------------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-09 13:24:21 UTC (rev 524829)
+++ PKGBUILD	2019-11-09 14:22:47 UTC (rev 524830)
@@ -1,8 +1,7 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgbase=ogre
-pkgname=('ogre' 'ogre-docs')
-pkgver=1.12.2
-pkgrel=3
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+pkgname=ogre
+pkgver=1.12.3
+pkgrel=1
 pkgdesc='Scene-oriented, flexible 3D engine written in C++'
 arch=('x86_64')
 url='http://www.ogre3d.org'
@@ -9,13 +8,20 @@
 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')
+makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'python' 'swig' 'systemd' 'git')
 install=ogre.install
-source=("https://github.com/OGRECave/ogre/archive/v${pkgver}.tar.gz")
-sha512sums=('557a9ca85f5ac5a41ff7ef06622723e04b008f3e9dc90d44b13ed05f34b5bf23cf9a1959d94d34a12dc0750eeb3b4550d62ba5102379d1b2825753b2b0a836d7')
+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=('1381b342e763f006952e8b2cf70e129f0e4ac399495450a72b2d9a97f39fd4346897b83e9acaa47611c1d5c8565cc6b5b5f1b516078a8904afa1c9e73188b586'
+            'SKIP')
 
 prepare() {
   mkdir ogre-${pkgver}/build
+
+  cp -r "$srcdir"/imgui ogre-${pkgver}/Components/Overlay/src/
 }
 
 build() {
@@ -32,10 +38,7 @@
   make OgreDoc
 }
 
-package_ogre() {
-  optdepends=('cppunit: unit testing'
-              'python: python bindings'
-              'ogre-docs: documentation')
+package() {
 
   cd ogre-${pkgver}/build
 
@@ -43,25 +46,6 @@
 
   mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/usr/bin/OgreSampleBrowser
   install -Dm644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
-  # move docs out of this package
-  mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
 }
 
-package_ogre-docs() {
-  pkgdesc="Documentation for ogre"
-  depends=()
-
-  cd ogre-${pkgver}/build
-
-  # move docs into this package
-  install -dm755 ${pkgdir}/usr/share/doc
-  mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/
-
-  # symlink for docs
-  install -dm755 ${pkgdir}/usr/share/OGRE/
-  cd ${pkgdir}/usr/share
-  ln -s /usr/share/doc/OGRE/ OGRE/docs
-}
-
 # vim:set ts=2 sw=2 et: