Update CGAL to 4.14.2 (Switch from Qt4 to Qt5)

OK cwen@
This commit is contained in:
rsadowski 2020-02-04 06:09:02 +00:00
parent 510d003d5c
commit d0a83e8cbe
5 changed files with 1161 additions and 659 deletions

View File

@ -1,57 +1,47 @@
# $OpenBSD: Makefile,v 1.24 2019/07/12 20:47:40 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2020/02/04 06:09:02 rsadowski Exp $
BROKEN-mips64 = ICE on Interval_nt.h:98
COMMENT = Computational Geometry Algorithms Library
# when updating this port, don't just change the version number here.
# MASTER_SITES needs to be adapted for every new tarball.
# See https://gforge.inria.fr/frs/?group_id=52 for files index.
DISTNAME = CGAL-4.6.3
MASTER_SITES = https://gforge.inria.fr/frs/download.php/file/35139/
DISTNAME = CGAL-4.14.2
PKGNAME = ${DISTNAME:L}
REVISION = 5
EPOCH = 0
SHARED_LIBS = CGAL 1.0 \
CGAL_Core 1.0 \
CGAL_ImageIO 1.0 \
CGAL_Qt4 1.0
SHARED_LIBS += CGAL 2.0 # 13.0.3
SHARED_LIBS += CGAL_Core 2.0 # 14.0.3
SHARED_LIBS += CGAL_ImageIO 2.0 # 14.0.0
SHARED_LIBS += CGAL_Qt5 2.0 # 14.0.0
CATEGORIES = math
HOMEPAGE = http://www.cgal.org/
HOMEPAGE = https://www.cgal.org/
# mix of LGPLv2.1 and QPL; see http://www.cgal.org/license.html
# mix of LGPLv2.1 and QPL; see https://www.cgal.org/license.html
PERMIT_PACKAGE = Yes
WANTLIB += GL GLU boost_system-mt boost_thread-mt gmp m mpfr pthread
WANTLIB += boost_atomic-mt boost_chrono-mt boost_date_time-mt
WANTLIB += ${COMPILER_LIBCXX} z lib/qt4/QtGui lib/qt4/QtOpenGL lib/qt4/QtSvg
COMPILER = base-clang ports-gcc base-gcc
WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5OpenGL Qt5Svg
WANTLIB += Qt5Widgets Qt5Xml gmp m mpfr z
MASTER_SITES = https://github.com/CGAL/cgal/releases/download/releases%2FCGAL-4.14.2/
EXTRACT_SUFX = .tar.xz
MODULES = devel/cmake \
x11/qt4
BIULD_DEPENDS = math/eigen3
LIB_DEPENDS = devel/boost \
devel/gmp \
devel/mpfr
x11/qt5
BUILD_DEPENDS = math/eigen3 \
devel/boost
LIB_DEPENDS = devel/gmp \
devel/mpfr \
x11/qt5/qtsvg
CXXFLAGS += -I${X11BASE}/include
CONFIGURE_ARGS += -DCGAL_INSTALL_MAN_DIR="man/man1" \
-DCGAL_INSTALL_DOC_DIR="share/doc/cgal"
CONFIGURE_ENV = LDFLAGS="-L${X11BASE}/lib"
CONFIGURE_ENV += LDFLAGS="-L${X11BASE}/lib"
NO_TEST = Yes
post-extract:
rm ${WRKSRC}/cmake/modules/FindBLAS.cmake \
${WRKSRC}/cmake/modules/FindLAPACK.cmake \
${WRKSRC}/cmake/modules/FindOpenGL.cmake \
${WRKSRC}/scripts/cgal_make_macosx_app
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (CGAL-4.6.3.tar.xz) = 4zgCe4dnwKem5P2GeRgtG4O1saDaCh/kVG58DKCU/CE=
SIZE (CGAL-4.6.3.tar.xz) = 12017952
SHA256 (CGAL-4.14.2.tar.xz) = gZtoY2FO5lqw7cmL9wMhtstl4LQLjUD+e9c37uC4mSI=
SIZE (CGAL-4.14.2.tar.xz) = 15617164

View File

@ -1,11 +1,13 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2015/12/07 07:51:26 jasper Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.3 2020/02/04 06:09:02 rsadowski Exp $
add workaround from https://bugs.kde.org/show_bug.cgi?id=304111
- add workaround from https://bugs.kde.org/show_bug.cgi?id=304111
- Disable some dependencies
--- CMakeLists.txt.orig Sat Sep 5 21:00:16 2015
+++ CMakeLists.txt Sun Dec 6 14:16:32 2015
@@ -357,6 +357,8 @@ set( CGAL_MODULES_DIR ${CGAL_INSTALLATION_PACKAGE_
include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -391,6 +391,8 @@ include(${CGAL_MODULES_DIR}/CGAL_Macros.cmake)
include(${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake)
cgal_setup_module_path()
+add_definitions ( -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED )
@ -13,3 +15,19 @@ add workaround from https://bugs.kde.org/show_bug.cgi?id=304111
message( STATUS "CGAL_REFERENCE_CACHE_DIR=${CGAL_REFERENCE_CACHE_DIR}" )
if ( RUNNING_CGAL_AUTO_TEST )
@@ -1073,15 +1075,9 @@ if ( CGAL_BRANCH_BUILD )
message( "== Setting header checking ==" )
find_package(GMP REQUIRED)
- find_package(Doxygen REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(Qt5 COMPONENTS Core Widgets Xml OpenGL Gui REQUIRED)
find_package(VTK COMPONENTS vtkImagingGeneral vtkIOImage NO_MODULE)
- find_package(IPE)
- find_package(RS3)
- find_package(LEDA)
- find_package(OpenMesh)
- find_package(OpenCV QUIET)
set(compile_options "\
${CMAKE_CXX_FLAGS} -DCGAL_EIGEN3_ENABLED -DCGAL_PROFILE \

View File

@ -1,38 +0,0 @@
$OpenBSD: patch-include_CGAL_config_h,v 1.1 2017/01/23 21:56:32 jca Exp $
--- include/CGAL/config.h.orig Mon Jan 23 22:25:28 2017
+++ include/CGAL/config.h Mon Jan 23 22:33:03 2017
@@ -236,27 +236,14 @@
// Big endian or little endian machine.
// ====================================
-#if defined (__GLIBC__)
-# include <endian.h>
-# if (__BYTE_ORDER == __LITTLE_ENDIAN)
-# define CGAL_LITTLE_ENDIAN
-# elif (__BYTE_ORDER == __BIG_ENDIAN)
-# define CGAL_BIG_ENDIAN
-# else
-# error Unknown endianness
-# endif
-#elif defined(__sparc) || defined(__sparc__) \
- || defined(_POWER) || defined(__powerpc__) \
- || defined(__ppc__) || defined(__hppa) \
- || defined(_MIPSEB) || defined(_POWER) \
- || defined(__s390__)
-# define CGAL_BIG_ENDIAN
-#elif defined(__i386__) || defined(__alpha__) \
- || defined(__x86_64) || defined(__x86_64__) \
- || defined(__ia64) || defined(__ia64__) \
- || defined(_M_IX86) || defined(_M_IA64) \
- || defined(_M_ALPHA) || defined(_WIN64)
+#include <endian.h>
+#if !defined(BYTE_ORDER) || !defined(LITTLE_ENDIAN) || !defined(BIG_ENDIAN)
+# error Unknown endianness
+#endif
+#if (BYTE_ORDER == LITTLE_ENDIAN)
# define CGAL_LITTLE_ENDIAN
+#elif (BYTE_ORDER == BIG_ENDIAN)
+# define CGAL_BIG_ENDIAN
#else
# error Unknown endianness
#endif

File diff suppressed because it is too large Load Diff