-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
206 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,20 @@ | ||
| #!/bin/bash | ||
|
|
||
| export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig \ | ||
| OPENMP_HEADER_DIR=${PREFIX}/include \ | ||
| OPENMP_LIB_DIR=${PREFIX}/lib \ | ||
| FREETYPE_DIR=${PREFIX} | ||
| #!/usr/bin/env bash | ||
|
|
||
| mkdir build | ||
| cd build | ||
| cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} -DOPENSSL_ROOT_DIR=${PREFIX} \ | ||
| -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS_RELEASE="-L${PREFIX}/lib" \ | ||
| -DWORKBENCH_USE_QT5=TRUE -DZLIB_ROOT=${PREFIX} -DWORKBENCH_MESA_DIR=${PREFIX} \ | ||
| -DCMAKE_PREFIX_PATH=${PREFIX} -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=True ../src | ||
| make -j ${CPU_COUNT} | ||
| make install | ||
|
|
||
| if [[ "$target_platform" == linux-* ]]; then | ||
| export CXX_FLAGS="$CXX_FLAGS -lGL -lGLU" | ||
| fi | ||
|
|
||
| cmake $CMAKE_ARGS -GNinja \ | ||
| -DCMAKE_BUILD_TYPE:STRING=Release \ | ||
| -DCMAKE_INSTALL_PREFIX:STRING=$PREFIX \ | ||
| -DCMAKE_CXX_FLAGS="$CXX_FLAGS" \ | ||
| ../src | ||
|
|
||
| cmake --build . | ||
|
|
||
| ctest --extra-verbose --output-on-failure . | ||
|
|
||
| cmake --install . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
recipes/connectome-workbench/patches/0001-Fix-unsafe-narrowing.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| From cc3d4d74235978b136f637620032595cb388933b Mon Sep 17 00:00:00 2001 | ||
| From: Chris Markiewicz <[email protected]> | ||
| Date: Mon, 14 Oct 2024 13:49:05 -0400 | ||
| Subject: [PATCH] Fix unsafe narrowing | ||
|
|
||
| --- | ||
| src/Algorithms/AlgorithmCiftiSeparate.cxx | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/src/Algorithms/AlgorithmCiftiSeparate.cxx b/src/Algorithms/AlgorithmCiftiSeparate.cxx | ||
| index 9a64a262e..f49c04e73 100644 | ||
| --- a/src/Algorithms/AlgorithmCiftiSeparate.cxx | ||
| +++ b/src/Algorithms/AlgorithmCiftiSeparate.cxx | ||
| @@ -654,7 +654,7 @@ void AlgorithmCiftiSeparate::getCroppedVolSpace(const CiftiFile* ciftiIn, const | ||
| int64_t numVoxels = (int64_t)myMap.size(); | ||
| if (numVoxels > 0) | ||
| {//make a voxel bounding box to minimize memory usage | ||
| - int extrema[6] = { myMap[0].m_ijk[0], | ||
| + int64_t extrema[6] = { myMap[0].m_ijk[0], | ||
| myMap[0].m_ijk[0], | ||
| myMap[0].m_ijk[1], | ||
| myMap[0].m_ijk[1], | ||
| @@ -699,7 +699,7 @@ void AlgorithmCiftiSeparate::getCroppedVolSpaceAll(const CiftiFile* ciftiIn, con | ||
| int64_t numVoxels = (int64_t)myMap.size(); | ||
| if (numVoxels > 0) | ||
| {//make a voxel bounding box to minimize memory usage | ||
| - int extrema[6] = { myMap[0].m_ijk[0], | ||
| + int64_t extrema[6] = { myMap[0].m_ijk[0], | ||
| myMap[0].m_ijk[0], | ||
| myMap[0].m_ijk[1], | ||
| myMap[0].m_ijk[1], | ||
| -- | ||
| 2.45.2 | ||
|
|
24 changes: 24 additions & 0 deletions
24
recipes/connectome-workbench/patches/0001-Import-cstdint-into-libCZI.h.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| From 28d007d44f4683ce430e8b29d184977ff488007c Mon Sep 17 00:00:00 2001 | ||
| From: Chris Markiewicz <[email protected]> | ||
| Date: Sun, 13 Oct 2024 11:29:03 -0400 | ||
| Subject: [PATCH] Import cstdint into libCZI.h | ||
|
|
||
| --- | ||
| src/CZIlib/CZI/libCZI.h | 1 + | ||
| 1 file changed, 1 insertion(+) | ||
|
|
||
| diff --git a/src/CZIlib/CZI/libCZI.h b/src/CZIlib/CZI/libCZI.h | ||
| index 7799f1aec..6a5c3e047 100644 | ||
| --- a/src/CZIlib/CZI/libCZI.h | ||
| +++ b/src/CZIlib/CZI/libCZI.h | ||
| @@ -22,6 +22,7 @@ | ||
|
|
||
| #pragma once | ||
|
|
||
| +#include <cstdint> | ||
| #include "ImportExport.h" | ||
|
|
||
| #include "priv_guiddef.h" | ||
| -- | ||
| 2.45.2 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| mesa-libGL | ||
| mesa-dri-drivers | ||
| libXdamage | ||
| libXxf86vm | ||
| libXext |