It's working now

5 files changed, 79 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2c513670202..cf0fc1d7c518 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = caelum
 	pkgdesc = Library for OGRE targeted to help create nice-looking atmospheric effects.
 	pkgver = 0.6.1
-	pkgrel = 3
+	pkgrel = 4
 	url = http://www.ogre3d.org/tikiwiki/Caelum
 	arch = i686
 	arch = x86_64
@@ -13,13 +13,11 @@ pkgbase = caelum
 	depends = boost
 	provides = caelum
 	source = http://caelum.googlecode.com/files/caelum-0.6.1.zip
-	source = caelumplugin.patch
-	source = libname.patch
 	source = caelum-ogre-1.9.patch
-	sha512sums = e1f5a8d3992c7e45a5e70febdb962935c0fb31e8d84c4a6576f3aa757d15678ddca2f24fb9888a6806cbcfb4171a9c10e97714d7e7154a5fb98d5ac4078ddb98
-	sha512sums = cc446e97eceef568e23ef15cbd32b183b5bb54e859ba558b1703c8c668fbc92f3bb904ffe95fa604d77937e653c96c2b80234d77dec5977fdc3656442a09f266
-	sha512sums = c8e368ee203273e8cbfc7b8aa4b65e37e2a58275292bf061ccc15428f54f7da68e7de5d183626e008dd3a92fdd401ccb231d1c5ab98434878871b1ec453a2ba0
-	sha512sums = SKIP
+	source = caelumplugin.patch
+	sha512sums = d1c6135f88491c3d45211de1652c0b11d8de30dbba8edeb440f52e35964be48b3cf45cfc4cfa926642b4d6e43751e4e449524046af21a2c3d1b20ae3576585f1
+	sha512sums = 3df2935c9191a7bf6a923edf09461379ee6a69370baba6b526e82d577821dafe28d3cc3ccaa949447ec32c625845bf39bebea076866530356ed4b712689b3c10
+	sha512sums = b4306ad8402ed9e2619c77c671f62b89f6ce105109b10573abb0a1465d505938312561d46eda5ec3620435b6388a1476eb317c38e7d8aa3248e51b341645ed3e
 
 pkgname = caelum
 
diff --git a/PKGBUILD b/PKGBUILD
index a03ec7976414..83a666a1330e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=caelum
 pkgver=0.6.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Library for OGRE targeted to help create nice-looking atmospheric effects."
 arch=('i686' 'x86_64')
 url="http://www.ogre3d.org/tikiwiki/Caelum"
@@ -13,17 +13,17 @@ depends=('ogre' 'cegui' 'doxygen' 'boost')
 makedepends=('cmake')
 provides=('caelum')
 license=('LGPL')
-source=(http://caelum.googlecode.com/files/caelum-${pkgver}.zip caelumplugin.patch libname.patch caelum-ogre-1.9.patch)
-sha512sums=('e1f5a8d3992c7e45a5e70febdb962935c0fb31e8d84c4a6576f3aa757d15678ddca2f24fb9888a6806cbcfb4171a9c10e97714d7e7154a5fb98d5ac4078ddb98'
-            'cc446e97eceef568e23ef15cbd32b183b5bb54e859ba558b1703c8c668fbc92f3bb904ffe95fa604d77937e653c96c2b80234d77dec5977fdc3656442a09f266'
-            'c8e368ee203273e8cbfc7b8aa4b65e37e2a58275292bf061ccc15428f54f7da68e7de5d183626e008dd3a92fdd401ccb231d1c5ab98434878871b1ec453a2ba0'
-            'SKIP')
+source=("http://caelum.googlecode.com/files/caelum-${pkgver}.zip"
+        "caelum-ogre-1.9.patch"
+        "caelumplugin.patch")
+sha512sums=('d1c6135f88491c3d45211de1652c0b11d8de30dbba8edeb440f52e35964be48b3cf45cfc4cfa926642b4d6e43751e4e449524046af21a2c3d1b20ae3576585f1'
+            '3df2935c9191a7bf6a923edf09461379ee6a69370baba6b526e82d577821dafe28d3cc3ccaa949447ec32c625845bf39bebea076866530356ed4b712689b3c10'
+            'b4306ad8402ed9e2619c77c671f62b89f6ce105109b10573abb0a1465d505938312561d46eda5ec3620435b6388a1476eb317c38e7d8aa3248e51b341645ed3e')
 
 build() {
   cd ${srcdir}/caelum-${pkgver}
-  patch -p0 < ${srcdir}/caelumplugin.patch main/src/CaelumPlugin.cpp
-  patch -p0 < ${srcdir}/libname.patch
   patch -p0 < ${srcdir}/caelum-ogre-1.9.patch
+  patch -p0 < ${srcdir}/caelumplugin.patch
 
   # get a clean build dir
   [[ -d build ]] && rm -rf build
diff --git a/caelum-ogre-1.9.patch b/caelum-ogre-1.9.patch
index ec452eeefc2f..900e6b08fe28 100644
--- a/caelum-ogre-1.9.patch
+++ b/caelum-ogre-1.9.patch
@@ -1,5 +1,5 @@
---- main/include/CaelumPrerequisites.h	Fri Sep 19 17:39:48 2014 +0300
-+++ main/include/CaelumPrerequisites.h	Thu Nov 06 13:02:20 2014 +0100
+--- main/include/CaelumPrerequisites.h
++++ main/include/CaelumPrerequisites.h
 @@ -52,7 +52,9 @@
 
  // By default only compile type descriptors for scripting.
@@ -23,8 +23,8 @@
      #if !(CAELUM_TYPE_DESCRIPTORS)
          #error "Caelum script support also requires type descriptors."
 
---- main/src/CaelumPlugin.cpp	Fri Sep 19 17:39:48 2014 +0300
-+++ main/src/CaelumPlugin.cpp	Thu Nov 06 13:02:20 2014 +0100
+--- main/src/CaelumPlugin.cpp
++++ main/src/CaelumPlugin.cpp
 @@ -134,7 +134,9 @@
          assert (this->isInstalled () && "Must install CaelumPlugin before loading scripts");
 
@@ -37,8 +37,8 @@
  #else
          Ogre::ResourcePtr res = getPropScriptResourceManager ()->getByName (objectName);
 
---- main/src/CaelumScriptTranslator.cpp	Fri Sep 19 17:39:48 2014 +0300
-+++ main/src/CaelumScriptTranslator.cpp	Thu Nov 06 13:02:20 2014 +0100
+--- main/src/CaelumScriptTranslator.cpp
++++ main/src/CaelumScriptTranslator.cpp
 @@ -422,7 +422,11 @@
              //LogManager::getSingleton ().logMessage (
              //        "Caelum: Saved " + objNode->cls + " name " + objNode->name + " as a resource");
@@ -51,3 +51,30 @@
              resource->_notifyOrigin (objNode->file);
              return;
          }
+
+--- main/src/GroundFog.cpp
++++ main/src/GroundFog.cpp
+@@ -53,8 +53,8 @@
+ 		mDomeNode->attachObject (mDomeEntity.get());
+ 		
+ 		// Initialize default fog parameters
+-		mDensity = 0.1;
+-		mVerticalDecay = 0.2;
++		mDensity = 0.1f;
++		mVerticalDecay = 0.2f;
+ 		mGroundLevel = 5;
+ 		mFogColour = Ogre::ColourValue::Black;
+ 
+@@ -78,7 +78,11 @@
+ 		Ogre::MaterialManager *matManager = Ogre::MaterialManager::getSingletonPtr();
+ 		Ogre::MaterialManager::ResourceMapIterator matIt = matManager->getResourceIterator();
+ 		while (matIt.hasMoreElements()) {
+-			Ogre::MaterialPtr mat = matIt.getNext();
++#if (OGRE_VERSION < ((1 << 16) | (9 << 8) | 0))
++ 			Ogre::MaterialPtr mat = matIt.getNext();
++#else
++			Ogre::MaterialPtr mat = matIt.getNext().staticCast<Ogre::Material>();
++#endif
+ 			Ogre::Material::TechniqueIterator techIt = mat->getTechniqueIterator();
+ 			while (techIt.hasMoreElements()) {
+ 				Ogre::Technique *tech = techIt.getNext();
diff --git a/caelumplugin.patch b/caelumplugin.patch
index ceed0ff753af..385fb1a2f643 100644
--- a/caelumplugin.patch
+++ b/caelumplugin.patch
@@ -1,21 +1,33 @@
-24c24,31
-< template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;
----
-> // ms_Singleton was renamed to msSingleton in ogre 1.8
-> #if OGRE_VERSION_MINOR < 8
-> 	#define SINGLETON_MEMBER ms_Singleton
-> #else
-> 	#define SINGLETON_MEMBER msSingleton
-> #endif
->
-> template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::SINGLETON_MEMBER = 0;
-29c36
-<         return ms_Singleton;
----
->         return SINGLETON_MEMBER;
-33,34c40,41
-<         assert (ms_Singleton);
-<         return *ms_Singleton;
----
->         assert (SINGLETON_MEMBER);
->         return *SINGLETON_MEMBER;
+--- main/src/CaelumPlugin.cpp
++++ main/src/CaelumPlugin.cpp
+
+@@ -21,17 +21,24 @@
+ #include "CaelumPrecompiled.h"
+ #include "CaelumPlugin.h"
+ 
+-template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;
++// ms_Singleton was renamed to msSingleton in ogre 1.8
++#if OGRE_VERSION_MINOR < 8
++	#define SINGLETON_MEMBER ms_Singleton
++#else
++	#define SINGLETON_MEMBER msSingleton
++#endif
++
++template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::SINGLETON_MEMBER = 0;
+ 
+ namespace Caelum
+ {
+ 	CaelumPlugin* CaelumPlugin::getSingletonPtr () {
+-        return ms_Singleton;
++        return SINGLETON_MEMBER;
+     }
+ 
+     CaelumPlugin& CaelumPlugin::getSingleton () {  
+-        assert (ms_Singleton);
+-        return *ms_Singleton;  
++        assert (SINGLETON_MEMBER);
++        return *SINGLETON_MEMBER;
+     }
+ 
+     extern "C" void CAELUM_EXPORT dllStartPlugin () {
+
diff --git a/libname.patch b/libname.patch
deleted file mode 100644
index 8eae8f946177..000000000000
--- a/libname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** CMakeLists.txt.old	2012-01-05 16:05:50.000000000 +0100
---- CMakeLists.txt	2013-01-13 14:57:23.000000000 +0100
-***************
-*** 81,86 ****
---- 81,87 ----
-  SET(includedir "\${prefix}/include")

-  SET(PACKAGE_NAME "Caelum")

-  SET(PACKAGE_VERSION "${LIB_VERSION}")

-+ SET(LIBNAME "Caelum")

-

-  # configuration of the config.h and PkgConfig

-  CONFIGURE_FILE(