diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 19 | ||||
| -rw-r--r-- | xdisp.patch | 39 |
3 files changed, 15 insertions, 55 deletions
@@ -1,13 +1,14 @@ pkgbase = minc-toolkit-v2 pkgdesc = Medical Imaging NetCDF Toolkit - pkgver = 1.9.18.1 + pkgver = 1.9.18.2 pkgrel = 1 url = https://www.mcgill.ca/bic/software/minc arch = x86_64 license = GPL3 - makedepends = git - makedepends = cmake makedepends = bc + makedepends = cmake + makedepends = gcc-fortran + makedepends = git depends = ants depends = blas depends = cblas @@ -31,12 +32,9 @@ pkgbase = minc-toolkit-v2 depends = perl depends = zlib provides = minc-toolkit - source = git+https://github.com/BIC-MNI/minc-toolkit-v2.git#tag=release-1.9.18.1 + source = git+https://github.com/BIC-MNI/minc-toolkit-v2.git#tag=release-1.9.18.2 source = FindNIFTI.patch - source = xdisp.patch sha256sums = SKIP sha256sums = bfff8b8b72c7ac39bc457709d482bb205d94c1303304ae15fd3a3299bc087b2a - sha256sums = 968c27cac3ce6698940b3aa511f6ce7ff6dadad219b24427fffdcf0ec37a2aab pkgname = minc-toolkit-v2 - @@ -1,7 +1,7 @@ # Maintainer of this PKBGUILD file: Martino Pilia <martino.pilia@gmail.com> # shellcheck disable=SC2010,SC2016 pkgname=minc-toolkit-v2 -pkgver=1.9.18.1 +pkgver=1.9.18.2 pkgrel=1 pkgdesc="Medical Imaging NetCDF Toolkit" arch=('x86_64') @@ -31,14 +31,17 @@ depends=( 'perl' 'zlib' ) -makedepends=('git' 'cmake' 'bc') +makedepends=( + 'bc' + 'cmake' + 'gcc-fortran' + 'git' +) provides=('minc-toolkit') source=("git+https://github.com/BIC-MNI/minc-toolkit-v2.git#tag=release-${pkgver}" - 'FindNIFTI.patch' - 'xdisp.patch') + 'FindNIFTI.patch') sha256sums=('SKIP' - 'bfff8b8b72c7ac39bc457709d482bb205d94c1303304ae15fd3a3299bc087b2a' - '968c27cac3ce6698940b3aa511f6ce7ff6dadad219b24427fffdcf0ec37a2aab') + 'bfff8b8b72c7ac39bc457709d482bb205d94c1303304ae15fd3a3299bc087b2a') _itk=$(ls /opt/insight-toolkit4/lib/cmake | grep -m1 ITK) _install_prefix="/usr/share/minc" @@ -85,9 +88,6 @@ prepare() { 's/enum {false=0, true=1};//' \ minctools/progs/mincdump/mincdump.h - # Fix link error due to multiple symbol definitions - (cd "${srcdir}/${pkgname}/xdisp" && git apply "${srcdir}/xdisp.patch") - rm -rf build mkdir build cd build @@ -97,6 +97,7 @@ prepare() { -DCMAKE_INSTALL_PREFIX:PATH="${_install_prefix}" \ -DCMAKE_CXX_FLAGS='-fdiagnostics-color=always' \ -DCMAKE_C_FLAGS='-fdiagnostics-color=always' \ + -DLIBMINC_USE_SYSTEM_NIFTI:BOOL=ON \ -DMT_BUILD_ABC:BOOL=ON \ -DMT_BUILD_ANTS:BOOL=OFF \ -DMT_BUILD_C3D:BOOL=ON \ diff --git a/xdisp.patch b/xdisp.patch deleted file mode 100644 index 64a39cdf6932..000000000000 --- a/xdisp.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/EZWGL-1.50/lib/EZ_Widget.h b/EZWGL-1.50/lib/EZ_Widget.h -index 33f3ca9..5011814 100644 ---- a/EZWGL-1.50/lib/EZ_Widget.h -+++ b/EZWGL-1.50/lib/EZ_Widget.h -@@ -4282,8 +4282,8 @@ EXTERN char *EZ_ConfigureOptionTypes[]; - #endif - - #ifndef _EZ_WIDGET_RAWXWIN_C_ --EZ_ResourceHandle *EZ_WResourceHandles[EZ_TOTAL_NUMBER_OF_WIDGETS]; --EZ_ResourceHandle *EZ_ApplicationResourceHandle; -+EXTERN EZ_ResourceHandle *EZ_WResourceHandles[EZ_TOTAL_NUMBER_OF_WIDGETS]; -+EXTERN EZ_ResourceHandle *EZ_ApplicationResourceHandle; - #endif - - /************************************************************************* -diff --git a/xdisp.h b/xdisp.h -index 553afc2..ba786ab 100644 ---- a/xdisp.h -+++ b/xdisp.h -@@ -121,7 +121,7 @@ WHERE ulong ol_pixvals[5]; - WHERE XColor ol_fg, ol_bg1, ol_bg2, ol_bg3, ol_white; - - /* EZ Widget stuff */ --EZ_Widget *File_Selector_Widget, *File_Save_Widget, -+WHERE EZ_Widget *File_Selector_Widget, *File_Save_Widget, - *Info_Widget, *Mincheader_Widget, *Info_Close_Button, - *Help_Widget, *Help_Text_Widget, *Help_Close_Button, - *Error_Widget, *Error_Text_Widget, *Error_Close_Button, -@@ -545,8 +545,8 @@ WHERE void draw_slider(XWIN *p_xwin, int state); - /* Function prototypes */ - - /* global stuff */ --Volume_Info minc_volume_info; --int minc_icvid; -+WHERE Volume_Info minc_volume_info; -+WHERE int minc_icvid; - - WHERE int slider_image[MAX_VAR_DIMS-2], slider_length[MAX_VAR_DIMS-2]; - WHERE int image_number, num_images, image_increment, current_dim; |