Update to 0.7.0 branch

2 files changed, 48 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2b87dd9a5d1..7008632d8986 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ifcopenshell-git
 	pkgdesc = Open source IFC library and geometry engine. Provides static libraries, python3 wrapper and blender addon. GIT version.
-	pkgver = 210519.r1.g77a97233
+	pkgver = 211028.r5.gb46f1647
 	pkgrel = 1
 	url = http://ifcopenshell.org/
 	arch = x86_64
@@ -16,12 +16,18 @@ pkgbase = ifcopenshell-git
 	depends = python
 	depends = nlohmann-json
 	depends = libxml2
+	depends = hdf5
+	depends = libaec
+	depends = sz
+	depends = cgal-headers>=5.3
+	depends = gmp
+	depends = mpfr
 	optdepends = python-svgwrite: blender bim addon svg support
 	optdepends = python-occ-core: blender bim addon cut ifc support
 	optdepends = python-pystache: blender bim addon
 	optdepends = python-numpy: blender bim addon cut ifc support
 	optdepends = python-xmlschema: blender bim addon, bcf support
-	optdepends = python-fcl: ifcclash
+	optdepends = hpp-fcl: ifcclash
 	optdepends = python-deepdiff: ifcdiff
 	optdepends = python-pyparsing: ifcexpressparser support
 	optdepends = python-requests: blender bim addon covetool support
@@ -29,6 +35,7 @@ pkgbase = ifcopenshell-git
 	optdepends = python-odfpy: ifccobie support
 	optdepends = python-behave: python-bimtester
 	optdepends = python-isodate: blender bim addon
+	optdepends = python-olca-ipc: blender bim addon life cycle analysis support
 	provides = ifcopenshell
 	provides = blender-plugin-bim
 	provides = IfcConvert
@@ -39,9 +46,12 @@ pkgbase = ifcopenshell-git
 	provides = python-bimtester
 	provides = python-ifccsv
 	source = git+https://github.com/IfcOpenShell/IfcOpenShell.git
+	source = git+https://github.com/IfcOpenShell/svgfill.git
+	source = git+https://github.com/svgpp/svgpp.git
+	md5sums = SKIP
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = ifcopenshell-git
 
 pkgname = blender-plugin-bim-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 7caa90b7a990..5ec7bb3791b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,48 @@
 # Maintainer: Cyril Waechter <cyril[at]biminsight[dot]ch>
 # Contributor: mickele <mimocciola[at]yahoo[dot]com>
 pkgname=(ifcopenshell-git blender-plugin-bim-git)
-pkgver=210519.r1.g77a97233
+pkgver=211028.r5.gb46f1647
 pkgrel=1
 pkgdesc="Open source IFC library and geometry engine. Provides static libraries, python3 wrapper and blender addon. GIT version."
 arch=('x86_64' 'i686')
 url="http://ifcopenshell.org/"
 license=('LGPL3')
-depends=('boost-libs>=1.58.0' 'opencascade' 'icu' 'opencollada' 'python' 'nlohmann-json' 'libxml2')
+depends=('boost-libs>=1.58.0' 'opencascade' 'icu' 'opencollada' 'python' 'nlohmann-json' 'libxml2' 'hdf5' 'libaec' 'sz' 'cgal-headers>=5.3' 'gmp' 'mpfr')
 optdepends=('python-svgwrite: blender bim addon svg support'
 			'python-occ-core: blender bim addon cut ifc support'
 			'python-pystache: blender bim addon'
 			'python-numpy: blender bim addon cut ifc support'
             'python-xmlschema: blender bim addon, bcf support'
-			'python-fcl: ifcclash'
+			'hpp-fcl: ifcclash'
 			'python-deepdiff: ifcdiff'
 			'python-pyparsing: ifcexpressparser support'
 			'python-requests: blender bim addon covetool support'
 			'python-lark-parser: util, ifccsv, ifcclash support'
 			'python-odfpy: ifccobie support'
 			'python-behave: python-bimtester'
-			'python-isodate: blender bim addon')
+			'python-isodate: blender bim addon'
+			'python-olca-ipc: blender bim addon life cycle analysis support')
 makedepends=('cmake' 'boost>=1.58.0' 'swig')
 provides=('ifcopenshell' 'blender-plugin-bim' 'IfcConvert' 'IfcGeomServer' 'python-ifcpatch' 'python-ifcdiff' 'python-bcf' 'python-bimtester' 'python-ifccsv')
 conflicts=()
 replaces=()
 backup=()
-source=("git+https://github.com/IfcOpenShell/IfcOpenShell.git")
+source=("git+https://github.com/IfcOpenShell/IfcOpenShell.git"
+        "git+https://github.com/IfcOpenShell/svgfill.git"
+        "git+https://github.com/svgpp/svgpp.git")
 _blender_ver=$(blender --version | grep -Po 'Blender \K[0-9]\...')
 _python_ver=$(python --version | grep -Po 'Python \K[0-9]\..')
 
 prepare() {
   cd "${srcdir}/IfcOpenShell"
+  git submodule init
+  git config submodule.svgfill.url "${srcdir}/IfcOpenShell/src/svgfill"
+  git submodule update
+  cd "${srcdir}/IfcOpenShell/src/svgfill/"
+  git submodule init
+  git config submodule.svgpp.url "${srcdir}/IfcOpenShell/src/svgfill/3rdparty/svgpp/"
+  git submodule update
+  sed -i 's/lib_ext a/lib_ext so/' ${srcdir}/IfcOpenShell/cmake/CMakeLists.txt
 }
 
 pkgver() {
@@ -50,16 +61,22 @@ build() {
   cd "${srcdir}/IfcOpenShell/build"
 
   cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_PREFIX=/usr \
     -DOCC_INCLUDE_DIR=/usr/include/opencascade \
-	-DOCC_LIBRARY_DIR=/usr/lib \
-	-DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
-	-DLIBXML2_LIBRARIES="/usr/lib/libxml2.so.2" \
- 	-DJSON_INCLUDE_DIR=/usr/include \
-	-DGLTF_SUPPORT=On \
-	-DSWIG_EXECUTABLE="/usr/bin/swig" \
-	../cmake/
-  make
+    -DOCC_LIBRARY_DIR=/usr/lib \
+    -DHDF5_INCLUDE_DIR=/usr/include \
+    -DHDF5_LIBRARY_DIR=/usr/lib \
+    -DLIBXML2_INCLUDE_DIR=/usr/include/libxml2 \
+    -DLIBXML2_LIBRARIES="/usr/lib/libxml2.so.2" \
+    -DGMP_INCLUDE_DIR=/usr/include \
+    -DMPFR_INCLUDE_DIR=/usr/include \
+    -DGMP_LIBRARY_DIR=/usr/lib \
+    -DMPFR_LIBRARY_DIR=/usr/lib \
+    -DJSON_INCLUDE_DIR=/usr/include \
+    -DGLTF_SUPPORT=ON \
+    -DSWIG_EXECUTABLE="/usr/bin/swig" \
+    ../cmake/
+  make -j4
 }
 
 package_ifcopenshell-git() {
@@ -75,10 +92,12 @@ package_ifcopenshell-git() {
   cd "${pkgdir}/usr/lib/python${_python_ver}/site-packages/"
   cp -rf "${srcdir}/IfcOpenShell/src/ifcclash/." "./"
   cp -rf "${srcdir}/IfcOpenShell/src/ifcdiff/." "./"
-  cp -rf "${srcdir}/IfcOpenShell/src/bcf/bcf" "./"
+  cp -rf "${srcdir}/IfcOpenShell/src/bcf/src/bcf" "./"
   cp -rf "${srcdir}/IfcOpenShell/src/ifccsv/ifccsv.py" "./"
   cp -rf "${srcdir}/IfcOpenShell/src/ifcbimtester/bimtester" "./"
   cp -rf "${srcdir}/IfcOpenShell/src/ifcpatch" "./"
+  cp -rf "${srcdir}/IfcOpenShell/src/ifc4d/ifc4d" "./"
+  cp -rf "${srcdir}/IfcOpenShell/src/ifc5d/ifc5d" "./"
   python -O -m compileall "./"
 }
 
@@ -91,4 +110,4 @@ package_blender-plugin-bim-git() {
   chmod -R a+rwX "${pkgdir}/usr/share/blender/${_blender_ver}/scripts/addons/blenderbim/bim/data"
 }
 
-md5sums=('SKIP')
+md5sums=('SKIP' 'SKIP' 'SKIP')