From 40502acc91ef9306b24d6529a4bfb318d104eca4 Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Sun, 11 Oct 2020 13:50:14 +0200 Subject: [PATCH] cgal: update to 5.1 --- ..._modules_CGAL_CheckCXXFileRuns.cmake.patch | 50 ------------------- packages/cgal/build.sh | 6 +-- 2 files changed, 3 insertions(+), 53 deletions(-) delete mode 100644 packages/cgal/Installation_cmake_modules_CGAL_CheckCXXFileRuns.cmake.patch diff --git a/packages/cgal/Installation_cmake_modules_CGAL_CheckCXXFileRuns.cmake.patch b/packages/cgal/Installation_cmake_modules_CGAL_CheckCXXFileRuns.cmake.patch deleted file mode 100644 index f32b470ad..000000000 --- a/packages/cgal/Installation_cmake_modules_CGAL_CheckCXXFileRuns.cmake.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -uNr cgal-releases-CGAL-4.14.1/Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake cgal-releases-CGAL-4.14.1.mod/Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake ---- cgal-releases-CGAL-4.14.1/Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake 2019-09-30 10:18:05.000000000 +0300 -+++ cgal-releases-CGAL-4.14.1.mod/Installation/cmake/modules/CGAL_CheckCXXFileRuns.cmake 2019-10-05 15:06:59.818321583 +0300 -@@ -24,45 +24,11 @@ - else() - SET(CHECK_CXX_SOURCE_COMPILES_ADD_LIBRARIES) - endif() -- -+ - if(CMAKE_REQUIRED_INCLUDES) - SET(CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES "-DINCLUDE_DIRECTORIES:STRING=${CMAKE_REQUIRED_INCLUDES}") - else() - SET(CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES) - endif() -- -- # Try to compile and run the test -- #MESSAGE(STATUS "Performing Test ${TEST}") -- TRY_RUN(${VAR} ${VAR}_COMPILED -- "${CMAKE_BINARY_DIR}" -- "${FILE}" -- COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -- CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} -- "${CHECK_CXX_SOURCE_COMPILES_ADD_LIBRARIES}" -- "${CHECK_CXX_SOURCE_COMPILES_ADD_INCLUDES}" -- OUTPUT_VARIABLE OUTPUT) -- -- # if it did not compile make the return value fail code of 1 -- if(NOT ${VAR}_COMPILED) -- SET(${VAR} 1 CACHE INTERNAL "Test ${TEST}" FORCE ) -- endif() -- # if the return value was 0 then it worked -- SET(result_var ${${VAR}}) -- if("${result_var}" EQUAL 0) -- SET(${VAR} 1 CACHE INTERNAL "Test ${TEST}" FORCE ) -- MESSAGE(STATUS "Performing Test ${TEST} - Success") -- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log -- "Performing C++ SOURCE FILE Test ${TEST} succeded with the following output:\n" -- "${OUTPUT}\n" -- "Source file was:\n${SOURCE}\n") -- else() -- MESSAGE(STATUS "Performing Test ${TEST} - Failed") -- SET(${VAR} "" CACHE INTERNAL "Test ${TEST}" FORCE ) -- FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log -- "Performing C++ SOURCE FILE Test ${TEST} failed with the following output:\n" -- "${OUTPUT}\n" -- "Return value: ${result_var}\n" -- "Source file was:\n${SOURCE}\n") -- endif() - ENDMACRO(CHECK_CXX_FILE_RUNS) - diff --git a/packages/cgal/build.sh b/packages/cgal/build.sh index b643f784a..5b695c237 100644 --- a/packages/cgal/build.sh +++ b/packages/cgal/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://www.cgal.org/ TERMUX_PKG_DESCRIPTION="Computational Geometry Algorithms Library" TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1" -TERMUX_PKG_VERSION=5.0.3 -TERMUX_PKG_SRCURL=https://github.com/CGAL/cgal/archive/releases/CGAL-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=30194b3169ed9161806eea40bdabd54067e2b7a1e2bf6be1aa8d6c9f1eda5531 +TERMUX_PKG_VERSION=5.1 +TERMUX_PKG_SRCURL=https://github.com/CGAL/cgal/releases/download/v${TERMUX_PKG_VERSION}/CGAL-${TERMUX_PKG_VERSION}.tar.xz +TERMUX_PKG_SHA256=94779e80db978c01768a1b62889ddcfcf74dababa70b73d1e493823d273e0ab7 TERMUX_PKG_DEPENDS="boost, libc++, libgmp, libmpfr, zlib" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="