[mingw-polyclipping] update to 5.1.3
sailer
sailer at fedoraproject.org
Tue Mar 5 11:06:22 UTC 2013
commit 436fe5272410b1d526e48d2d3ff9eca5db2fd369
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Tue Mar 5 12:06:09 2013 +0100
update to 5.1.3
.gitignore | 1 +
mingw-polyclipping.spec | 4 +-
polyclipping.patch | 108 ++++++++++++++++++++++++++++-------------------
sources | 2 +-
4 files changed, 69 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4098d89..4830600 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/clipper_ver5.0.3.zip
+/clipper_ver5.1.2.zip
diff --git a/mingw-polyclipping.spec b/mingw-polyclipping.spec
index 06a051f..2267fca 100644
--- a/mingw-polyclipping.spec
+++ b/mingw-polyclipping.spec
@@ -9,8 +9,8 @@
%global mingw_pkg_name polyclipping
Name: mingw-%{mingw_pkg_name}
-Version: 5.0.3
-Release: 4%{?dist}
+Version: 5.1.2
+Release: 1%{?dist}
Summary: MinGW Windows Polygon clipping library
Group: System Environment/Libraries
diff --git a/polyclipping.patch b/polyclipping.patch
index f89a90b..04edfbc 100644
--- a/polyclipping.patch
+++ b/polyclipping.patch
@@ -1,5 +1,34 @@
---- cpp/clipper.hpp.mingw 2013-01-12 07:47:30.000000000 +0100
-+++ cpp/clipper.hpp 2013-01-18 22:00:08.918673624 +0100
+--- cpp/CMakeLists.txt.mingw 2013-02-19 03:15:44.000000000 +0100
++++ cpp/CMakeLists.txt 2013-03-05 11:59:49.672938623 +0100
+@@ -1,15 +1,23 @@
+-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
++CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6)
+ PROJECT(polyclipping)
+
++INCLUDE (GenerateExportHeader)
++
+ SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Release type")
+ SET(CMAKE_INSTALL_LIBDIR lib${LIB_SUFFIX})
+
+ SET(BUILD_SHARED_LIBS ON CACHE BOOL
+ "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
+ ADD_LIBRARY(polyclipping clipper.cpp)
++GENERATE_EXPORT_HEADER(polyclipping
++ BASE_NAME polyclipping
++ EXPORT_MACRO_NAME polyclipping_EXPORT
++ EXPORT_FILE_NAME polyclipping_Export.h
++ STATIC_DEFINE polyclipping_BUILT_AS_STATIC
++)
+
+ # The header name clipper.hpp is too generic, so install in a subdirectory
+ INSTALL (FILES clipper.hpp DESTINATION include/polyclipping)
+-INSTALL (TARGETS polyclipping LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++INSTALL (TARGETS polyclipping ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin)
+
+ SET_TARGET_PROPERTIES(polyclipping PROPERTIES VERSION 8.0.0 SOVERSION 8 )
+\ No newline at end of file
+--- cpp/clipper.hpp.mingw 2013-02-26 04:39:24.000000000 +0100
++++ cpp/clipper.hpp 2013-03-05 12:03:26.300035461 +0100
@@ -40,6 +40,16 @@
#include <cstdlib>
#include <ostream>
@@ -26,31 +55,45 @@
public:
long64 X;
long64 Y;
-@@ -64,10 +74,10 @@
- typedef std::vector< IntPoint > Polygon;
+@@ -65,13 +75,13 @@
typedef std::vector< Polygon > Polygons;
+
-std::ostream& operator <<(std::ostream &s, Polygon &p);
-std::ostream& operator <<(std::ostream &s, Polygons &p);
+CLIPPER_EXPORT std::ostream& operator <<(std::ostream &s, Polygon &p);
+CLIPPER_EXPORT std::ostream& operator <<(std::ostream &s, Polygons &p);
--struct ExPolygon {
-+struct CLIPPER_EXPORT ExPolygon {
- Polygon outer;
- Polygons holes;
+ class PolyNode;
+ typedef std::vector< PolyNode* > PolyNodes;
+
+-class PolyNode
++class CLIPPER_EXPORT PolyNode
+ {
+ public:
+ PolyNode();
+@@ -88,7 +98,7 @@
+ friend class Clipper; //to access Index
};
-@@ -75,16 +85,16 @@
+-class PolyTree: public PolyNode
++class CLIPPER_EXPORT PolyTree: public PolyNode
+ {
+ public:
+ ~PolyTree(){Clear();};
+@@ -102,23 +112,23 @@
+
enum JoinType { jtSquare, jtRound, jtMiter };
-bool Orientation(const Polygon &poly);
-double Area(const Polygon &poly);
--void OffsetPolygons(const Polygons &in_polys, Polygons &out_polys,
+CLIPPER_EXPORT bool Orientation(const Polygon &poly);
+CLIPPER_EXPORT double Area(const Polygon &poly);
+
+-void OffsetPolygons(const Polygons &in_polys, Polygons &out_polys,
+CLIPPER_EXPORT void OffsetPolygons(const Polygons &in_polys, Polygons &out_polys,
- double delta, JoinType jointype = jtSquare, double MiterLimit = 2, bool AutoFix = true);
+ double delta, JoinType jointype = jtSquare, double limit = 0, bool autoFix = true);
+
-void SimplifyPolygon(const Polygon &in_poly, Polygons &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(const Polygons &in_polys, Polygons &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(Polygons &polys, PolyFillType fillType = pftEvenOdd);
@@ -58,6 +101,14 @@
+CLIPPER_EXPORT void SimplifyPolygons(const Polygons &in_polys, Polygons &out_polys, PolyFillType fillType = pftEvenOdd);
+CLIPPER_EXPORT void SimplifyPolygons(Polygons &polys, PolyFillType fillType = pftEvenOdd);
+-void CleanPolygon(Polygon& in_poly, Polygon& out_poly, double distance = 1.415);
+-void CleanPolygons(Polygons& in_polys, Polygons& out_polys, double distance = 1.415);
++CLIPPER_EXPORT void CleanPolygon(Polygon& in_poly, Polygon& out_poly, double distance = 1.415);
++CLIPPER_EXPORT void CleanPolygons(Polygons& in_polys, Polygons& out_polys, double distance = 1.415);
+
+-void PolyTreeToPolygons(PolyTree& polytree, Polygons& polygons);
++CLIPPER_EXPORT void PolyTreeToPolygons(PolyTree& polytree, Polygons& polygons);
+
-void ReversePolygon(Polygon& p);
-void ReversePolygons(Polygons& p);
+CLIPPER_EXPORT void ReversePolygon(Polygon& p);
@@ -65,7 +116,7 @@
//used internally ...
enum EdgeSide { esLeft = 1, esRight = 2};
-@@ -177,7 +187,7 @@
+@@ -211,7 +221,7 @@
//ClipperBase is the ancestor to the Clipper class. It should not be
//instantiated directly. This class simply abstracts the conversion of sets of
//polygon coordinates into edge objects that are stored in a LocalMinima list.
@@ -74,7 +125,7 @@
{
public:
ClipperBase();
-@@ -198,7 +208,7 @@
+@@ -232,7 +242,7 @@
EdgeList m_edges;
};
@@ -83,7 +134,7 @@
{
public:
Clipper();
-@@ -288,7 +298,7 @@
+@@ -324,7 +334,7 @@
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
@@ -92,32 +143,3 @@
{
public:
clipperException(const char* description): m_descr(description) {}
---- cpp/CMakeLists.txt.mingw 2012-12-29 06:00:24.000000000 +0100
-+++ cpp/CMakeLists.txt 2013-01-19 01:12:08.996004360 +0100
-@@ -1,15 +1,23 @@
--CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
-+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.6)
- PROJECT(polyclipping)
-
-+INCLUDE (GenerateExportHeader)
-+
- SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "Release type")
- SET(CMAKE_INSTALL_LIBDIR lib${LIB_SUFFIX})
-
- SET(BUILD_SHARED_LIBS ON CACHE BOOL
- "Build shared libraries (.dll/.so) instead of static ones (.lib/.a)")
- ADD_LIBRARY(polyclipping clipper.cpp)
-+GENERATE_EXPORT_HEADER(polyclipping
-+ BASE_NAME polyclipping
-+ EXPORT_MACRO_NAME polyclipping_EXPORT
-+ EXPORT_FILE_NAME polyclipping_Export.h
-+ STATIC_DEFINE polyclipping_BUILT_AS_STATIC
-+)
-
- # The header name clipper.hpp is too generic, so install in a subdirectory
- INSTALL (FILES clipper.hpp DESTINATION include/polyclipping)
--INSTALL (TARGETS polyclipping LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL (TARGETS polyclipping ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin)
-
- SET_TARGET_PROPERTIES(polyclipping PROPERTIES VERSION 5.0.0 SOVERSION 5 )
-\ No newline at end of file
diff --git a/sources b/sources
index a53a750..1fc50c5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8509ee63d716e46e88a21ab31b315411 clipper_ver5.0.3.zip
+0936233cd5bafadc6264bcef4ed24291 clipper_ver5.1.2.zip
More information about the scm-commits
mailing list