diff options
| author | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2021-01-20 11:38:15 +0000 |
|---|---|---|
| committer | Ganael LAPLANCHE <martymac@FreeBSD.org> | 2021-01-20 11:38:15 +0000 |
| commit | f1154d1cc589b86fc9da72333a76550ebf1d58d4 (patch) | |
| tree | 97acad778ac6b55f6e30dfebe0fd81c8d9c45861 /graphics/instant-meshes | |
| parent | 3e618182e627b52f9cc004af69043051512d14f4 (diff) | |
| download | freebsd-ports-f1154d1cc589b86fc9da72333a76550ebf1d58d4.zip | |
Use internal tbb to facilitate oneTbb transition
PR: 252766
Submitted by: greg@unrelenting.technology
Approved by: greg@unrelenting.technology (maintainer)
Diffstat (limited to 'graphics/instant-meshes')
| -rw-r--r-- | graphics/instant-meshes/Makefile | 6 | ||||
| -rw-r--r-- | graphics/instant-meshes/distinfo | 12 | ||||
| -rw-r--r-- | graphics/instant-meshes/files/patch-CMakeLists.txt | 20 |
3 files changed, 8 insertions, 30 deletions
diff --git a/graphics/instant-meshes/Makefile b/graphics/instant-meshes/Makefile index b44cc99a9d8e..b6081480e793 100644 --- a/graphics/instant-meshes/Makefile +++ b/graphics/instant-meshes/Makefile @@ -3,7 +3,7 @@ PORTNAME= instant-meshes DISTVERSION= 0.0-42 DISTVERSIONSUFFIX= -g4a083f4 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics MAINTAINER= greg@unrelenting.technology @@ -13,8 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= convert:graphics/ImageMagick6 -LIB_DEPENDS= libglfw.so:graphics/glfw \ - libtbb.so:devel/tbb +LIB_DEPENDS= libglfw.so:graphics/glfw RUN_DEPENDS= zenity:x11/zenity USES= cmake compiler:c++14-lang eigen:3 gl localbase:ldflags \ @@ -24,6 +23,7 @@ GH_ACCOUNT= wjakob GH_TUPLE= wjakob:nanogui:2a61f03:nanogui/ext/nanogui \ wjakob:nanovg:ac15b84:nanovg/ext/nanogui/ext/nanovg \ wjakob:dset:7967ef0:dset/ext/dset \ + wjakob:tbb:141b0e3:tbb/ext/tbb \ wjakob:pcg32:0ef13e6:pcg32/ext/pcg32 \ wjakob:pss:a91da33:pss/ext/pss # x11-toolkits/nanogui should be a port dependency, but current versions aren't compatible USE_GL= gl diff --git a/graphics/instant-meshes/distinfo b/graphics/instant-meshes/distinfo index f2d2b4127db4..43d9cdad6f37 100644 --- a/graphics/instant-meshes/distinfo +++ b/graphics/instant-meshes/distinfo @@ -1,17 +1,15 @@ -TIMESTAMP = 1514447413 +TIMESTAMP = 1611061576 SHA256 (wjakob-instant-meshes-0.0-42-g4a083f4_GH0.tar.gz) = 8fbde93e36a8f8007463b6a34c15b755e3bb9856944f63a61773708021396e10 SIZE (wjakob-instant-meshes-0.0-42-g4a083f4_GH0.tar.gz) = 3001873 SHA256 (wjakob-nanogui-2a61f03_GH0.tar.gz) = 449ec1c4510377a651de5357b18b7540f9cc4bbf2cac6b1b36d28ceff045a6b3 SIZE (wjakob-nanogui-2a61f03_GH0.tar.gz) = 2420569 -SHA256 (wjakob-glfw-0ff30d6_GH0.tar.gz) = 31bd08bd1d8061a3f62ff970561994b6c90d2db7ab955134cef71ee0eda5d165 -SIZE (wjakob-glfw-0ff30d6_GH0.tar.gz) = 471108 SHA256 (wjakob-nanovg-ac15b84_GH0.tar.gz) = b7971a9c4ae472c39190ed6b24d98622fec3ace0e744362fa8b540dba212a4ff SIZE (wjakob-nanovg-ac15b84_GH0.tar.gz) = 2014793 -SHA256 (pybind-pybind11-c01a1c1_GH0.tar.gz) = 84cd4dc4c0b703a43d8d547c8ddadcf30d3c26e45e3a1565bd9d5ef5040fcf7d -SIZE (pybind-pybind11-c01a1c1_GH0.tar.gz) = 360503 -SHA256 (wjakob-pcg32-0ef13e6_GH0.tar.gz) = 4043b476e24158b5fc157428f2c09eea342a8f03e77fa9d57609e220e8605b9e -SIZE (wjakob-pcg32-0ef13e6_GH0.tar.gz) = 5320 SHA256 (wjakob-dset-7967ef0_GH0.tar.gz) = 5f9361a6760b327cacbe77e9260bc3b121c35ff740c61d235aff7079efaa4423 SIZE (wjakob-dset-7967ef0_GH0.tar.gz) = 2492 +SHA256 (wjakob-tbb-141b0e3_GH0.tar.gz) = 896f7c8c316d649dd30efbc784b7bf459bcdd47d7ded15bafb63a48bd63b74b6 +SIZE (wjakob-tbb-141b0e3_GH0.tar.gz) = 2638233 +SHA256 (wjakob-pcg32-0ef13e6_GH0.tar.gz) = 4043b476e24158b5fc157428f2c09eea342a8f03e77fa9d57609e220e8605b9e +SIZE (wjakob-pcg32-0ef13e6_GH0.tar.gz) = 5320 SHA256 (wjakob-pss-a91da33_GH0.tar.gz) = e2dc7fd87c44971ea53d0c7436daa70ae3caba77facff7b5554fdb5a3d67c1b5 SIZE (wjakob-pss-a91da33_GH0.tar.gz) = 3476 diff --git a/graphics/instant-meshes/files/patch-CMakeLists.txt b/graphics/instant-meshes/files/patch-CMakeLists.txt index 81b842a953a7..59d55df43e3d 100644 --- a/graphics/instant-meshes/files/patch-CMakeLists.txt +++ b/graphics/instant-meshes/files/patch-CMakeLists.txt @@ -26,23 +26,3 @@ # Build TBB set(TBB_BUILD_STATIC ON CACHE BOOL " " FORCE) -@@ -75,8 +75,8 @@ set(TBB_BUILD_TBBMALLOC OFF CACHE BOOL " - set(TBB_BUILD_TBBMALLOC_PROXY OFF CACHE BOOL " " FORCE) - set(TBB_BUILD_TESTS OFF CACHE BOOL " " FORCE) - --add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/tbb ext_build/tbb) --set_property(TARGET tbb_static tbb_def_files PROPERTY FOLDER "dependencies") -+#add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/tbb ext_build/tbb) -+#set_property(TARGET tbb_static tbb_def_files PROPERTY FOLDER "dependencies") - - # Compile instant meshes with various compiler warnings turned on - if(MSVC) -@@ -173,7 +173,7 @@ add_executable(InstantMeshes MACOSX_BUND - ${EXTRA_SOURCE}) - - add_definitions(${NANOGUI_EXTRA_DEFS}) --target_link_libraries(InstantMeshes tbb_static nanogui ${NANOGUI_EXTRA_LIBS}) -+target_link_libraries(InstantMeshes tbb nanogui ${NANOGUI_EXTRA_LIBS}) - - set_target_properties(InstantMeshes PROPERTIES OUTPUT_NAME "Instant Meshes") - |