[assimp] Fixed clipper for f20
rmattes
rmattes at fedoraproject.org
Thu May 30 01:56:32 UTC 2013
commit ad9bcd1edb286e979d158e0b088112a9f80fb78d
Author: Rich Mattes <richmattes at gmail.com>
Date: Wed May 29 21:56:17 2013 -0400
Fixed clipper for f20
assimp-3.0.1270-unbundle.patch | 56 +++++++++++++++++++++++++++++++++------
assimp.spec | 4 +-
2 files changed, 49 insertions(+), 11 deletions(-)
---
diff --git a/assimp-3.0.1270-unbundle.patch b/assimp-3.0.1270-unbundle.patch
index afce50b..1f2af6d 100644
--- a/assimp-3.0.1270-unbundle.patch
+++ b/assimp-3.0.1270-unbundle.patch
@@ -1,7 +1,7 @@
diff -ruN assimp--3.0.1270-source-only/CMakeLists.txt assimp--3.0.1270-source-only-fedora/CMakeLists.txt
--- assimp--3.0.1270-source-only/CMakeLists.txt 2012-07-07 18:15:42.000000000 -0400
-+++ assimp--3.0.1270-source-only-fedora/CMakeLists.txt 2013-05-28 22:00:52.100906395 -0400
-@@ -117,6 +117,27 @@
++++ assimp--3.0.1270-source-only-fedora/CMakeLists.txt 2013-05-28 22:51:02.968721353 -0400
+@@ -117,6 +117,36 @@
PKG_CHECK_MODULES(UNZIP minizip)
endif (PKG_CONFIG_FOUND)
@@ -25,6 +25,15 @@ diff -ruN assimp--3.0.1270-source-only/CMakeLists.txt assimp--3.0.1270-source-on
+ SET(HAVE_POLY2TRI false)
+ENDIF(POLY2TRI_LIB AND POLY2TRI_H)
+
++# Search for clipper
++FIND_LIBRARY(CLIPPER_LIB polyclipping HINTS ${CLIPPER_LIB_PATH})
++FIND_FILE(CLIPPER_H clipper.hpp PATHS ${CLIPPER_INCLUDE_PATH})
++IF (CLIPPER_LIB AND CLIPPER_H)
++ message(status "Found External clipper")
++ SET(HAVE_CLIPPER true)
++ELSE(CLIPPER_LIB AND CLIPPER_H)
++ SET(HAVE_CLIPPER false)
++ENDIF(CLIPPER_LIB AND CLIPPER_H)
+
IF ( NO_EXPORT )
ADD_DEFINITIONS( -DASSIMP_BUILD_NO_EXPORT)
@@ -91,7 +100,7 @@ diff -ruN assimp--3.0.1270-source-only/code/BVHLoader.cpp assimp--3.0.1270-sourc
using namespace Assimp;
diff -ruN assimp--3.0.1270-source-only/code/CMakeLists.txt assimp--3.0.1270-source-only-fedora/code/CMakeLists.txt
--- assimp--3.0.1270-source-only/code/CMakeLists.txt 2012-06-21 20:38:10.000000000 -0400
-+++ assimp--3.0.1270-source-only-fedora/code/CMakeLists.txt 2013-05-01 20:28:06.683692914 -0400
++++ assimp--3.0.1270-source-only-fedora/code/CMakeLists.txt 2013-05-29 21:50:50.883117497 -0400
@@ -88,7 +88,7 @@
SOURCE_GROUP(Logging FILES ${Logging_SRCS})
@@ -101,7 +110,24 @@ diff -ruN assimp--3.0.1270-source-only/code/CMakeLists.txt assimp--3.0.1270-sour
qnan.h
BaseImporter.cpp
BaseImporter.h
-@@ -633,10 +633,7 @@
+@@ -533,12 +533,15 @@
+ )
+ SOURCE_GROUP( ConvertUTF FILES ${ConvertUTF_SRCS})
+
++if (NOT HAVE_CLIPPER)
+ SET( Clipper_SRCS
+ ../contrib/clipper/clipper.hpp
+ ../contrib/clipper/clipper.cpp
+ )
+ SOURCE_GROUP( Clipper FILES ${Clipper_SRCS})
+-
++else (NOT HAVE_CLIPPER)
++ SET(Clipper_SRCS "")
++endif(NOT HAVE_CLIPPER)
+
+ SET( Poly2Tri_SRCS
+ ../contrib/poly2tri/poly2tri/common/shapes.cc
+@@ -633,11 +636,8 @@
${XGL_SRCS}
# Third-party libraries
@@ -109,10 +135,12 @@ diff -ruN assimp--3.0.1270-source-only/code/CMakeLists.txt assimp--3.0.1270-sour
${ConvertUTF_SRCS}
- ${unzip_compile_SRCS}
- ${Poly2Tri_SRCS}
- ${Clipper_SRCS}
+- ${Clipper_SRCS}
++ ${Clipper_SRCS}
# Necessary to show the headers in the project when using the VC++ generator:
${Boost_SRCS}
-@@ -672,6 +669,18 @@
+
+@@ -672,6 +672,26 @@
INCLUDE_DIRECTORIES("../contrib/unzip")
endif (UNZIP_FOUND)
@@ -128,6 +156,14 @@ diff -ruN assimp--3.0.1270-source-only/code/CMakeLists.txt assimp--3.0.1270-sour
+ TARGET_LINK_LIBRARIES(assimp ${POLY2TRI_LIB})
+endif(HAVE_POLY2TRI)
+
++if (HAVE_CLIPPER)
++ INCLUDE_DIRECTORIES(${CLIPPER_INCLUDE_PATH})
++ TARGET_LINK_LIBRARIES(assimp ${CLIPPER_LIB})
++else (HAVE_CLIPPER)
++ INCLUDE_DIRECTORIES(../contrib/clipper)
++endif(HAVE_CLIPPER)
++
++
INSTALL( TARGETS assimp DESTINATION ${LIB_INSTALL_DIR} COMPONENT ${LIBASSIMP_COMPONENT})
INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/assimp COMPONENT ${LIBASSIMP-DEV_COMPONENT})
INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT ${LIBASSIMP-DEV_COMPONENT})
@@ -1153,16 +1189,18 @@ diff -ruN assimp--3.0.1270-source-only/code/FileSystemFilter.h assimp--3.0.1270-
diff -ruN assimp--3.0.1270-source-only/code/IFCGeometry.cpp assimp--3.0.1270-source-only-fedora/code/IFCGeometry.cpp
--- assimp--3.0.1270-source-only/code/IFCGeometry.cpp 2012-03-20 23:31:58.000000000 -0400
-+++ assimp--3.0.1270-source-only-fedora/code/IFCGeometry.cpp 2013-05-01 20:28:34.428793094 -0400
-@@ -49,7 +49,7 @@
++++ assimp--3.0.1270-source-only-fedora/code/IFCGeometry.cpp 2013-05-29 21:49:47.663383209 -0400
+@@ -49,8 +49,8 @@
#include "PolyTools.h"
#include "ProcessHelper.h"
-#include "../contrib/poly2tri/poly2tri/poly2tri.h"
+-#include "../contrib/clipper/clipper.hpp"
+#include "poly2tri/poly2tri.h"
- #include "../contrib/clipper/clipper.hpp"
++#include "clipper.hpp"
#include <iterator>
+
diff -ruN assimp--3.0.1270-source-only/code/IRRLoader.cpp assimp--3.0.1270-source-only-fedora/code/IRRLoader.cpp
--- assimp--3.0.1270-source-only/code/IRRLoader.cpp 2012-04-23 00:26:28.000000000 -0400
+++ assimp--3.0.1270-source-only-fedora/code/IRRLoader.cpp 2013-05-01 19:28:57.687187452 -0400
diff --git a/assimp.spec b/assimp.spec
index f58c2db..ae9dc4b 100644
--- a/assimp.spec
+++ b/assimp.spec
@@ -30,7 +30,7 @@ BuildRequires: zlib-devel
BuildRequires: doxygen
BuildRequires: minizip-devel
BuildRequires: poly2tri-devel
-
+BuildRequires: polyclipping-devel
%description
Assimp, the Open Asset Import Library, is a free library to import
various well-known 3D model formats into applications. Assimp aims
@@ -75,7 +75,7 @@ rm -rf contrib/poly2tri
%build
mkdir build
pushd build
-%cmake -DLIB_INSTALL_DIR=%{_libdir} -DINCLUDE_INSTALL_DIR=%{_includedir} -DBIN_INSTALL_DIR=%{_bindir} -DIRRXML_LIB_PATH=${_libdir} -DIRRXML_INCLUDE_PATH=%{_includedir}/irrlicht/ -DPOLY2TRI_INCLUDE_PATH=%{_includedir}/poly2tri -DUSE_EXTERNAL_LIBS=ON ..
+%cmake -DLIB_INSTALL_DIR=%{_libdir} -DINCLUDE_INSTALL_DIR=%{_includedir} -DBIN_INSTALL_DIR=%{_bindir} -DIRRXML_LIB_PATH=%{_libdir} -DIRRXML_INCLUDE_PATH=%{_includedir}/irrlicht/ -DPOLY2TRI_INCLUDE_PATH=%{_includedir}/poly2tri -DUSE_EXTERNAL_LIBS=ON ..
popd
make %{?_smp_mflags} -C build
More information about the scm-commits
mailing list