Date: Sun, 3 Oct 2021 08:54:44 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f6c3a49fc9a7 - main - math/curv: Update 0.4-417 -> 0.5 Message-ID: <202110030854.1938siDt002504@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6c3a49fc9a7dbbca11753084dbd2a4c99bb2873 commit f6c3a49fc9a7dbbca11753084dbd2a4c99bb2873 Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2021-10-03 07:53:56 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2021-10-03 08:53:37 +0000 math/curv: Update 0.4-417 -> 0.5 Reported by: portscout --- math/curv/Makefile | 20 ++++++----- math/curv/distinfo | 14 ++++---- math/curv/files/patch-CMakeLists.txt | 69 ++++++++++++++++++++++-------------- 3 files changed, 60 insertions(+), 43 deletions(-) diff --git a/math/curv/Makefile b/math/curv/Makefile index 5bfb61816744..2c26a0d50e22 100644 --- a/math/curv/Makefile +++ b/math/curv/Makefile @@ -1,7 +1,5 @@ PORTNAME= curv -DISTVERSION= 0.4-417 -DISTVERSIONSUFFIX= -gf6f8d011 -PORTREVISION= 19 +DISTVERSION= 0.5 CATEGORIES= math lang graphics MAINTAINER= yuri@FreeBSD.org @@ -15,20 +13,24 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libdouble-conversion.so:devel/double-conversion \ libglfw.so:graphics/glfw \ libImath.so:math/Imath \ - libopenvdb.so:misc/openvdb \ - libtbb.so:devel/tbb + libtbb.so:devel/onetbb \ + libopenvdb.so:misc/openvdb USES= cmake compiler:c++14-lang gl localbase:ldflags xorg +USE_GL= gl +USE_XORG= x11 + USE_GITHUB= yes GH_ACCOUNT= curv3d GH_TUPLE= ocornut:imgui:e0cab56:imgui/extern/imgui \ - Tessil:ordered-map:3c14151:om/extern/ordered-map \ - AmokHuginnsson:replxx:9da16bb:replxx/extern/replxx -USE_GL= gl -USE_XORG= x11 + Tessil:ordered-map:4051af7:om/extern/ordered-map \ + AmokHuginnsson:replxx:b901d5f:replxx/extern/replxx + +LDFLAGS+= -lopenvdb PLIST_FILES= bin/curv \ lib/curv/lib/blend.curv \ + lib/curv/lib/builder.curv \ lib/curv/lib/noise.curv \ lib/curv/lib/web_colour.curv \ lib/curv/std.curv \ diff --git a/math/curv/distinfo b/math/curv/distinfo index 968be4efffed..c5de5a8cfbc6 100644 --- a/math/curv/distinfo +++ b/math/curv/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1575783420 -SHA256 (curv3d-curv-0.4-417-gf6f8d011_GH0.tar.gz) = c07be558f3ab6619bf32e97f4562bd1ff748028c0bde1b8fd0b8531bc1c27cdb -SIZE (curv3d-curv-0.4-417-gf6f8d011_GH0.tar.gz) = 16533467 +TIMESTAMP = 1633246172 +SHA256 (curv3d-curv-0.5_GH0.tar.gz) = 4c6949d62653e1ccb6f18cfa298833bfe9941a6a52d2738859f2f6a8c588632a +SIZE (curv3d-curv-0.5_GH0.tar.gz) = 18443440 SHA256 (ocornut-imgui-e0cab56_GH0.tar.gz) = 3a8aa936cf02f39fe49a17aba535b2d3e65a1611725284e62ad4445bbb7d4f2b SIZE (ocornut-imgui-e0cab56_GH0.tar.gz) = 1078436 -SHA256 (Tessil-ordered-map-3c14151_GH0.tar.gz) = 389d6032661b95df1e4fc16c0eb3b5fe34416d03d416d99c367e3db4c5280ed0 -SIZE (Tessil-ordered-map-3c14151_GH0.tar.gz) = 60085 -SHA256 (AmokHuginnsson-replxx-9da16bb_GH0.tar.gz) = 1c3e56db7ca2a0072ff0383e8dc1cfd60e1b5af52206e2f76cdcdccf9a140403 -SIZE (AmokHuginnsson-replxx-9da16bb_GH0.tar.gz) = 56591 +SHA256 (Tessil-ordered-map-4051af7_GH0.tar.gz) = 13d64a071835d96465343c84441ee42aa1a558f9e759da812049839cf0c7499c +SIZE (Tessil-ordered-map-4051af7_GH0.tar.gz) = 68413 +SHA256 (AmokHuginnsson-replxx-b901d5f_GH0.tar.gz) = 485480b0c8da9971ef186f021123c19a77c44e565f6c578d6156d5af632d45e0 +SIZE (AmokHuginnsson-replxx-b901d5f_GH0.tar.gz) = 85903 diff --git a/math/curv/files/patch-CMakeLists.txt b/math/curv/files/patch-CMakeLists.txt index 25ece990b936..926827f3a431 100644 --- a/math/curv/files/patch-CMakeLists.txt +++ b/math/curv/files/patch-CMakeLists.txt @@ -1,60 +1,75 @@ ---- CMakeLists.txt.orig 2019-12-08 04:12:07 UTC +--- CMakeLists.txt.orig 2021-09-29 21:29:01 UTC +++ CMakeLists.txt -@@ -10,18 +10,14 @@ execute_process(COMMAND sh -c "${CMAKE_SOURCE_DIR}/cma +@@ -10,23 +10,23 @@ execute_process(COMMAND sh -c "${CMAKE_SOURCE_DIR}/cma list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") - # Global include directories, visible in subdirectories. + # Configure global include directories, visible in subdirectories. include_directories(. - extern/googletest/googletest/include - extern/double-conversion ++ #extern/double-conversion extern/ordered-map/include -- extern/openvdb extern/blosc extern/stb - extern/glfw/include - extern/glm ++ #extern/glfw/include ++ #extern/glm extern/glad) + if (MSYS) + # On MSYS we use MinGW packages for OpenVDB and GoogleTest + else () + include_directories( + extern/googletest/googletest/include +- extern/openvdb/openvdb) ++ ) + endif () if (APPLE) -@@ -30,6 +26,7 @@ if (APPLE) - link_directories(/usr/local/lib) - endif (APPLE) +@@ -45,6 +45,7 @@ endif (APPLE) + # Libraries + # =============================================== +# REPLxx used to be unbundled, but due to the incompatibilities (see Bug#241205) it was bundled again # REPLxx library file(GLOB ReplxxSrc "extern/replxx/src/*.cxx" "extern/replxx/src/*.cpp") add_library(replxx ${ReplxxSrc}) -@@ -38,10 +35,10 @@ target_include_directories(replxx - PRIVATE extern/replxx/src) - set_property(TARGET replxx PROPERTY CXX_STANDARD 14) +@@ -55,9 +56,9 @@ set_property(TARGET replxx PROPERTY CXX_STANDARD 17) + target_compile_definitions(replxx PRIVATE REPLXX_STATIC=1) --# double-conversion library + # double-conversion library -file(GLOB DoubleConversionSrc "extern/double-conversion/double-conversion/*.cc") -add_library(double-conversion ${DoubleConversionSrc}) --set_property(TARGET double-conversion PROPERTY CXX_STANDARD 14) -+## double-conversion library +-set_property(TARGET double-conversion PROPERTY CXX_STANDARD 17) +#file(GLOB DoubleConversionSrc "extern/double-conversion/double-conversion/*.cc") +#add_library(double-conversion ${DoubleConversionSrc}) -+#set_property(TARGET double-conversion PROPERTY CXX_STANDARD 14) ++#set_property(TARGET double-conversion PROPERTY CXX_STANDARD 17) # glad library, an OpenGL loader add_library(glad -@@ -93,7 +90,7 @@ target_link_libraries(libcurv_geom PUBLIC imgui) +@@ -100,7 +101,7 @@ if (MSYS) + set( LibOpenVDB "openvdb" ) + set( LibHalf "Half" ) + else () +- set( LibOpenVDB "openvdb_static" ) ++ #set( LibOpenVDB "openvdb_static" ) + set( LibHalf "" ) + endif () - file(GLOB Src "curv/*.c" "curv/*.cc") - add_executable(curv ${Src}) --target_link_libraries(curv PUBLIC libcurv_geom libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion boost_iostreams boost_filesystem boost_system openvdb_static Half tbb dl pthread) -+target_link_libraries(curv PUBLIC libcurv_geom libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion boost_iostreams boost_filesystem boost_system openvdb Imath tbb dl pthread) +@@ -194,9 +195,9 @@ if (NOT DEFINED MSYS) + add_library(dummy cmake/dummy.cc) + add_library(Blosc::blosc ALIAS dummy) + add_library(TBB::tbb ALIAS dummy) +- add_subdirectory(extern/openvdb/openvdb/openvdb EXCLUDE_FROM_ALL) +- set_property(TARGET openvdb_static PROPERTY CXX_STANDARD 14) +- add_subdirectory(extern/googletest/googletest EXCLUDE_FROM_ALL) ++ #add_subdirectory(extern/openvdb/openvdb/openvdb EXCLUDE_FROM_ALL) ++ #set_property(TARGET openvdb_static PROPERTY CXX_STANDARD 14) ++ #add_subdirectory(extern/googletest/googletest EXCLUDE_FROM_ALL) + endif () - file(GLOB CurvcSrc "curvc/*.cc") - add_executable(curvc EXCLUDE_FROM_ALL ${CurvcSrc}) -@@ -128,5 +125,3 @@ if (NOT TARGET uninstall) - endif() - - add_subdirectory(extern/googletest/googletest EXCLUDE_FROM_ALL) --add_subdirectory(extern/openvdb/openvdb EXCLUDE_FROM_ALL) -add_subdirectory(extern/glfw EXCLUDE_FROM_ALL) ++#add_subdirectory(extern/glfw EXCLUDE_FROM_ALL)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110030854.1938siDt002504>