aboutsummaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorYuri Victorovich <yuri@FreeBSD.org>2021-09-15 23:49:10 +0000
committerYuri Victorovich <yuri@FreeBSD.org>2021-09-16 02:45:20 +0000
commit0070506ff0dba10540acc8cb20b5132043fb1006 (patch)
tree01c1c85503870b0ff8effc7820702a0efa77cfdb /math
parent8407165700d4ec423f9a41549f2ebb4cc7b912a2 (diff)
downloadports-0070506ff0dba10540acc8cb20b5132043fb1006.tar.gz
ports-0070506ff0dba10540acc8cb20b5132043fb1006.zip
math/fcl: Update 0.6.1 -> 0.7.0
Diffstat (limited to 'math')
-rw-r--r--math/fcl/Makefile7
-rw-r--r--math/fcl/distinfo6
-rw-r--r--math/fcl/files/patch-CMakeLists.txt29
-rw-r--r--math/fcl/pkg-plist4
-rw-r--r--math/py-python-fcl/Makefile2
5 files changed, 26 insertions, 22 deletions
diff --git a/math/fcl/Makefile b/math/fcl/Makefile
index 2700c4ea996b..28e2d9d47414 100644
--- a/math/fcl/Makefile
+++ b/math/fcl/Makefile
@@ -1,7 +1,5 @@
PORTNAME= fcl
-DISTVERSIONPREFIX= v
-DISTVERSION= 0.6.1
-PORTREVISION= 1
+DISTVERSION= 0.7.0
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
@@ -17,6 +15,7 @@ USE_GITHUB= yes
GH_ACCOUNT= flexible-collision-library
USE_LDCONFIG= yes
+CMAKE_ON= FREEBSD_ENABLE_SSE
CMAKE_OFF= FCL_BUILD_TESTS BUILD_TESTING # also see https://github.com/flexible-collision-library/fcl/issues/354
OPTIONS_DEFINE_amd64= SSE2 SSE3 SSSE3 SSE4 SSE41 SSE42 SSE4A
@@ -29,7 +28,7 @@ ${sse}_DESC= Support for ${sse}
${sse}_CMAKE_ON= -DFCL_USE_X64_SSE:BOOL=ON -DOPT_SSE_${sse}=-m${sse:tl:S/41/4.1/:S/42/4.2/}
.endfor
-do-test:
+do-test: # tests fail to compile: https://github.com/flexible-collision-library/fcl/issues/549
@cd ${BUILD_WRKSRC} && \
${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTING:BOOL=ON -DFCL_BUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
diff --git a/math/fcl/distinfo b/math/fcl/distinfo
index acf6f262658b..4a3fe83e9d70 100644
--- a/math/fcl/distinfo
+++ b/math/fcl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583020872
-SHA256 (flexible-collision-library-fcl-v0.6.1_GH0.tar.gz) = c8a68de8d35a4a5cd563411e7577c0dc2c626aba1eef288cb1ca88561f8d8019
-SIZE (flexible-collision-library-fcl-v0.6.1_GH0.tar.gz) = 6208928
+TIMESTAMP = 1631693005
+SHA256 (flexible-collision-library-fcl-0.7.0_GH0.tar.gz) = 90409e940b24045987506a6b239424a4222e2daf648c86dd146cbcb692ebdcbc
+SIZE (flexible-collision-library-fcl-0.7.0_GH0.tar.gz) = 6231480
diff --git a/math/fcl/files/patch-CMakeLists.txt b/math/fcl/files/patch-CMakeLists.txt
index 9dcd05ad5d6e..70ba9dd92a0c 100644
--- a/math/fcl/files/patch-CMakeLists.txt
+++ b/math/fcl/files/patch-CMakeLists.txt
@@ -1,15 +1,20 @@
---- CMakeLists.txt.orig 2018-11-17 21:20:10 UTC
+--- CMakeLists.txt.orig 2021-09-09 15:34:30 UTC
+++ CMakeLists.txt
-@@ -55,10 +55,10 @@ endif()
+@@ -81,7 +81,7 @@ endif()
- # Whether to enable SSE
set(SSE_FLAGS "")
--option(FCL_USE_X64_SSE "Whether FCL should x64 SSE instructions" ON)
-+option(FCL_USE_X64_SSE "Whether FCL should x64 SSE instructions" OFF)
- if(FCL_USE_X64_SSE)
- if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-- set(SSE_FLAGS -mfpmath=sse -msse -msse2 -msse3 -mssse3)
-+ set(SSE_FLAGS -mfpmath=sse ${OPT_SSE_SSE2} ${OPT_SSE_SSE3} ${OPT_SSE_SSSE3} ${OPT_SSE_SSE4} ${OPT_SSE_SSE41} ${OPT_SSE_SSE42} ${OPT_SSE_SSE4A})
- elseif(MSVC)
- # Win64 will add the flag automatically
- if(CMAKE_VS_PLATFORM_NAME STREQUAL "Win32")
+ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+- set(SSE_FLAGS -mfpmath=sse -msse -msse2 -msse3 -mssse3)
++ set(SSE_FLAGS -mfpmath=sse ${OPT_SSE_SSE2} ${OPT_SSE_SSE3} ${OPT_SSE_SSSE3} ${OPT_SSE_SSE4} ${OPT_SSE_SSE41} ${OPT_SSE_SSE42} ${OPT_SSE_SSE4A})
+ elseif(MSVC)
+ # Win64 will add the flag automatically
+ if(CMAKE_VS_PLATFORM_NAME STREQUAL "Win32")
+@@ -102,7 +102,7 @@ else()
+ check_cxx_compiler_flag("${SSE_FLAGS}" _compiler_supports_sse)
+
+ if(_has_sse AND _has_sse2 AND _compiler_supports_sse)
+- set(FCL_TARGET_SUPPORT_X64_SSE ON)
++ set(FCL_TARGET_SUPPORT_X64_SSE ${FREEBSD_ENABLE_SSE})
+ else()
+ set(FCL_TARGET_SUPPORT_X64_SSE OFF)
+ endif()
diff --git a/math/fcl/pkg-plist b/math/fcl/pkg-plist
index b1a0708196bd..e57bc7f521b7 100644
--- a/math/fcl/pkg-plist
+++ b/math/fcl/pkg-plist
@@ -317,7 +317,7 @@ lib/cmake/fcl/fcl-config.cmake
lib/cmake/fcl/fcl-targets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/fcl/fcl-targets.cmake
lib/libfcl.so
-lib/libfcl.so.0.6
-lib/libfcl.so.0.6.1
+lib/libfcl.so.0.7
+lib/libfcl.so.0.7.0
libdata/pkgconfig/fcl.pc
%%DATADIR%%/package.xml
diff --git a/math/py-python-fcl/Makefile b/math/py-python-fcl/Makefile
index 623814a9e1ab..ee05a3a8db70 100644
--- a/math/py-python-fcl/Makefile
+++ b/math/py-python-fcl/Makefile
@@ -1,6 +1,6 @@
PORTNAME= python-fcl
PORTVERSION= 0.0.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}