[mingw-polyclipping] update to 5.1.6
sailer
sailer at fedoraproject.org
Mon Jun 24 15:47:49 UTC 2013
commit 2e41178b3b93b1dff931068420082a6276e76680
Author: Thomas Sailer <t.sailer at alumni.ethz.ch>
Date: Mon Jun 24 17:45:54 2013 +0200
update to 5.1.6
.gitignore | 1 +
mingw-polyclipping.spec | 15 +++++++++++++--
polyclipping.patch | 33 +++++++++++++++++++--------------
sources | 2 +-
4 files changed, 34 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4830600..aa3aad0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/clipper_ver5.0.3.zip
/clipper_ver5.1.2.zip
+/clipper_ver5.1.6.zip
diff --git a/mingw-polyclipping.spec b/mingw-polyclipping.spec
index e60a40c..5bcaf97 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.1.2
-Release: 2%{?dist}
+Version: 5.1.6
+Release: 1%{?dist}
Summary: MinGW Windows Polygon clipping library
Group: System Environment/Libraries
@@ -103,6 +103,14 @@ popd
%install
pushd cpp
%mingw_make install DESTDIR=%{buildroot}
+%if 0%{?mingw_build_win32} == 1
+ install -d %{buildroot}/%{mingw32_libdir}
+ install build_win32$MINGW_BUILDDIR_SUFFIX/libpolyclipping.dll.a %{buildroot}/%{mingw32_libdir}
+%endif
+%if 0%{?mingw_build_win64} == 1
+ install -d %{buildroot}/%{mingw64_libdir}
+ install build_win64$MINGW_BUILDDIR_SUFFIX/libpolyclipping.dll.a %{buildroot}/%{mingw64_libdir}
+%endif
popd
%files -n mingw32-%{mingw_pkg_name}
@@ -119,6 +127,9 @@ popd
%changelog
+* Mon Jun 24 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.1.6-1
+- update to 5.1.6
+
* Thu Mar 7 2013 Thomas Sailer <t.sailer at alumni.ethz.ch> - 5.1.2-2
- export std::vector specializations from DLL as well
diff --git a/polyclipping.patch b/polyclipping.patch
index 8137b65..8986a2c 100644
--- a/polyclipping.patch
+++ b/polyclipping.patch
@@ -23,10 +23,11 @@
# 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)
++INSTALL (TARGETS polyclipping LIBRARY DESTINATION lib RUNTIME DESTINATION bin)
- SET_TARGET_PROPERTIES(polyclipping PROPERTIES VERSION 8.0.0 SOVERSION 8 )
+-SET_TARGET_PROPERTIES(polyclipping PROPERTIES VERSION 10.0.0 SOVERSION 10 )
\ No newline at end of file
++SET_TARGET_PROPERTIES(polyclipping PROPERTIES VERSION 10.0.0 SOVERSION 10 )
--- cpp/clipper.hpp.mingw 2013-02-26 04:39:24.000000000 +0100
+++ cpp/clipper.hpp 2013-03-07 15:39:27.253160787 +0100
@@ -34,12 +34,30 @@
@@ -96,9 +97,9 @@
{
public:
~PolyTree(){Clear();};
-@@ -102,23 +119,23 @@
-
+@@ -103,26 +120,26 @@
enum JoinType { jtSquare, jtRound, jtMiter };
+ enum EndType { etClosed, etButt, etSquare, etRound};
-bool Orientation(const Polygon &poly);
-double Area(const Polygon &poly);
@@ -109,6 +110,10 @@
+CLIPPER_EXPORT void OffsetPolygons(const Polygons &in_polys, Polygons &out_polys,
double delta, JoinType jointype = jtSquare, double limit = 0, bool autoFix = true);
+-void OffsetPolyLines(const Polygons &in_lines, Polygons &out_lines,
++CLIPPER_EXPORT void OffsetPolyLines(const Polygons &in_lines, Polygons &out_lines,
+ double delta, JoinType jointype = jtSquare, EndType endtype = etSquare, 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);
@@ -116,13 +121,13 @@
+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 CleanPolygon(const Polygon& in_poly, Polygon& out_poly, double distance = 1.415);
+-void CleanPolygons(const Polygons& in_polys, Polygons& out_polys, double distance = 1.415);
++CLIPPER_EXPORT void CleanPolygon(const Polygon& in_poly, Polygon& out_poly, double distance = 1.415);
++CLIPPER_EXPORT void CleanPolygons(const 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 PolyTreeToPolygons(const PolyTree& polytree, Polygons& polygons);
++CLIPPER_EXPORT void PolyTreeToPolygons(const PolyTree& polytree, Polygons& polygons);
-void ReversePolygon(Polygon& p);
-void ReversePolygons(Polygons& p);
@@ -131,7 +136,7 @@
//used internally ...
enum EdgeSide { esLeft = 1, esRight = 2};
-@@ -211,7 +228,7 @@
+@@ -216,7 +233,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.
@@ -140,7 +145,7 @@
{
public:
ClipperBase();
-@@ -232,7 +249,7 @@
+@@ -237,7 +254,7 @@
EdgeList m_edges;
};
@@ -149,7 +154,7 @@
{
public:
Clipper();
-@@ -324,7 +341,7 @@
+@@ -331,7 +348,7 @@
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
@@ -158,7 +163,7 @@
{
public:
clipperException(const char* description): m_descr(description) {}
-@@ -337,6 +354,10 @@
+@@ -344,6 +361,10 @@
} //ClipperLib namespace
diff --git a/sources b/sources
index 1fc50c5..babb10a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0936233cd5bafadc6264bcef4ed24291 clipper_ver5.1.2.zip
+1b44159d15d75731e374f0ddda61a49a clipper_ver5.1.6.zip
More information about the scm-commits
mailing list