[ogre-pagedgeometry] Update to 1.1.0
Bruno Wolff III
bruno at fedoraproject.org
Fri Jan 14 18:20:14 UTC 2011
commit 6720b60044ee4fc67a07a97f1eb379fc21c65e6e
Author: Bruno Wolff III <bruno at wolff.to>
Date: Fri Jan 14 12:14:24 2011 -0600
Update to 1.1.0
.gitignore | 1 +
ogre-pagedgeometry.spec | 30 +++++++++-----
pagedgeometry-no-force-static.patch | 77 +++++++++++++++++++++++++++++------
pagedgeometry-no-sse.patch | 19 ---------
sources | 2 +-
5 files changed, 86 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 46687d5..362d8fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
pagedgeometry-2721svn.tar.xz
+/pagedGeometry-1.1.0.zip
diff --git a/ogre-pagedgeometry.spec b/ogre-pagedgeometry.spec
index c2f50e1..8e89573 100644
--- a/ogre-pagedgeometry.spec
+++ b/ogre-pagedgeometry.spec
@@ -1,7 +1,7 @@
Name: ogre-pagedgeometry
-Version: 1.05
-%global rev 2721
-Release: 4.%{rev}svn%{?dist}
+Version: 1.1.0
+# %%global rev 2721
+Release: 1%{?dist}
Summary: Ogre addon for realtime rendering of dense forests
Group: Development/Libraries
License: zlib
@@ -10,8 +10,8 @@ URL: http://www.ogre3d.org/wiki/index.php/PagedGeometry_Engine
# svn export -r %{rev} https://ogreaddons.svn.sourceforge.net/svnroot/ogreaddons/trunk/forests pagedgeometry
# tar cf pagedgeometry-%{rev}svn.tar pagedgeometry
# xz pagedgeometry-%{rev}svn.tar
-Source0: pagedgeometry-%{rev}svn.tar.xz
-Patch0: pagedgeometry-no-sse.patch
+# Source0: pagedgeometry-%{rev}svn.tar.xz
+Source0: http://ogre-paged.googlecode.com/files/pagedGeometry-%{version}.zip
Patch1: pagedgeometry-no-force-static.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,9 +53,8 @@ instructions are enabled.
%endif
%prep
-%setup -q -n pagedgeometry
-%patch0
-%patch1
+%setup -q -n pagedGeometry-%{version}
+%patch1 -p1 -b .shared
for file in GettingStarted.txt Todo.txt ; do
mv $file timestamp && \
iconv -f WINDOWS-1252 -t UTF-8 -o $file timestamp && \
@@ -66,8 +65,11 @@ done
%build
mkdir build
cd build
-%cmake -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING= -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING= ..
-make VERBOSE=1 %{?_smp_mflags}
+%cmake -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING= -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING= ..
+# Builds out of order with _smp_mflags
+make VERBOSE=1
+mkdir lib
+mv ../lib/libPagedGeometry.so lib/
cd ..
# For x86 build a separate sse2 library that will be autodetected at runtime
@@ -76,6 +78,8 @@ mkdir sse2
cd sse2
%cmake -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=-msse2 -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=-msse2 ..
make VERBOSE=1 %{?_smp_mflags}
+mkdir lib
+mv ../lib/libPagedGeometry.so lib/
cd ..
%endif
@@ -93,6 +97,9 @@ mkdir -p %{buildroot}%{_libdir}/sse2/OGRE
cp -p sse2/lib/libPagedGeometry.so %{buildroot}%{_libdir}/sse2/OGRE/
%endif
+# Note: The examples are now being built by default, but they're pretty worthless without cg.
+# So... I didn't package them. ~spot (21-Dec-2010)
+
%clean
rm -rf %{buildroot}
@@ -124,6 +131,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Dec 21 2010 Tom Callaway <spot at fedoraproject.org> - 1.1.0-1
+- update to 1.1.0
+
* Sat Nov 07 2009 Bruno Wolff III <bruno at wolff.ro> - 1.05-4.2721svn
- Remove unnecessary option to cmake to request shared library build
diff --git a/pagedgeometry-no-force-static.patch b/pagedgeometry-no-force-static.patch
index 21bc1c1..30114b8 100644
--- a/pagedgeometry-no-force-static.patch
+++ b/pagedgeometry-no-force-static.patch
@@ -1,13 +1,64 @@
-*** source/CMakeLists.txt.orig 2009-11-01 21:46:04.000000000 -0600
---- source/CMakeLists.txt 2009-11-01 21:46:16.000000000 -0600
-***************
-*** 14,17 ****
- WindBatchPage.cpp
- )
-
-! ADD_LIBRARY(PagedGeometry STATIC ${PagedGeometry_SRCS})
---- 14,17 ----
- WindBatchPage.cpp
- )
-
-! ADD_LIBRARY(PagedGeometry ${PagedGeometry_SRCS})
+diff -up pagedGeometry-1.1.0/CMakeLists.txt.shared pagedGeometry-1.1.0/CMakeLists.txt
+--- pagedGeometry-1.1.0/CMakeLists.txt.shared 2010-04-09 02:19:20.000000000 -0400
++++ pagedGeometry-1.1.0/CMakeLists.txt 2010-12-21 15:31:57.775241999 -0500
+@@ -29,7 +29,7 @@ project(PagedGeometry)
+ include(CMakeDependenciesConfig.txt)
+
+ # build static libs by default
+-SET(BUILD_SHARED_LIBS OFF)
++SET(BUILD_SHARED_LIBS ON)
+
+ # setup paths
+ SET(RUNTIME_OUTPUT_DIRECTORY "${PagedGeometry_SOURCE_DIR}/bin/")
+@@ -114,19 +114,19 @@ IF(NOT WIN32)
+ endif()
+
+ # Set visibility options if available
+-IF(NOT WIN32)
+- CHECK_C_SOURCE_COMPILES("int foo() __attribute__((destructor));
+- int main() {return 0;}" HAVE_GCC_DESTRUCTOR)
+-
+- CHECK_C_COMPILER_FLAG(-fvisibility=hidden HAVE_VISIBILITY_SWITCH)
+- IF(HAVE_VISIBILITY_SWITCH)
+- CHECK_C_SOURCE_COMPILES("int foo() __attribute__((visibility(\"default\")));
+- int main() {return 0;}" HAVE_GCC_VISIBILITY)
+- IF(HAVE_GCC_VISIBILITY)
+- ADD_DEFINITIONS(-fvisibility=hidden -DHAVE_GCC_VISIBILITY)
+- ENDIF()
+- ENDIF()
+-ENDIF()
++# IF(NOT WIN32)
++# CHECK_C_SOURCE_COMPILES("int foo() __attribute__((destructor));
++# int main() {return 0;}" HAVE_GCC_DESTRUCTOR)
++#
++# CHECK_C_COMPILER_FLAG(-fvisibility=hidden HAVE_VISIBILITY_SWITCH)
++# IF(HAVE_VISIBILITY_SWITCH)
++# CHECK_C_SOURCE_COMPILES("int foo() __attribute__((visibility(\"default\")));
++# int main() {return 0;}" HAVE_GCC_VISIBILITY)
++# IF(HAVE_GCC_VISIBILITY)
++# ADD_DEFINITIONS(-fvisibility=hidden -DHAVE_GCC_VISIBILITY)
++# ENDIF()
++# ENDIF()
++# ENDIF()
+
+
+ # now add the directories
+@@ -134,4 +134,4 @@ add_subdirectory(source)
+
+ if(PAGEDGEOMETRY_BUILD_SAMPLES)
+ add_subdirectory(examples)
+-endif(PAGEDGEOMETRY_BUILD_SAMPLES)
+\ No newline at end of file
++endif(PAGEDGEOMETRY_BUILD_SAMPLES)
+diff -up pagedGeometry-1.1.0/source/CMakeLists.txt.shared pagedGeometry-1.1.0/source/CMakeLists.txt
+--- pagedGeometry-1.1.0/source/CMakeLists.txt.shared 2010-04-09 01:59:14.000000000 -0400
++++ pagedGeometry-1.1.0/source/CMakeLists.txt 2010-12-21 15:31:13.510241999 -0500
+@@ -8,7 +8,7 @@ FILE(GLOB sources *.cpp ${PagedGeometry_
+
+ set(LIBNAME "PagedGeometry")
+
+-ADD_LIBRARY(${LIBNAME} STATIC ${sources})
++ADD_LIBRARY(${LIBNAME} ${sources})
+ windows_hacks(${LIBNAME})
+
+ # install the library
diff --git a/sources b/sources
index 2d77478..a1bfa02 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8339bdf5e49616eec5ca4cc78d8ab2f0 pagedgeometry-2721svn.tar.xz
+089b0aefb882344c35b828a999f1918c pagedGeometry-1.1.0.zip
More information about the scm-commits
mailing list