upgraded to 1.9.1

4 files changed, 60 insertions, 64 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 668a91e82046..f8f29ed5b923 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,39 @@
 pkgbase = ogre-1.9
 	pkgdesc = Scene-oriented, flexible 3D engine written in C++
-	pkgver = 1.9.0
-	pkgrel = 17
+	pkgver = 1.9.1
+	pkgrel = 1
 	url = http://www.ogre3d.org
-	install = ogre-1.9.install
-	arch = i686
 	arch = x86_64
 	license = custom:MIT
-	makedepends = boost
 	makedepends = cmake
 	makedepends = doxygen
 	makedepends = graphviz
 	makedepends = ttf-dejavu
 	makedepends = mesa
-	makedepends = mercurial
-	depends = boost-libs
+	makedepends = python
+	makedepends = swig
+	makedepends = systemd
 	depends = freeimage
 	depends = freetype2
 	depends = libxaw
 	depends = libxrandr
+	depends = openexr
 	depends = nvidia-cg-toolkit
 	depends = zziplib
-	depends = ois
+	depends = sdl2
 	depends = glu
 	depends = tinyxml
-	source = hg+http://bitbucket.org/sinbad/ogre#tag=v1-9-0
-	source = ogre-template-fix.patch::https://bitbucket.org/sinbad/ogre/commits/a24ac4afbbb9dc5ff49a61634af50da11ba8fb97/raw/
-	source = ogre-cmake30.patch::https://bitbucket.org/sinbad/ogre/commits/d84bce645d3dd439188d3d29d8da51c51765a085/raw/
-	md5sums = SKIP
-	md5sums = 3debee4514a33a0a642370aecdc41975
-	md5sums = 116fb8009c8d4b499f9a885052cc0ea6
+	provides = ogre
+	provides = ogre-docs
+	source = https://github.com/OGRECave/ogre/archive/v1.9.1.tar.gz
+	sha512sums = 69e1ea27ef3126ac0e09be9c1f8a9fc762630cd236ce6c3352a550ad977925387b1dfb9d124cc27bb8ac5231e036155451db988a26de6fb2df6da6f7d961115d
 
 pkgname = ogre-1.9
 	optdepends = cppunit: unit testing
-	optdepends = intel-tbb: better threading support
-	optdepends = poco: portability
-	optdepends = boost: for developing using ogre
+	optdepends = python: python bindings
 	optdepends = ogre-docs: documentation
 
+pkgname = ogre-docs-1.9
+	pkgdesc = Documentation for ogre
+	depends = 
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..57621ac85b07
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+# Exclude all files
+/*
diff --git a/PKGBUILD b/PKGBUILD
index c09b9deaca43..6ba958f34861 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,69 +1,68 @@
-# $Id$
-# Maintainer: Firas Zaidan <firas@zaidan.de>
+# Maintainer: acxz <akashpatel2008 at yahoo dot com>
+# Contributor: Firas Zaidan <firas@zaidan.de>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
-_dir="OGRE-1.9"
-pkgname=('ogre-1.9')
-pkgver=1.9.0
-pkgrel=17
+pkgbase=('ogre-1.9')
+pkgname=('ogre-1.9' 'ogre-docs-1.9')
+pkgver=1.9.1
+pkgrel=1
 pkgdesc='Scene-oriented, flexible 3D engine written in C++'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url='http://www.ogre3d.org'
 license=('custom:MIT')
-depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr'
-         'nvidia-cg-toolkit' 'zziplib' 'ois' 'glu' 'tinyxml')
-makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial')
-install=ogre-1.9.install
-source=("hg+http://bitbucket.org/sinbad/ogre#tag=v${pkgver//./-}"
-        ogre-template-fix.patch::https://bitbucket.org/sinbad/ogre/commits/a24ac4afbbb9dc5ff49a61634af50da11ba8fb97/raw/
-        ogre-cmake30.patch::https://bitbucket.org/sinbad/ogre/commits/d84bce645d3dd439188d3d29d8da51c51765a085/raw/)
-md5sums=('SKIP'
-         '3debee4514a33a0a642370aecdc41975'
-         '116fb8009c8d4b499f9a885052cc0ea6')
+depends=('freeimage' 'freetype2' 'libxaw' 'libxrandr' 'openexr'
+         'nvidia-cg-toolkit' 'zziplib' 'sdl2' 'glu' 'tinyxml')
+makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'python' 'swig' 'systemd')
+provides=('ogre' 'ogre-docs')
+source=("https://github.com/OGRECave/ogre/archive/v${pkgver}.tar.gz")
+sha512sums=('69e1ea27ef3126ac0e09be9c1f8a9fc762630cd236ce6c3352a550ad977925387b1dfb9d124cc27bb8ac5231e036155451db988a26de6fb2df6da6f7d961115d')
 
 prepare() {
-  cd ogre
-
-  patch -Np1 < $srcdir/ogre-template-fix.patch
-  patch -Np1 < $srcdir/ogre-cmake30.patch
+  mkdir -p ogre-${pkgver}/build
 }
 
 build() {
-  cd ogre
-
-  [[ -d build ]] && rm -rf build
-  mkdir build && cd build
-
-  # Silence warnings about deprecated declarations
-  CXXFLAGS+=' -Wno-deprecated-declarations'
+  cd ogre-${pkgver}/build
 
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/opt/${_dir} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOGRE_BUILD_DEPENDENCIES=FALSE \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DOGRE_BUILD_PLUGIN_FREEIMAGE=TRUE \
+    -DOGRE_BUILD_PLUGIN_EXRCODEC=TRUE \
     -DOGRE_INSTALL_SAMPLES=TRUE \
-    -DOGRE_INSTALL_DOCS=FLASE \
-    -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
-    -DCMAKE_BUILD_TYPE=Release
-
-  make
+    -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE
 
+  make -j4
   make OgreDoc
 }
 
-package() {
+package_ogre-1.9() {
   optdepends=('cppunit: unit testing'
-              'intel-tbb: better threading support'
-              'poco: portability'
-              'boost: for developing using ogre'
+              'python: python bindings'
               'ogre-docs: documentation')
 
-  cd ogre/build
+  cd ogre-${pkgver}/build
 
   make DESTDIR=${pkgdir} install
 
   install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
 
-  # Create symlinks in /usr/lib
-  mkdir -p ${pkgdir}/usr/lib/OGRE/Samples
-  find ${pkgdir}/opt/${_dir}/lib -name "*so.${pkgver}" -exec sh -c 'ln -s `echo "$1" | sed -e "s/^.*opt/\/opt/g"` `echo "$1" | sed -e "s/opt\/OGRE-1.9/usr/g"`' sh {} \;
+  # move docs out of this package
+  mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
 }
 
-# vim:set ts=2 sw=2 et:
+package_ogre-docs-1.9() {
+  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
+}
diff --git a/ogre-1.9.install b/ogre-1.9.install
deleted file mode 100644
index b22a1b14fb56..000000000000
--- a/ogre-1.9.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-    echo "To view the OGRE samples just run OgreSampleBrowser or launch"
-    echo "it directly in /opt/OGRE-1.9/samples/"
-}