Attachment 670950 Details for Bug 891058 – patch to make ember build on rawhide

[patch] patch to make ember build on rawhide

0001-Fix-build-on-rawhide-add-patch-from-upstream-to-port.patch (text/plain), 10.49 KB, created by Michael S. on 2013-01-01 13:05:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael S.

Created: 2013-01-01 13:05:11 UTC

Size: 10.49 KB

patch

obsolete

>From 2064c4c0ef87965272ff95a7e961222dc4dad110 Mon Sep 17 00:00:00 2001
>From: Michael Scherer <misc@zarb.org>
>Date: Tue, 1 Jan 2013 13:58:03 +0100
>Subject: [PATCH] Fix build on rawhide, add patch from upstream to port on ogre
> 1.8.1
>
>---
> ember-0.6.3-ogre_1.8.1.patch | 217 +++++++++++++++++++++++++++++++++++++++++++
> ember.spec                   |   8 +-
> 2 files changed, 224 insertions(+), 1 deletion(-)
> create mode 100644 ember-0.6.3-ogre_1.8.1.patch
>
>diff --git a/ember-0.6.3-ogre_1.8.1.patch b/ember-0.6.3-ogre_1.8.1.patch
>new file mode 100644
>index 0000000..d44215e
>--- /dev/null
>+++ b/ember-0.6.3-ogre_1.8.1.patch
>@@ -0,0 +1,217 @@
>+diff --git a/configure.ac b/configure.ac
>+index 6698eb4..675b818 100644
>+--- a/configure.ac
>++++ b/configure.ac
>+@@ -280,8 +280,8 @@ Please visit  http://worldforge.org/dev/eng/libraries to get the latest versions
>+ 
>+ 
>+ # Check for OGRE
>+-OGRE_VERSION=1.7.0
>+-OGRE_MAX_VERSION=1.8.0
>++OGRE_VERSION=1.8.0
>++OGRE_MAX_VERSION=1.9.0
>+ PKG_CHECK_MODULES(OGRE, [OGRE >= $OGRE_VERSION OGRE < $OGRE_MAX_VERSION],
>+ 	[
>+ 		CXXFLAGS="$CXXFLAGS $OGRE_CFLAGS"
>+diff --git a/src/components/ogre/EmberOgreFileSystem.cpp b/src/components/ogre/EmberOgreFileSystem.cpp
>+index c44adc7..8aaacce 100644
>+--- a/src/components/ogre/EmberOgreFileSystem.cpp
>++++ b/src/components/ogre/EmberOgreFileSystem.cpp
>+@@ -261,7 +261,7 @@ int _findclose(long id)
>+ 
>+     //-----------------------------------------------------------------------
>+     void FileSystemArchive::findFiles(const String& pattern, bool recursive,
>+-        bool dirs, StringVector* simpleList, FileInfoList* detailList)
>++        bool dirs, StringVector* simpleList, FileInfoList* detailList) const
>+     {
>+         long lHandle, res;
>+         struct _finddata_t tagData;
>+@@ -431,7 +431,7 @@ int _findclose(long id)
>+     }
>+     //-----------------------------------------------------------------------
>+     FileInfoListPtr FileSystemArchive::findFileInfo(const String& pattern,
>+-        bool recursive, bool dirs)
>++        bool recursive, bool dirs) const
>+     {
>+ 		FileInfoListPtr ret(OGRE_NEW_T(FileInfoList, MEMCATEGORY_GENERAL)(), SPFM_DELETE_T);
>+ 
>+diff --git a/src/components/ogre/EmberOgreFileSystem.h b/src/components/ogre/EmberOgreFileSystem.h
>+index 2354f9e..81562a4 100644
>+--- a/src/components/ogre/EmberOgreFileSystem.h
>++++ b/src/components/ogre/EmberOgreFileSystem.h
>+@@ -58,7 +58,7 @@
>+             archive, for file naming
>+         */
>+         void findFiles(const Ogre::String& pattern, bool recursive, bool dirs,
>+-            Ogre::StringVector* simpleList, Ogre::FileInfoList* detailList);
>++            Ogre::StringVector* simpleList, Ogre::FileInfoList* detailList) const;
>+ 
>+     public:
>+         FileSystemArchive(const Ogre::String& name, const Ogre::String& archType );
>+@@ -87,7 +87,7 @@
>+ 
>+         /// @copydoc Archive::findFileInfo
>+         Ogre::FileInfoListPtr findFileInfo(const Ogre::String& pattern, bool recursive = true,
>+-            bool dirs = false);
>++            bool dirs = false) const;
>+ 
>+         /// @copydoc Archive::exists
>+         bool exists(const Ogre::String& filename);
>+diff --git a/src/components/ogre/OgreLogObserver.cpp b/src/components/ogre/OgreLogObserver.cpp
>+index 58076c5..42411f0 100644
>+--- a/src/components/ogre/OgreLogObserver.cpp
>++++ b/src/components/ogre/OgreLogObserver.cpp
>+@@ -28,12 +28,11 @@
>+ 
>+ #include "framework/LoggingInstance.h"
>+ 
>+-
>+ using namespace Ogre;
>+-namespace Ember {
>+-namespace OgreView {
>+-
>+-
>++namespace Ember
>++{
>++namespace OgreView
>++{
>+ 
>+ OgreLogObserver::OgreLogObserver()
>+ {
>+@@ -44,16 +43,15 @@
>+ 
>+ }
>+ 
>+-
>+-
>+-void OgreLogObserver::messageLogged( const String& message, LogMessageLevel lml, bool maskDebug, const String &logName )
>++void OgreLogObserver::messageLogged(const String& message, LogMessageLevel lml, bool maskDebug, const String &logName, bool& skipThisMessage)
>+ {
>+-	static std::string ogre("(Ogre) ");
>+-	//if there's a problem setting material name, log as verbose as these messages are quite common and not necessarily errors since the Model format in many cases overrides the material defined in the mesh
>+-	if (Ogre::StringUtil::startsWith(message, "Can't assign material", false)) {
>+-		lml = Ogre::LML_TRIVIAL;
>+-	}
>+-	switch (lml) {
>++	if (!skipThisMessage) {
>++		static std::string ogre("(Ogre) ");
>++		//if there's a problem setting material name, log as verbose as these messages are quite common and not necessarily errors since the Model format in many cases overrides the material defined in the mesh
>++		if (Ogre::StringUtil::startsWith(message, "Can't assign material", false)) {
>++			lml = Ogre::LML_TRIVIAL;
>++		}
>++		switch (lml) {
>+ 		case Ogre::LML_TRIVIAL:
>+ 			Log::slog("Ogre", Log::VERBOSE) << ogre << message << Log::END_MESSAGE;
>+ 			break;
>+@@ -64,11 +62,9 @@ void OgreLogObserver::messageLogged( const String& message, LogMessageLevel lml,
>+ 			Log::slog("Ogre", Log::FAILURE) << ogre << message << Log::END_MESSAGE;
>+ 			break;
>+ 
>++		}
>+ 	}
>+ }
>+ 
>+-
>+-
>+-
>+ }
>+ }
>+diff --git a/src/components/ogre/OgreLogObserver.h b/src/components/ogre/OgreLogObserver.h
>+index 32327b3..4ae6569 100644
>+--- a/src/components/ogre/OgreLogObserver.h
>++++ b/src/components/ogre/OgreLogObserver.h
>+@@ -42,7 +42,7 @@ class OgreLogObserver: public Ogre::LogListener
>+ 		*/
>+ 		OgreLogObserver();
>+ 		virtual ~OgreLogObserver();
>+-		virtual void messageLogged( const Ogre::String& message, Ogre::LogMessageLevel lml, bool maskDebug, const Ogre::String &logName );
>++		virtual void messageLogged( const Ogre::String& message, Ogre::LogMessageLevel lml, bool maskDebug, const Ogre::String &logName, bool& skipThisMessage );
>+ 
>+ 	protected:
>+ 
>+diff --git a/src/components/ogre/environment/caelum/include/CaelumPlugin.h b/src/components/ogre/environment/caelum/include/CaelumPlugin.h
>+index 4542866..7947fb2 100644
>+--- a/src/components/ogre/environment/caelum/include/CaelumPlugin.h
>++++ b/src/components/ogre/environment/caelum/include/CaelumPlugin.h
>+@@ -25,6 +25,7 @@
>+ #include "CaelumScriptTranslator.h"
>+ #include "TypeDescriptor.h"
>+ #include "OgrePlugin.h"
>++#include <OgreSingleton.h>
>+ 
>+ namespace Caelum
>+ {
>+@@ -37,10 +38,6 @@
>+     class CAELUM_EXPORT CaelumPlugin: public Ogre::Singleton<CaelumPlugin>, public Ogre::Plugin
>+     {
>+     public:
>+-        /// Get reference to singleton instance; or crash if N/A.
>+-        static CaelumPlugin& getSingleton(void);
>+-        /// Get pointer to singleton instance; or pointer if N/A.
>+-        static CaelumPlugin* getSingletonPtr(void);
>+ 
>+         CaelumPlugin();
>+         ~CaelumPlugin();
>+diff --git a/src/components/ogre/environment/caelum/src/CaelumPlugin.cpp b/src/components/ogre/environment/caelum/src/CaelumPlugin.cpp
>+index 288ad92..498078f 100644
>+--- a/src/components/ogre/environment/caelum/src/CaelumPlugin.cpp
>++++ b/src/components/ogre/environment/caelum/src/CaelumPlugin.cpp
>+@@ -21,19 +21,10 @@
>+ #include "CaelumPrecompiled.h"
>+ #include "CaelumPlugin.h"
>+ 
>+-template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::ms_Singleton = 0;
>++template<> Caelum::CaelumPlugin* Ogre::Singleton<Caelum::CaelumPlugin>::msSingleton = 0;
>+ 
>+ namespace Caelum
>+ {
>+-	CaelumPlugin* CaelumPlugin::getSingletonPtr () {
>+-        return ms_Singleton;
>+-    }
>+-
>+-    CaelumPlugin& CaelumPlugin::getSingleton () {  
>+-        assert (ms_Singleton);
>+-        return *ms_Singleton;  
>+-    }
>+-
>+     extern "C" void CAELUM_EXPORT dllStartPlugin () {
>+         assert (CaelumPlugin::getSingletonPtr () == 0);
>+         CaelumPlugin* plugin = new CaelumPlugin();
>+diff --git a/src/components/ogre/scripting/bindings/lua/ogre/OgreEntity.pkg b/src/components/ogre/scripting/bindings/lua/ogre/OgreEntity.pkg
>+index 49ffb7a..fc5f974 100644
>+--- a/src/components/ogre/scripting/bindings/lua/ogre/OgreEntity.pkg
>++++ b/src/components/ogre/scripting/bindings/lua/ogre/OgreEntity.pkg
>+@@ -278,7 +278,7 @@ namespace Ogre {
>+         morph animation, 'includes_pose_animation true' if using pose animation
>+         and 'includes_skeletal_animation true' if using skeletal animation.
>+ 		*/
>+-		bool isHardwareAnimationEnabled(void) const;
>++		bool isHardwareAnimationEnabled(void);
>+ 
>+ 		/** Overridden from MovableObject */
>+ // 		void _notifyAttached(Node* parent, bool isTagPoint = false);
>+@@ -433,7 +433,7 @@ namespace Ogre {
>+ 			BIND_HARDWARE_MORPH
>+ 		};
>+ 		/// Choose which vertex data to bind to the renderer
>+-		Ogre::Entity::VertexDataBindChoice chooseVertexDataForBinding(bool hasVertexAnim) const;
>++		Ogre::Entity::VertexDataBindChoice chooseVertexDataForBinding(bool hasVertexAnim);
>+ 
>+ 		/** Are buffers already marked as vertex animated? */
>+ 		bool _getBuffersMarkedForAnimation(void) const;
>+diff --git a/src/components/ogre/scripting/bindings/lua/ogre/OgreQuaternion.pkg b/src/components/ogre/scripting/bindings/lua/ogre/OgreQuaternion.pkg
>+index b18c299..abd3d6d 100644
>+--- a/src/components/ogre/scripting/bindings/lua/ogre/OgreQuaternion.pkg
>++++ b/src/components/ogre/scripting/bindings/lua/ogre/OgreQuaternion.pkg
>+@@ -141,7 +141,7 @@ namespace Ogre {
>+             const Ogre::Quaternion& rkQ, bool shortestPath = false);
>+ 
>+         // cutoff for sine near zero
>+-        static const float ms_fEpsilon;
>++        static const float msEpsilon;
>+ 
>+         // special values
>+         static const Ogre::Quaternion ZERO;
>+-- 
>+1.7.10
>+
>diff --git a/ember.spec b/ember.spec
>index b923714..4fc1f05 100644
>--- a/ember.spec
>+++ b/ember.spec
>@@ -10,6 +10,9 @@ Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.t
> Patch1:         ember-0.6.3-fix_implicit_dso.patch
> Patch2:         ember-0.6.3-gcc47.patch
> Patch3:         ember-start.patch
>+# coming from https://github.com/worldforge/ember/commit/99fa9fbd7cb5c669b852352c67b479b9a4687530
>+# just removed the version bump
>+Patch4:         ember-0.6.3-ogre_1.8.1.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildRequires:  SDL-devel tinyxml-devel DevIL-devel cegui-devel ogre-devel
>@@ -21,7 +24,8 @@ BuildRequires:  varconf-devel
> BuildRequires:	wfmath-devel >= 1.0
> BuildRequires:	libwfut-devel
> BuildRequires:  desktop-file-utils
>-
>+# needed for patch4
>+BuildRequires:  automake autoconf libtool
> Requires:       %{name}-media >= 0.6.3 %{name}-media < 0.6.4
> 
> %description
>@@ -34,12 +38,14 @@ It uses the Ogre 3D engine with CEGUI.
> %patch1 -p1 -b .fix_implicit_dso
> %patch2 -p1 -b .gcc47
> %patch3 -p0 -b .start
>+%patch4 -p1 -b .orge_1.8.1
> 
> # Encoding fix
> iconv -f iso-8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
> 
> 
> %build
>+autoreconf --force --install
> %configure --disable-static --disable-freeimage-check
> make %{?_smp_mflags}
> 
>-- 
>1.8.0.2
>

Actions: View | Diff

Attachments on bug 891058: 670950