commit 817216bbe80d5d0132ebcfd44e6bf2a0c589fdcd
Author: Jan Rękorajski <[email protected]>
Date: Sun Oct 13 13:35:14 2019 +0200
- started update to 1.12.2, files need fixing, x32 needs checking
boost-1.50.patch | 11 -----------
ogre-system-tinyxml.patch | 27 ---------------------------
ogre-thread.patch | 12 ------------
ogre.spec | 18 +++++++++---------
4 files changed, 9 insertions(+), 59 deletions(-)
---
diff --git a/ogre.spec b/ogre.spec
index dae33ac..2bb7401 100644
--- a/ogre.spec
+++ b/ogre.spec
@@ -13,13 +13,12 @@
Summary: Object-oriented Graphics Rendering Engine
Summary(pl.UTF-8): OGRE - zorientowany obiektowo silnik renderowania
grafiki
Name: ogre
-Version: 1.8.1
-Release: 10
+Version: 1.12.2
+Release: 0.1
License: MIT
Group: Applications
-Source0:
http://downloads.sourceforge.net/ogre/%{name}_src_v%{fver}.tar.bz2
-# Source0-md5: b85e3dcf370a46b3a8624d4fdd722d39
-Patch0: boost-1.50.patch
+Source0:
https://github.com/OGRECave/ogre/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 6a1187615abb0eee5c658578da9cf001
Patch1: x32.patch
URL: http://www.ogre3d.org/
%{?with_samples:BuildRequires: CEGUI-devel}
@@ -34,6 +33,7 @@ BuildRequires: cppunit-devel >= 1.10.0
BuildRequires: freetype-devel >= 2.1.0
BuildRequires: libstdc++-devel
BuildRequires: pkgconfig
+BuildRequires: pugixml-devel
BuildRequires: rpmbuild(macros) >= 1.600
BuildRequires: tinyxml-devel
BuildRequires: xorg-lib-libX11-devel
@@ -85,17 +85,17 @@ OGRE samples.
Przykłady do OGRE.
%prep
-%setup -q -n %{name}_src_v%{fver}
-%patch0 -p1
-%patch1 -p1
+%setup -q
+#%patch1 -p1
%build
+
install -d build
cd build
# "None" is an alias for release, but uses plain CMAKE_CXX_FLAGS; "PLD" build
type is not supported
%cmake .. \
- -DCMAKE_CXX_FLAGS="%{rpmcxxflags} -Wno-narrowing" \
-DCMAKE_BUILD_TYPE=%{?debug:Debug}%{!?debug:None} \
+ -DOGRE_BUILD_DEPENDENCIES=FALSE \
%{!?with_samples:-DOGRE_BUILD_SAMPLES=FALSE}
%{__make}
diff --git a/boost-1.50.patch b/boost-1.50.patch
deleted file mode 100644
index 84c69d2..0000000
--- a/boost-1.50.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ogre_src_v1-8-0/CMake/Dependencies.cmake~ 2012-05-25 21:48:44.000000000
+0200
-+++ ogre_src_v1-8-0/CMake/Dependencies.cmake 2012-07-11 14:26:31.685404862
+0200
-@@ -127,7 +127,7 @@
- endif()
- set(Boost_ADDITIONAL_VERSIONS "1.50" "1.50.0" "1.49" "1.49.0" "1.48" "1.48.0"
"1.47" "1.47.0" "1.46" "1.46.0" "1.45" "1.45.0" "1.44" "1.44.0" "1.42" "1.42.0"
"1.41.0" "1.41" "1.40.0" "1.40")
- # Components that need linking (NB does not include header-only components
like bind)
--set(OGRE_BOOST_COMPONENTS thread date_time)
-+set(OGRE_BOOST_COMPONENTS system thread date_time)
- find_package(Boost COMPONENTS ${OGRE_BOOST_COMPONENTS} QUIET)
- if (NOT Boost_FOUND)
- # Try again with the other type of libs
diff --git a/ogre-system-tinyxml.patch b/ogre-system-tinyxml.patch
deleted file mode 100644
index e25836e..0000000
--- a/ogre-system-tinyxml.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
deleted file mode 100644
index 2e90c49..0000000
--- a/ogre-thread.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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/817216bbe80d5d0132ebcfd44e6bf2a0c589fdcd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
