Mercurial > mxe-octave

changeset 2194:748f09771e30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update package cgal
author Luis Saavedra <luis94855510@gmail.com>
date Thu, 29 Dec 2011 19:46:44 +0100
parents 035a8e064a17
children f549abee793d 4ca5272c3b38
files src/cgal-1-fixes.patch src/cgal.mk
diffstat 2 files changed, 185 insertions(+), 117 deletions(-) [+]
line wrap: on
line diff
--- a/src/cgal-1-fixes.patch	Mon Dec 26 10:54:12 2011 +0100
+++ b/src/cgal-1-fixes.patch	Thu Dec 29 19:46:44 2011 +0100
@@ -13,7 +13,7 @@
 index e5af443..7d77f9d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -135,6 +135,8 @@ set(ALL_CGAL_LIBRARIES CGAL CGAL_Core CGAL_ImageIO CGAL_Qt3 CGAL_Qt4 CACHE INTER
+@@ -326,6 +326,8 @@
  #
  #--------------------------------------------------------------------------------------------------
  
@@ -27,146 +27,199 @@
 index 0000000..cba9b44
 --- /dev/null
 +++ b/TryRunResults.cgal.cmake
-@@ -0,0 +1,139 @@
+@@ -0,0 +1,192 @@
++SET( GCC_RUN_RES
++     0
++     CACHE STRING "version=4.6.2" FORCE)
++SET( GCC_RUN_RES__TRYRUN_OUTPUT
++     0
++     CACHE STRING "version=4.6.2" FORCE)
++SET( GMP_RUN_RES
++     0
++     CACHE STRING "version=5.0.2" FORCE)
++SET( GMP_RUN_RES__TRYRUN_OUTPUT
++     0
++     CACHE STRING "version=5.0.2" FORCE)
++SET( MPFR_RUN_RES
++     0
++     CACHE STRING "version=3.1.0" FORCE)
++SET( MPFR_RUN_RES__TRYRUN_OUTPUT
++     0
++     CACHE STRING "version=3.1.0" FORCE)
 +SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_ARRAY_MEMBER_INITIALIZATION_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_DENORMALS_COMPILE_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_DENORMALS_COMPILE_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_FPU_ROUNDING_MODE_UNWINDING_VC_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_IEEE_754_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_IEEE_754_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_ISTREAM_INT_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING "7812" FORCE)
++SET( CGAL_CFG_ISTREAM_INT_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING "7812" FORCE)
 +SET( CGAL_CFG_LONGNAME_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_LONGNAME_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_MATCHING_BUG_5
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_MATCHING_BUG_5__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_MATCHING_BUG_6
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_MATCHING_BUG_6__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_ARRAY
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_AUTO
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_DECLTYPE
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_DEFAULT_TEMPLATE_ARGUMENTS_FOR_FUNCTION_TEMPLATES
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_DELEGATING_CONSTRUCTORS
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE)
++SET( CGAL_CFG_NESTED_CLASS_FRIEND_DECLARATION_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING "A's do_something\nC's do_something\nB's do_something\nC's do_something" FORCE)
 +SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_INITIALIZER_LISTS
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_CPP0X_ISFINITE
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_LAMBDAS
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_CPP0X_ISFINITE__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_CPP0X_LONG_LONG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_RVALUE_REFERENCE
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_TUPLE
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( CGAL_CFG_NO_CPP0X_VARIADIC_TEMPLATES
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_CPP0X_LONG_LONG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_LIMITS
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_LIMITS__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_LOGICAL_OPERATORS_ALTERNATIVES__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_MESSAGE_PRAGMA_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_NEXTAFTER
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_NEXTAFTER__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_STATEMENT_EXPRESSIONS__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_STL
 +     0
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_STL__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_TMPL_IN_TMPL_PARAM__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_TR1_ARRAY
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_TR1_ARRAY__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_TR1_TUPLE
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_TR1_TUPLE__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NO_WARNING_CPP_DIRECTIVE_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_NUMERIC_LIMITS_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_NUMERIC_LIMITS_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_TEMPLATE_IN_DEFAULT_PARAMETER_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_TYPENAME_BEFORE_DEFAULT_ARGUMENT_BUG__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( GCC_RUN_RES
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( GMP_RUN_RES
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( MPFR_RUN_RES
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( QT4_RUN_RES
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING " " FORCE)
++SET( CGAL_CFG_USING_BASE_MEMBER_BUG_2__TRYRUN_OUTPUT
++     0
++     CACHE STRING " " FORCE)
 +SET( ZLIB_RUN_RES
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( GCC_RUN_RES__TRYRUN_OUTPUT
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( GMP_RUN_RES__TRYRUN_OUTPUT
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( MPFR_RUN_RES__TRYRUN_OUTPUT
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
++     0
++     CACHE STRING "version=1.2.5" FORCE)
++SET( ZLIB_RUN_RES__TRYRUN_OUTPUT
++     0
++     CACHE STRING "version=1.2.5" FORCE)
++SET( QT4_RUN_RES
++     0
++     CACHE STRING "version=4.8.0" FORCE)
 +SET( QT4_RUN_RES__TRYRUN_OUTPUT
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+SET( ZLIB_RUN_RES__TRYRUN_OUTPUT
-+     FAILED_TO_RUN
-+     CACHE STRING "Result from TRY_RUN" FORCE)
-+
++     0
++     CACHE STRING "version=4.8.0" FORCE)
 diff --git a/cmake/modules/FindBoost.cmake b/cmake/modules/FindBoost.cmake
 index fbdde88..5d8a0a9 100644
 --- a/cmake/modules/FindBoost.cmake
@@ -253,4 +306,19 @@
  namespace CGAL {
 -- 
 1.7.7.3
-
+diff --git a/cmake/modules/CGAL_Macros.cmake b/cmake/modules/CGAL_Macros.cmake
+--- a/cmake/modules/CGAL_Macros.cmake	2011-12-28 15:19:49.885888900 -0300
++++ b/cmake/modules/CGAL_Macros.cmake	2011-12-28 15:20:20.435888915 -0300
+@@ -164,9 +164,9 @@
+         if ( ${LIB}_RUN_RES EQUAL "0" )
+         
+           string( REGEX MATCH "version=.*\$" ${LIB}_VERSION_LINE ${${LIB}_OUTPUT}  )
+-          string( REPLACE "\n" "" ${LIB}_VERSION_LINE2 ${${LIB}_VERSION_LINE} )
+-          string( REPLACE "\r" "" ${LIB}_VERSION_LINE3 ${${LIB}_VERSION_LINE2} )
+-          string( REPLACE "version=" "" ${LIB}_VERSION ${${LIB}_VERSION_LINE3} )
++          string( REPLACE "\n" "" "${LIB}_VERSION_LINE2" "${${LIB}_VERSION_LINE}" )
++          string( REPLACE "\r" "" "${LIB}_VERSION_LINE3" "${${LIB}_VERSION_LINE2}" )
++          string( REPLACE "version=" "" "${LIB}_VERSION" "${${LIB}_VERSION_LINE3}" )
+           
+         else()
+         
--- a/src/cgal.mk	Mon Dec 26 10:54:12 2011 +0100
+++ b/src/cgal.mk	Thu Dec 29 19:46:44 2011 +0100
@@ -4,12 +4,12 @@
 # cgal
 PKG             := cgal
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.8
-$(PKG)_CHECKSUM := 23748df1e60d62da166d2e395732ae2fe274317d
+$(PKG)_VERSION  := 3.9
+$(PKG)_CHECKSUM := cc99fad7116f221b6301326834f71ff65cebf2eb
 $(PKG)_SUBDIR   := CGAL-$($(PKG)_VERSION)
 $(PKG)_FILE     := CGAL-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.cgal.org/
-$(PKG)_URL      := https://gforge.inria.fr/frs/download.php/28500/$($(PKG)_FILE)
+$(PKG)_URL      := https://gforge.inria.fr/frs/download.php/29125/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc boost gmp mpfr qt
 
 define $(PKG)_UPDATE
@@ -24,7 +24,7 @@
         -DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \
         -DCMAKE_BUILD_TYPE:STRING="Release" \
         -DCGAL_INSTALL_INC_DIR:STRING="include" \
-        -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.8" \
+        -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-3.9" \
         -DCGAL_INSTALL_BIN_DIR:STRING="bin" \
         -DBOOST_LIB_DIAGNOSTIC_DEFINITIONS:STRING="-DBOOST_LIB_DIAGNOSTIC" \
         -DWITH_CGAL_Qt3:BOOL="0" \