update iso2mesh to new releease 1.9.6
This commit is contained in:
parent
ff106cb13f
commit
43cfb52cec
|
@ -1,8 +1,8 @@
|
||||||
%global octpkg iso2mesh
|
%global octpkg iso2mesh
|
||||||
|
|
||||||
Name: octave-%{octpkg}
|
Name: octave-%{octpkg}
|
||||||
Version: 1.9.1
|
Version: 1.9.6
|
||||||
Release: 7%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A 3D surface and volumetric mesh generator for MATLAB/Octave
|
Summary: A 3D surface and volumetric mesh generator for MATLAB/Octave
|
||||||
# Main package: GPLv3+
|
# Main package: GPLv3+
|
||||||
# Meshfix: GPLv2+
|
# Meshfix: GPLv2+
|
||||||
|
@ -14,10 +14,9 @@ URL: http://iso2mesh.sf.net
|
||||||
# the following utilities are called internally by iso2mesh (stored under a private folder),
|
# the following utilities are called internally by iso2mesh (stored under a private folder),
|
||||||
# this is needed for making outputs reproducible
|
# this is needed for making outputs reproducible
|
||||||
Source0: https://github.com/fangq/iso2mesh/archive/v%{version}/%{octpkg}-%{version}.tar.gz
|
Source0: https://github.com/fangq/iso2mesh/archive/v%{version}/%{octpkg}-%{version}.tar.gz
|
||||||
Source1: https://github.com/fangq/cork/archive/v0.9/cork-0.9.tar.gz
|
Source1: https://github.com/fangq/cork/archive/v0.9.1/cork-0.9.1.tar.gz
|
||||||
Source2: https://github.com/fangq/meshfix/archive/v1.2.1/meshfix-1.2.1.tar.gz
|
Source2: https://github.com/fangq/meshfix/archive/v1.2.2/meshfix-1.2.2.tar.gz
|
||||||
Source3: http://ftp.mcs.anl.gov/pub/petsc/externalpackages/tetgen1.5.1.tar.gz
|
Source3: http://ftp.mcs.anl.gov/pub/petsc/externalpackages/tetgen1.5.1.tar.gz
|
||||||
Patch0: meshfix-remove-rpath.patch
|
|
||||||
|
|
||||||
ExcludeArch: armv7hl
|
ExcludeArch: armv7hl
|
||||||
BuildRequires: cmake CGAL-devel SuperLU-devel blas-static gcc-c++ zlib-devel octave-devel
|
BuildRequires: cmake CGAL-devel SuperLU-devel blas-static gcc-c++ zlib-devel octave-devel
|
||||||
|
@ -56,197 +55,18 @@ This package contains the demo script and sample datasets for octave-%{octpkg}.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -b 1 -n %{octpkg}-%{version}
|
%setup -q -b 1 -n %{octpkg}-%{version}
|
||||||
%setup -q -T -D -b 2 -n meshfix-1.2.1
|
%setup -q -T -D -b 2 -n meshfix-1.2.2
|
||||||
%patch0 -p1
|
|
||||||
%setup -q -T -D -b 3 -n %{octpkg}-%{version}
|
%setup -q -T -D -b 3 -n %{octpkg}-%{version}
|
||||||
rm -rf tools/cork
|
rm -rf tools/cork
|
||||||
rm -rf tools/meshfix
|
rm -rf tools/meshfix
|
||||||
rm -rf tools/tetgen
|
rm -rf tools/tetgen
|
||||||
mv ../cork-0.9 tools/cork
|
mv ../cork-0.9.1 tools/cork
|
||||||
mv ../meshfix-1.2.1 tools/meshfix
|
mv ../meshfix-1.2.2 tools/meshfix
|
||||||
mv ../tetgen1.5.1 tools/tetgen
|
mv ../tetgen1.5.1 tools/tetgen
|
||||||
rm -rf bin/*.mex* bin/*.exe bin/*.dll
|
rm -rf bin/*.mex* bin/*.exe bin/*.dll
|
||||||
|
|
||||||
cp COPYING.txt COPYING
|
cp COPYING.txt COPYING
|
||||||
|
|
||||||
cat > DESCRIPTION << EOF
|
|
||||||
Name: %{octpkg}
|
|
||||||
Version: %{version}
|
|
||||||
Date: %(date +"%Y-%d-%m")
|
|
||||||
Title: %{summary}
|
|
||||||
Author: Qianqian Fang <fangqq@gmail.com>
|
|
||||||
Maintainer: Qianqian Fang <fangqq@gmail.com>
|
|
||||||
Description: Iso2Mesh is a MATLAB/Octave-based mesh generation toolbox,
|
|
||||||
designed for easy creation of high quality surface and
|
|
||||||
tetrahedral meshes from 3D volumetric images. It contains
|
|
||||||
a rich set of mesh processing scripts/programs, working
|
|
||||||
either independently or interacting with external free
|
|
||||||
meshing utilities. Iso2Mesh toolbox can directly convert
|
|
||||||
a 3D image stack, including binary, segmented or gray-scale
|
|
||||||
images such as MRI or CT scans, into quality volumetric
|
|
||||||
meshes. This makes it particularly suitable for multi-modality
|
|
||||||
medical imaging data analysis and multi-physics modeling.
|
|
||||||
Iso2Mesh is cross-platform and is compatible with both MATLAB
|
|
||||||
and GNU Octave.
|
|
||||||
URL: %{url}
|
|
||||||
Depends: jnifti, jsonlab, zmat
|
|
||||||
Categories: Mesh
|
|
||||||
EOF
|
|
||||||
|
|
||||||
cat > INDEX << EOF
|
|
||||||
iso2mesh >> Iso2Mesh
|
|
||||||
Iso2Mesh
|
|
||||||
advancefront
|
|
||||||
barydualmesh
|
|
||||||
bbxflatsegment
|
|
||||||
binsurface
|
|
||||||
bwislands
|
|
||||||
cgals2m
|
|
||||||
cgalv2m
|
|
||||||
deislands2d
|
|
||||||
deislands3d
|
|
||||||
delendelem
|
|
||||||
deletemeshfile
|
|
||||||
edgeneighbors
|
|
||||||
elemfacecenter
|
|
||||||
elemvolume
|
|
||||||
extractloops
|
|
||||||
extrudecurve
|
|
||||||
extrudesurf
|
|
||||||
faceneighbors
|
|
||||||
fallbackexeext
|
|
||||||
fillholes3d
|
|
||||||
fillsurf
|
|
||||||
finddisconnsurf
|
|
||||||
flatsegment
|
|
||||||
getexeext
|
|
||||||
getintersecttri
|
|
||||||
getoptkey
|
|
||||||
getplanefrom3pt
|
|
||||||
getvarfrom
|
|
||||||
highordertet
|
|
||||||
i2m
|
|
||||||
imedge3d
|
|
||||||
img2mesh
|
|
||||||
innersurf
|
|
||||||
insurface
|
|
||||||
internalpoint
|
|
||||||
iso2meshver
|
|
||||||
isoctavemesh
|
|
||||||
jsonopt
|
|
||||||
latticegrid
|
|
||||||
m2v
|
|
||||||
maskdist
|
|
||||||
maxsurf
|
|
||||||
mcpath
|
|
||||||
memmapstream
|
|
||||||
mergemesh
|
|
||||||
mergestruct
|
|
||||||
mergesurf
|
|
||||||
mesh2mask
|
|
||||||
mesh2vol
|
|
||||||
meshabox
|
|
||||||
meshacylinder
|
|
||||||
meshanellip
|
|
||||||
meshasphere
|
|
||||||
meshcentroid
|
|
||||||
meshcheckrepair
|
|
||||||
meshconn
|
|
||||||
meshcylinders
|
|
||||||
meshedge
|
|
||||||
mesheuler
|
|
||||||
meshface
|
|
||||||
meshgrid5
|
|
||||||
meshgrid6
|
|
||||||
meshinterp
|
|
||||||
meshquality
|
|
||||||
meshrefine
|
|
||||||
meshremap
|
|
||||||
meshreorient
|
|
||||||
meshresample
|
|
||||||
meshunitsphere
|
|
||||||
mwpath
|
|
||||||
neighborelem
|
|
||||||
nodevolume
|
|
||||||
orderloopedge
|
|
||||||
orthdisk
|
|
||||||
outersurf
|
|
||||||
plotedges
|
|
||||||
plotmesh
|
|
||||||
plotsurf
|
|
||||||
plottetra
|
|
||||||
qmeshcut
|
|
||||||
raysurf
|
|
||||||
raytrace
|
|
||||||
readasc
|
|
||||||
readgts
|
|
||||||
readinr
|
|
||||||
readmedit
|
|
||||||
readmptiff
|
|
||||||
readnirfast
|
|
||||||
readoff
|
|
||||||
readsmf
|
|
||||||
readtetgen
|
|
||||||
remeshsurf
|
|
||||||
removedupelem
|
|
||||||
removedupnodes
|
|
||||||
removeisolatednode
|
|
||||||
removeisolatedsurf
|
|
||||||
rotatevec3d
|
|
||||||
rotmat2vec
|
|
||||||
s2m
|
|
||||||
s2v
|
|
||||||
saveabaqus
|
|
||||||
saveasc
|
|
||||||
savebinstl
|
|
||||||
savedxf
|
|
||||||
savegts
|
|
||||||
saveinr
|
|
||||||
savejmesh
|
|
||||||
savejson
|
|
||||||
savemedit
|
|
||||||
savemphtxt
|
|
||||||
savemsh
|
|
||||||
savenirfast
|
|
||||||
saveoff
|
|
||||||
savesmf
|
|
||||||
savestl
|
|
||||||
savesurfpoly
|
|
||||||
savetetgenele
|
|
||||||
savetetgennode
|
|
||||||
savevrml
|
|
||||||
smoothbinvol
|
|
||||||
smoothsurf
|
|
||||||
sms
|
|
||||||
sortmesh
|
|
||||||
surf2mesh
|
|
||||||
surf2vol
|
|
||||||
surf2volz
|
|
||||||
surfaceclean
|
|
||||||
surfacenorm
|
|
||||||
surfboolean
|
|
||||||
surfdiffuse
|
|
||||||
surfedge
|
|
||||||
surfinterior
|
|
||||||
surfpart
|
|
||||||
surfplane
|
|
||||||
surfreorient
|
|
||||||
surfseeds
|
|
||||||
surfvolume
|
|
||||||
thickenbinvol
|
|
||||||
thinbinvol
|
|
||||||
uniqedges
|
|
||||||
uniqfaces
|
|
||||||
v2m
|
|
||||||
v2s
|
|
||||||
varargin2struct
|
|
||||||
vol2mesh
|
|
||||||
vol2restrictedtri
|
|
||||||
vol2surf
|
|
||||||
volface
|
|
||||||
volmap2mesh
|
|
||||||
EOF
|
|
||||||
|
|
||||||
mkdir -p inst/
|
mkdir -p inst/
|
||||||
|
|
||||||
rm -rf base64decode base64encode fast_match_bracket gzipdecode gzipencode \
|
rm -rf base64decode base64encode fast_match_bracket gzipdecode gzipencode \
|
||||||
|
@ -268,10 +88,6 @@ sed -e "s|^\(CXXFLAGS = \).*|\1%{optflags} $RPM_LD_FLAGS|" \
|
||||||
-e "s|-O0|%{optflags} $RPM_LD_FLAGS|" \
|
-e "s|-O0|%{optflags} $RPM_LD_FLAGS|" \
|
||||||
-i tools/tetgen/makefile
|
-i tools/tetgen/makefile
|
||||||
|
|
||||||
# Fix cgal 5.1 build error
|
|
||||||
sed -e "s/Midpoint_and_length\.h>/Midpoint_placement.h>\n#include <CGAL\/Surface_mesh_simplification\/Policies\/Edge_collapse\/Edge_length_cost.h>/g" \
|
|
||||||
-i tools/cgalsimp2/edge_collapse_enriched_polyhedron.cpp
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%set_build_flags
|
%set_build_flags
|
||||||
pushd tools
|
pushd tools
|
||||||
|
@ -331,10 +147,11 @@ install -m 0755 -vp bin/* %{buildroot}%{_libexecdir}/%{octpkg}/
|
||||||
%doc sample
|
%doc sample
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Sep 04 2020 Qianqian Fang <fangqq@gmail.com> - 1.9.1-8
|
* Fri Sep 04 2020 Qianqian Fang <fangqq@gmail.com> - 1.9.6-1
|
||||||
- Fix cgal build error on F33
|
- New upstream release 1.9.6
|
||||||
|
|
||||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-7
|
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-7
|
||||||
|
- Fix cgal build error on F34
|
||||||
- Second attempt - Rebuilt for
|
- Second attempt - Rebuilt for
|
||||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue