[packages/ogre] - updated to 1.8.1 - use system tinyxml - link with boost thread lib

[baggins]

commit 90df30e7b569620bb19469127231e31af8d0ae28
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Jul 11 20:51:55 2013 +0200

    - updated to 1.8.1
    - use system tinyxml
    - link with boost thread lib

 ogre-system-tinyxml.patch | 27 +++++++++++++++++++++++++++
 ogre-thread.patch         | 12 ++++++++++++
 ogre.spec                 |  7 ++++---
 3 files changed, 43 insertions(+), 3 deletions(-)
---
diff --git a/ogre.spec b/ogre.spec
index e4dc870..3002fc7 100644
--- a/ogre.spec
+++ b/ogre.spec
@@ -13,12 +13,12 @@
 Summary:	Object-oriented Graphics Rendering Engine
 Summary(pl.UTF-8):	OGRE - zorientowany obiektowo silnik renderowania grafiki
 Name:		ogre
-Version:	1.8.0
-Release:	2
+Version:	1.8.1
+Release:	1
 License:	MIT
 Group:		Applications
 Source0:	http://downloads.sourceforge.net/ogre/%{name}_src_v%{fver}.tar.bz2
-# Source0-md5:	3b9bcd34a39891a8bf0385ae0c5c670b
+# Source0-md5:	b85e3dcf370a46b3a8624d4fdd722d39
 Patch0:		boost-1.50.patch
 URL:		http://www.ogre3d.org/
 %{?with_samples:BuildRequires:	CEGUI-devel}
@@ -34,6 +34,7 @@ BuildRequires:	freetype-devel >= 2.1.0
 BuildRequires:	libstdc++-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.600
+BuildRequires:	tinyxml-devel
 BuildRequires:	xorg-lib-libXaw-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
diff --git a/ogre-system-tinyxml.patch b/ogre-system-tinyxml.patch
new file mode 100644
index 0000000..e25836e
--- /dev/null
+++ b/ogre-system-tinyxml.patch
@@ -0,0 +1,27 @@
+diff -up ogre-1.8.1/Tools/XMLConverter/CMakeLists.txt.sys-tinyxml ogre-1.8.1/Tools/XMLConverter/CMakeLists.txt
+--- ogre-1.8.1/Tools/XMLConverter/CMakeLists.txt.sys-tinyxml	2012-11-30 15:06:39.571532023 +0100
++++ ogre-1.8.1/Tools/XMLConverter/CMakeLists.txt	2012-11-30 15:06:56.626460693 +0100
+@@ -13,22 +13,16 @@
+   include/OgreXMLMeshSerializer.h
+   include/OgreXMLPrerequisites.h
+   include/OgreXMLSkeletonSerializer.h
+-  include/tinystr.h
+-  include/tinyxml.h
+ )
+ 
+ set(SOURCE_FILES 
+   src/main.cpp
+   src/OgreXMLMeshSerializer.cpp
+   src/OgreXMLSkeletonSerializer.cpp
+-  src/tinystr.cpp
+-  src/tinyxml.cpp
+-  src/tinyxmlerror.cpp
+-  src/tinyxmlparser.cpp
+ )
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+ add_definitions(-DTIXML_USE_STL)
+ ogre_add_executable(OgreXMLConverter ${HEADER_FILES} ${SOURCE_FILES})
+-target_link_libraries(OgreXMLConverter ${OGRE_LIBRARIES})
++target_link_libraries(OgreXMLConverter ${OGRE_LIBRARIES} -ltinyxml)
+ ogre_config_tool(OgreXMLConverter)
diff --git a/ogre-thread.patch b/ogre-thread.patch
new file mode 100644
index 0000000..2e90c49
--- /dev/null
+++ b/ogre-thread.patch
@@ -0,0 +1,12 @@
+--- CMake/ConfigureBuild.cmake.thread	2012-09-02 00:27:14.000000000 -0500
++++ CMake/ConfigureBuild.cmake	2012-12-09 23:48:31.709984746 -0600
+@@ -178,6 +178,9 @@
+   if (OGRE_CONFIG_THREADS GREATER 0)
+     set(OGRE_CFLAGS "-pthread")
+     set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lpthread")
++    if (OGRE_THREAD_PROVIDER EQUAL 1)
++      set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lboost_system-mt")
++    endif ()
+   endif ()
+   if (OGRE_STATIC)
+     if (OGRE_CONFIG_THREADS)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ogre.git/commitdiff/90df30e7b569620bb19469127231e31af8d0ae28