Mercurial > mxe-octave

changeset 2669:3a195a5d439b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package cgal
author Mark Brand <mabrand@mabrand.nl>
date Thu, 05 Jul 2012 12:02:10 +0200
parents 185b0c693c77
children 47fc8672c8f5
files index.html src/cgal-1-fixes.patch src/cgal.mk
diffstat 3 files changed, 32 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Wed Jul 18 01:07:44 2012 +0200
+++ b/index.html	Thu Jul 05 12:02:10 2012 +0200
@@ -980,7 +980,7 @@
     </tr>
     <tr>
         <td id="cgal-package">cgal</td>
-        <td id="cgal-version">4.0</td>
+        <td id="cgal-version">4.0.2</td>
         <td id="cgal-website"><a href="http://www.cgal.org/">cgal</a></td>
     </tr>
     <tr>
--- a/src/cgal-1-fixes.patch	Wed Jul 18 01:07:44 2012 +0200
+++ b/src/cgal-1-fixes.patch	Thu Jul 05 12:02:10 2012 +0200
@@ -1,19 +1,17 @@
 This file is part of MXE.
 See index.html for further information.
 
-Contains ad hoc patches for cross building.
-
-From d9b95ae188d2631da8d193b38ae11b3227f26b58 Mon Sep 17 00:00:00 2001
-From: "mxe@mxe.cc" <mxe@mxe.cc>
+From 036e8f90ce7f2f1302a2603b89ae7661211c090d Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 21 Oct 2011 23:08:52 +0200
-Subject: [PATCH 1/4] adjustments for MXE
+Subject: [PATCH 1/4] adjustments for mingw-cross-env
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a0ef19a..bb8c02f 100644
+index af8be68..61a5ee7 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -359,6 +359,8 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" )
+@@ -400,6 +400,8 @@ message( STATUS "System: ${CMAKE_SYSTEM_NAME}" )
  #
  #--------------------------------------------------------------------------------------------------
  
@@ -249,7 +247,7 @@
        ${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 bb59f8c..9cebb51 100644
+index c89e7f7..57a5d40 100644
 --- a/include/CGAL/Constrained_Delaunay_triangulation_2.h
 +++ b/include/CGAL/Constrained_Delaunay_triangulation_2.h
 @@ -390,7 +390,7 @@ is_flipable(Face_handle f, int i, bool perturb) const
@@ -274,8 +272,8 @@
 1.7.10.4
 
 
-From e70713f3c915d871e5f71bcdb883e410626dbfaf Mon Sep 17 00:00:00 2001
-From: "mxe@mxe.cc" <mxe@mxe.cc>
+From a455aa3d21f432831ccafcffc90bc7baf766ce6b Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
 Date: Fri, 18 Nov 2011 00:08:25 +0100
 Subject: [PATCH 2/4] prevent Qt's moc from choking on BOOST_JOIN
 
@@ -303,41 +301,38 @@
 1.7.10.4
 
 
-From 6798554267e98685638dd4467541bc0dd388d136 Mon Sep 17 00:00:00 2001
-From: "mxe@mxe.cc" <mxe@mxe.cc>
-Date: Wed, 28 Mar 2012 00:25:48 +1100
-Subject: [PATCH 3/4] Cmake min version 2.8.6 is only for Windows DLLs
+From 7225ba1e69c3e4501706e73e2f1e61e3d1313bfa Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Fri, 6 Jul 2012 09:27:49 +0200
+Subject: [PATCH 3/4] update "detected" Qt version
 
-http://www.cgal.org/Manual/latest/doc_html/installation_manual/Chapter_installation_manual.html
-
-Section 3:
-"On Windows, CMake version 2.8.6 or higher is required, for a proper support of DLLs generation."
 
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bb8c02f..1f0a4cb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -6,7 +6,7 @@
- project(CGAL CXX)
- 
- # Minimal version of CMake:
--if(WIN32)
-+if(WIN32 AND BUILD_SHARED_LIBS)
-   cmake_minimum_required(VERSION 2.8.6)
- else()
-   cmake_minimum_required(VERSION 2.6.2)
+diff --git a/TryRunResults.cgal.cmake b/TryRunResults.cgal.cmake
+index 299de90..f11ddc6 100644
+--- a/TryRunResults.cgal.cmake
++++ b/TryRunResults.cgal.cmake
+@@ -192,7 +192,7 @@ SET( ZLIB_RUN_RES__TRYRUN_OUTPUT
+      CACHE STRING "version=1.2.5" FORCE)
+ SET( QT4_RUN_RES
+      0
+-     CACHE STRING "version=4.8.0" FORCE)
++     CACHE STRING "version=4.8.2" FORCE)
+ SET( QT4_RUN_RES__TRYRUN_OUTPUT
+      0
+-     CACHE STRING "version=4.8.0" FORCE)
++     CACHE STRING "version=4.8.2" FORCE)
 -- 
 1.7.10.4
 
 
-From 4d6d1341564e5b3e46850e80959a1bb2e111c4ba Mon Sep 17 00:00:00 2001
+From c6a34b69b8c538456fa23d07f2914aef6395bcf7 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 18 Jul 2012 00:43:17 +0200
 Subject: [PATCH 4/4] boost 1.50 compatibility
 
 
 diff --git a/cmake/modules/CGAL_SetupBoost.cmake b/cmake/modules/CGAL_SetupBoost.cmake
-index fc3dc11..d72074f 100644
+index fc3dc11..d72074fd 100644
 --- a/cmake/modules/CGAL_SetupBoost.cmake
 +++ b/cmake/modules/CGAL_SetupBoost.cmake
 @@ -3,7 +3,7 @@ if ( NOT CGAL_Boost_Setup )
--- a/src/cgal.mk	Wed Jul 18 01:07:44 2012 +0200
+++ b/src/cgal.mk	Thu Jul 05 12:02:10 2012 +0200
@@ -3,10 +3,10 @@
 
 PKG             := cgal
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := d1f3f328bc5cb026ddb825cb585c7ae27a8856f7
+$(PKG)_CHECKSUM := 20c58ebc021754e8be35237bcda43b0084f60617
 $(PKG)_SUBDIR   := CGAL-$($(PKG)_VERSION)
 $(PKG)_FILE     := CGAL-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL      := https://gforge.inria.fr/frs/download.php/30385/$($(PKG)_FILE)
+$(PKG)_URL      := https://gforge.inria.fr/frs/download.php/31176/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc boost gmp mpfr qt
 
 define $(PKG)_UPDATE
@@ -41,6 +41,7 @@
         -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
     $(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(PREFIX)/$(TARGET)/bin/test-cgal.exe'