build fixings and version bump

2 files changed, 32 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8575d3c26cf5..9c3a34f9c8e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = opencascade-rc
 	pkgdesc = An object-oriented C++ class library designed for rapid production of sophisticated domain-specific CAD/CAM/CAE applications -- release candidates and dev snapshots
-	pkgver = 7.5.2
-	pkgrel = 2
+	pkgver = 7.6.0
+	pkgrel = 1
 	url = https://dev.opencascade.org/
 	arch = x86_64
 	license = LGPL
@@ -19,10 +19,9 @@ pkgbase = opencascade-rc
 	provides = opencascade
 	conflicts = opencascade
 	conflicts = opencascade-git
-	source = opencascade-rc-7.5.2.tgz::https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_5_2;sf=tgz
+	source = opencascade-rc-7.6.0.tgz::https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/V7_6_0;sf=tgz
 	source = opencascade.sh
-	sha256sums = 1a32d2b0d6d3c236163cb45139221fb198f0f3cdad56606c5b1c9a2a8869b3ac
+	sha256sums = e7f989d52348c3b3acb7eb4ee001bb5c2eed5250cdcceaa6ae97edc294f2cabd
 	sha256sums = 9acb2439f1f7f066c111adef5d9f34dcb19c906cc928f87b71eb194317948dfb
 
 pkgname = opencascade-rc
-
diff --git a/PKGBUILD b/PKGBUILD
index f2b42d700287..475335cde3ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Grey Christoforo <first name at last name dot net>
 
 pkgname=opencascade-rc
-_pkgver="V7_5_2"
+_pkgver="V7_6_0"
 pkgver=$(echo ${_pkgver} | sed 's,^V,,g;s,_,.,g')
-pkgrel=2
+pkgrel=1
 pkgdesc="An object-oriented C++ class library designed for rapid production of sophisticated domain-specific CAD/CAM/CAE applications -- release candidates and dev snapshots"
 arch=(x86_64)
 url="https://dev.opencascade.org/"
@@ -15,11 +15,11 @@ conflicts=(opencascade opencascade-git)
 depends=(
 tk
 vtk
-#vtk9-java
 gl2ps
 ffmpeg
 freeimage
 intel-tbb
+#openvr
 )
 
 makedepends=(
@@ -37,34 +37,37 @@ source=(
 "${pkgname}-${pkgver}.tgz::https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_pkgver};sf=tgz"
 opencascade.sh
 )
-sha256sums=('1a32d2b0d6d3c236163cb45139221fb198f0f3cdad56606c5b1c9a2a8869b3ac'
+sha256sums=('e7f989d52348c3b3acb7eb4ee001bb5c2eed5250cdcceaa6ae97edc294f2cabd'
             '9acb2439f1f7f066c111adef5d9f34dcb19c906cc928f87b71eb194317948dfb')
 
 prepare() {
   cd occt-${_pkgver}
 
-  curl https://src.fedoraproject.org/rpms/opencascade/raw/rawhide/f/opencascade-cmake.patch | patch -p1
+  #curl https://src.fedoraproject.org/rpms/opencascade/raw/rawhide/f/opencascade-cmake.patch | patch -p1
+
+  #curl https://raw.githubusercontent.com/archlinux/svntogit-community/packages/opencascade/trunk/vtk9.patch | patch -p1
 
   # https://tracker.dev.opencascade.org/view.php?id=32264
   #curl -L 'http://git.dev.opencascade.org/gitweb/?p=occt.git;a=patch;h=refs/heads/CR32264' | patch -p1
   
   # fix for None type build
-  #sed '/OpenCASCADECompileDefinitionsAndFlags/d' -i CMakeLists.txt
+  sed '/OpenCASCADECompileDefinitionsAndFlags/d' -i CMakeLists.txt
 
   # fix for trying to write into the system during build
-  sed 's,if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}"),if (0),g' -i CMakeLists.txt
+  #sed 's,if (EXISTS "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}"),if (0),g' -i CMakeLists.txt
 
   # fix for https://tracker.dev.opencascade.org/view.php?id=32328
-  sed 's,#include <TopoDS_Shape.hxx>,#include <TopoDS_Edge.hxx>\n#include <TopoDS_Shape.hxx>,g' -i src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx
+  #sed 's,#include <TopoDS_Shape.hxx>,#include <TopoDS_Edge.hxx>\n#include <TopoDS_Shape.hxx>,g' -i src/ShapeUpgrade/ShapeUpgrade_UnifySameDomain.hxx
 }
 
 build() {
+  cd occt-${_pkgver}
   # prevents the build from trying to write into the system
   export DESTDIR="${srcdir}/garbage"
   rm -rf "${DESTDIR}"
-
-  cmake -B build_dir -S occt-${_pkgver} -W no-dev -G Ninja \
-    -D CMAKE_BUILD_TYPE=Release \
+  
+  cmake -B build_dir -S . -W no-dev -G Ninja \
+    -D CMAKE_BUILD_TYPE=None \
     -D CMAKE_INSTALL_PREFIX='/usr' \
     -D INSTALL_DIR_CMAKE=/usr/lib/cmake/opencascade \
     -D INSTALL_TEST_CASES=OFF \
@@ -74,26 +77,31 @@ build() {
     -D USE_FREEIMAGE=ON \
     -D USE_RAPIDJSON=ON \
     -D USE_TBB=ON \
-    -D USE_GLES2=OFF \
+    -D USE_GLES2=ON \
     -D USE_VTK=ON \
-    -D INSTALL_VTK=False \
-    -D 3RDPARTY_VTK_LIBRARY_DIR=/usr/lib \
-    -D 3RDPARTY_VTK_INCLUDE_DIR=/usr/include
+    -D INSTALL_SAMPLES=ON \
+    -D INSTALL_DOC_Overview=ON \
+    -D BUILD_RESOURCES=ON \
+    -D BUILD_SAMPLES_QT=ON \
+    -D BUILD_Inspector=ON \
+    -D 3RDPARTY_QT_DIR="/usr/lib" \
+    -D 3RDPARTY_VTK_INCLUDE_DIR="/usr/include/vtk"
 
   cmake --build build_dir
   rm -rf "${DESTDIR}"
 }
 
 check() {
+  cd occt-${_pkgver}
   # prevent the current environment from skewing the testing
   unset "${!CSF@}"
   unset "${!DRAW@}"
   unset CASROOT
 
   # graphics testing does not seem to go well (some seem to stall forever)
-  rm -rf "${srcdir}"/occt-${_pkgver}/tests/bugs/vis
-  rm -rf "${srcdir}"/occt-${_pkgver}/tests/perf/vis
-  rm -rf "${srcdir}"/occt-${_pkgver}/tests/v3d
+  rm -rf tests/bugs/vis
+  rm -rf tests/perf/vis
+  rm -rf tests/v3d
 
   cd build_dir
   cp draw.sh check.sh
@@ -104,14 +112,12 @@ check() {
 
 package() {
   cd occt-${_pkgver}
-  local _installroot=/  # could put this in /opt/${pkgname}
-  export DESTDIR="${pkgdir}${_installroot}"
-  cmake --build ../build_dir -- install
+  DESTDIR="${pkgdir}" cmake --install build_dir
   
   # remove the pollution from bin
   rm -rf "${pkgdir}/usr/bin/"*.sh
   
-  install -m755 -Dt "${pkgdir}/etc/profile.d" "${srcdir}/opencascade.sh"
+  install -m644 -Dt "${pkgdir}/etc/profile.d" opencascade.sh
   install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE_LGPL_21.txt
   install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" OCCT_LGPL_EXCEPTION.txt
 }