libre/ogre: cleanup and rebuild

2 files changed, 36 insertions, 71 deletions

diff --git a/libre/ogre/PKGBUILD b/libre/ogre/PKGBUILD
index a662e0fc0..17d34c389 100644
--- a/libre/ogre/PKGBUILD
+++ b/libre/ogre/PKGBUILD
@@ -1,98 +1,63 @@
+# $Id$
 # Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info>
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: Márcio Silva <coadde@hyperbola.info>
+
+# parabola changes and rationale:
+#  - not building ogre-docs
+#  - removed nonfree samples and tests
+#  - removed nonfree files and references
 
 pkgbase=ogre
 pkgname=('ogre')
 pkgver=1.10.11
-pkgrel=2.parabola1
+pkgrel=3.parabola1
 pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files'
-arch=('i686' 'x86_64' 'armv7h')
+arch=('x86_64' 'i686' 'armv7h')
 url='http://www.ogre3d.org'
 license=('custom:MIT')
 depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr'
          'zziplib' 'sdl2' 'glu' 'tinyxml')
 makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial' 'python' 'swig' 'systemd')
-mksource=("https://github.com/OGRECave/ogre/archive/v${pkgver}.tar.gz")
-source=(https://repo.parabola.nu/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz
+install=ogre.install
+source=("https://github.com/OGRECave/ogre/archive/v${pkgver}.tar.gz"
         libre.patch)
-mksha512sums=('2dfedd6f0a0de1a8c687c001439138b233200ca11e5c9940debf43d8a0380ca6472e0b5f4d599f0e22ca2049d0a5d34066ef41b6bc4912130694fa5d851fc900')
-sha512sums=('fee28931a13f5058289a45d5477bd56243e9606cdda80b2a38c387d2603983c4577c1c92101690a7291a09b3753e84aca491daf3ebe1f387915d0aff48083686'
+sha512sums=('2dfedd6f0a0de1a8c687c001439138b233200ca11e5c9940debf43d8a0380ca6472e0b5f4d599f0e22ca2049d0a5d34066ef41b6bc4912130694fa5d851fc900'
             '81e3997c5bad64d8bae511222d8ab3766699c0923e9303640925525908ee2c19dfb37549cc02bc3e172ea248c0c01c0a58bdcc20d545980bf93b15e02ceb514c')
 
-mksource() {
-  cd ${pkgbase}-${pkgver}
+prepare() {
+  cd ogre-${pkgver}
 
   # remove nonfree files
-#  rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h
   rm -v RenderSystems/GL/include/GL/gl.h
   rm -rv Samples/Media/materials/textures/nvidia
   rm -v Samples/Media/packs/chiropteraDM.{pk3,txt}
-}
-
-prepare() {
-  cd ${pkgbase}-${pkgver}
 
   # remove nonfree references
   rm -v CMake/Templates/quakemap.cfg.in
   patch -Np1 -i $srcdir/libre.patch
-
-  # add symlinks to point to mesa header files
-#  cd RenderSystems/GL/include/GL
-#  ln -sv /usr/include/GL/gl.h gl.h
-#  ln -sv /usr/include/GL/glext.h glext.h
-#  ln -sv /usr/include/GL/wglext.h wglext.h
-#  ln -sv /usr/include/GL/glxtokens.h glxtokens.h
-#  ln -sv /usr/include/GL/glxext.h glxext.h
 }
 
 build() {
-  cd ${pkgbase}-${pkgver}
+  cd ogre-${pkgver}
 
-  # get a clean build dir
-  [[ -d build ]] && rm -vrf build
-  mkdir -v build && cd build
+  [[ -d build ]] && rm -rf build
+  mkdir build && cd build
 
-  # SAMPLES, SAMPLES_SOURCE and TESTS are nonfree
   cmake .. \
-    -DCMAKE_BUILD_TYPE=Release\
-    -DCMAKE_INSTALL_PREFIX=/usr\
-    -DCPACK_PACKAGE_DESCRIPTION_SUMMARY='Libre 3D Graphics Engine'\
-    -D${pkgbase^^}_BUILD_COMPONENT_PAGING=TRUE\
-    -D${pkgbase^^}_BUILD_COMPONENT_PROPERTY=TRUE\
-    -D${pkgbase^^}_BUILD_COMPONENT_PYTHON=TRUE \
-    -D${pkgbase^^}_BUILD_COMPONENT_RTSHADERSYSTEM=TRUE\
-    -D${pkgbase^^}_BUILD_COMPONENT_TERRAIN=TRUE\
-    -D${pkgbase^^}_BUILD_DEPENDENCIES=FALSE \
-    -D${pkgbase^^}_BUILD_PLATFORM_NACL=FALSE\
-    -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\
-    -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\
-    -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\
-    -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\
-    -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=FALSE\
-    -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\
-    -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\
-    -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_CORE_SHADERS=TRUE\
-    -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_EXT_SHADERS=TRUE\
-    -D${pkgbase^^}_BUILD_SAMPLES=FALSE\
-    -D${pkgbase^^}_BUILD_TESTS=FALSE\
-    -D${pkgbase^^}_BUILD_TOOLS=TRUE\
-    -D${pkgbase^^}_CONFIG_ENABLE_DDS=TRUE\
-    -D${pkgbase^^}_CONFIG_ENABLE_FREEIMAGE=TRUE\
-    -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=TRUE\
-    -D${pkgbase^^}_CONFIG_ENABLE_PVRTC=TRUE\
-    -D${pkgbase^^}_CONFIG_ENABLE_VIEWPORT_ORIENTATIONMODE=TRUE\
-    -D${pkgbase^^}_CONFIG_ENABLE_ZIP=TRUE\
-    -D${pkgbase^^}_CONFIG_NEW_COMPILERS=TRUE\
-    -D${pkgbase^^}_CONFIG_THREAD_PROVIDER=boost\
-    -D${pkgbase^^}_INSTALL_DOCS=FALSE\
-    -D${pkgbase^^}_INSTALL_SAMPLES=FALSE\
-    -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=FALSE\
-    -D${pkgbase^^}_INSTALL_TOOLS=TRUE\
-    -D${pkgbase^^}_LIB_DIRECTORY=lib\
-    -D${pkgbase^^}_PROFILING=TRUE\
-    -D${pkgbase^^}_USE_BOOST=TRUE
-#  make V=0
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOGRE_INSTALL_SAMPLES=FALSE\
+    -DOGRE_INSTALL_DOCS=FALSE\
+    -DOGRE_INSTALL_SAMPLES_SOURCE=FALSE\
+    -DOGRE_BUILD_DEPENDENCIES=FALSE \
+    -DOGRE_BUILD_COMPONENT_PYTHON=TRUE \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DOGRE_BUILD_RENDERSYSTEM_GL=FALSE\
+    -DOGRE_BUILD_RENDERSYSTEM_GLES=FALSE\
+    -DOGRE_BUILD_RENDERSYSTEM_GLES2=FALSE\
+    -DOGRE_BUILD_SAMPLES=FALSE\
+    -DOGRE_BUILD_TESTS=FALSE
+
   make
 }
 
@@ -103,15 +68,12 @@ package_ogre() {
               'python: python bindings'
               'boost: for developing using ogre'
               'ogre-docs: documentation')
-  conflicts=(${pkgbase}-libre)
-  replaces=(${pkgbase}-libre)
 
-  cd ${pkgbase}-${pkgver}/build
+  cd ogre-${pkgver}/build
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR=${pkgdir} install
 
-  # install license
-  install -vDm644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -Dm644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/ogre/ogre.install b/libre/ogre/ogre.install
new file mode 100644
index 000000000..c05ad1ed3
--- /dev/null
+++ b/libre/ogre/ogre.install
@@ -0,0 +1,3 @@
+post_install() {
+    echo "To view the OGRE samples just run OgreSampleBrowser"
+}