# HG changeset patch # User Mark Brand # Date 1332584370 -3600 # Node ID 5e2618870aea9a5cafb844f10e91e45dbd12c052 # Parent d04d2339ec39280f5c8ceb67723f17457ad19469 update package cgal --- src/cgal-1-fixes.patch | 46 +++++++++------------------------------------- src/cgal.mk | 10 ++++++---- 2 files changed, 15 insertions(+), 41 deletions(-) diff -r d04d2339ec39 -r 5e2618870aea src/cgal-1-fixes.patch --- a/src/cgal-1-fixes.patch Sat Mar 24 10:47:18 2012 +0100 +++ b/src/cgal-1-fixes.patch Sat Mar 24 11:19:30 2012 +0100 @@ -3,17 +3,17 @@ Contains ad hoc patches for cross building. -From 497bfdc8ced3d3327e76cc9ebf2ae64c3a2c9593 Mon Sep 17 00:00:00 2001 +From 2d2576f140b49438678b72b5e8e10fff3d77f37d Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Fri, 21 Oct 2011 23:08:52 +0200 Subject: [PATCH 1/2] adjustments for mingw-cross-env diff --git a/CMakeLists.txt b/CMakeLists.txt -index 47f6171..5edfed3 100644 +index a0ef19a..bb8c02f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -326,6 +326,8 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" ) +@@ -359,6 +359,8 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" ) # #-------------------------------------------------------------------------------------------------- @@ -249,10 +249,10 @@ ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_STATIC_TAG}-${Boost_LIB_VERSION} ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}-${Boost_LIB_VERSION} diff --git a/include/CGAL/Constrained_Delaunay_triangulation_2.h b/include/CGAL/Constrained_Delaunay_triangulation_2.h -index f1a7201..23a53c9 100644 +index bb59f8c..9cebb51 100644 --- a/include/CGAL/Constrained_Delaunay_triangulation_2.h +++ b/include/CGAL/Constrained_Delaunay_triangulation_2.h -@@ -389,7 +389,7 @@ is_flipable(Face_handle f, int i, bool perturb) const +@@ -390,7 +390,7 @@ is_flipable(Face_handle f, int i, bool perturb) const Face_handle ni = f->neighbor(i); if (is_infinite(f) || is_infinite(ni)) return false; if (f->is_constrained(i)) return false; @@ -261,7 +261,7 @@ == ON_POSITIVE_SIDE); } -@@ -493,7 +493,7 @@ test_conflict(const Point& p, Face_handle fh) const +@@ -494,7 +494,7 @@ test_conflict(const Point& p, Face_handle fh) const // return true if P is inside the circumcircle of fh // if fh is infinite, return true when p is in the positive // halfspace or on the boundary and in the finite edge of fh @@ -274,7 +274,7 @@ 1.7.9.2 -From f8e9cd41103b5ff7dba17a3788ca30830f76352d Mon Sep 17 00:00:00 2001 +From bee019d7435d634544024e544cae36e34a0a4dc5 Mon Sep 17 00:00:00 2001 From: mingw-cross-env Date: Fri, 18 Nov 2011 00:08:25 +0100 Subject: [PATCH 2/2] prevent Qt's moc from choking on BOOST_JOIN @@ -283,10 +283,10 @@ https://lists-sop.inria.fr/sympa/arc/cgal-discuss/2011-11/msg00087.html diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake -index 27dfcd1..edbfbee 100644 +index 62d0485..852fcc9 100644 --- a/cmake/modules/CGAL_Macros.cmake +++ b/cmake/modules/CGAL_Macros.cmake -@@ -164,9 +164,9 @@ if( NOT CGAL_MACROS_FILE_INCLUDED ) +@@ -174,9 +174,9 @@ if( NOT CGAL_MACROS_FILE_INCLUDED ) if ( ${LIB}_RUN_RES EQUAL "0" ) string( REGEX MATCH "version=.*\$" ${LIB}_VERSION_LINE ${${LIB}_OUTPUT} ) @@ -299,34 +299,6 @@ else() -diff --git a/include/CGAL/Qt/GraphicsItem.h b/include/CGAL/Qt/GraphicsItem.h -index 7348d02..807e200 100644 ---- a/include/CGAL/Qt/GraphicsItem.h -+++ b/include/CGAL/Qt/GraphicsItem.h -@@ -24,7 +24,9 @@ - #include - #include - #include -+#ifndef Q_MOC_RUN - #include -+#endif - - - -diff --git a/include/CGAL/Qt/GraphicsViewInput.h b/include/CGAL/Qt/GraphicsViewInput.h -index 6c912cc..a5c5da8 100644 ---- a/include/CGAL/Qt/GraphicsViewInput.h -+++ b/include/CGAL/Qt/GraphicsViewInput.h -@@ -22,7 +22,9 @@ - #define CGAL_QT_GRAPHICS_VIEW_INPUT_H - - #include -+#ifndef Q_MOC_RUN - #include -+#endif - #include - - namespace CGAL { -- 1.7.9.2 diff -r d04d2339ec39 -r 5e2618870aea src/cgal.mk --- a/src/cgal.mk Sat Mar 24 10:47:18 2012 +0100 +++ b/src/cgal.mk Sat Mar 24 11:19:30 2012 +0100 @@ -4,12 +4,12 @@ # cgal PKG := cgal $(PKG)_IGNORE := -$(PKG)_VERSION := 3.9 -$(PKG)_CHECKSUM := cc99fad7116f221b6301326834f71ff65cebf2eb +$(PKG)_VERSION := 4.0 +$(PKG)_CHECKSUM := d1f3f328bc5cb026ddb825cb585c7ae27a8856f7 $(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION) -$(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.gz +$(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.xz $(PKG)_WEBSITE := http://www.cgal.org/ -$(PKG)_URL := https://gforge.inria.fr/frs/download.php/29125/$($(PKG)_FILE) +$(PKG)_URL := https://gforge.inria.fr/frs/download.php/30385/$($(PKG)_FILE) $(PKG)_DEPS := gcc boost gmp mpfr qt define $(PKG)_UPDATE @@ -32,6 +32,7 @@ -DBOOST_COMPILER=_win32 \ -DBOOST_THREAD_USE_LIB=1 \ -DBOOST_USE_STATIC_LIBS=1 \ + -DBUILD_SHARED_LIBS=0 \ -C TryRunResults.cgal.cmake . $(MAKE) -C '$(1)' -j $(JOBS) cd '$(1)/examples/AABB_tree' && cmake \ @@ -41,6 +42,7 @@ -DBOOST_COMPILER=_win32 \ -DBOOST_THREAD_USE_LIB=1 \ -DBOOST_USE_STATIC_LIBS=1 \ + -DBUILD_SHARED_LIBS=0 \ -DCGAL_DIR:STRING="../.." . $(MAKE) -C '$(1)/examples/AABB_tree' -j $(JOBS) $(MAKE) -C '$(1)' -j $(JOBS) install