diff --git a/deal.II-toolchain/packages/opencascade.package b/deal.II-toolchain/packages/opencascade.package index 061504a5..e0d00171 100644 --- a/deal.II-toolchain/packages/opencascade.package +++ b/deal.II-toolchain/packages/opencascade.package @@ -10,37 +10,28 @@ fi if [ ${CANDI_OPENCASCADE_LOAD_TARBALL} = ON ]; then # download release tarball - VERSION=0.18.3 - CHECKSUM=c553d6a7bf52f790abc3b6bb7a1e91a65947e92a426bb1a88a11960c31f0966c - CHECKSUM="${CHECKSUM} 452c8e26a469e8b0ba6cdd800848a0b406648b1b" - CHECKSUM="${CHECKSUM} 1686393c8493bbbb2f3f242330b33cba" + VERSION=7_7_1 + CHECKSUM=e2a211e6e89c685802581ecfbda5ee94 # VERSION=0.18.2 # CHECKSUM=6dfd68e459e2c62387579888a867281f - # VERSION=0.18.1 - # CHECKSUM=2a7597f4243ee1f03245aeeb02d00956 - - # VERSION=0.17 - # CHECKSUM=f1a89395c4b0d199bea3db62b85f818d - - NAME=OCE-${VERSION} - SOURCE=https://github.com/tpaviot/oce/archive/ - EXTRACTSTO=oce-OCE-${VERSION} + NAME=V${VERSION} + SOURCE=https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/ + EXTRACTSTO=OCCT-${VERSION} PACKING=.tar.gz else # download git repository (huge download) # checkout specific release version - VERSION=master - #VERSION=OCE-0.18.3 - #VERSION=OCE-0.18.2 + #VERSION=master + VERSION=V7_7_1 # set up git repository - NAME=oce.git + NAME=OCCT.git PACKING=git - EXTRACTSTO=OCE-${VERSION} - SOURCE=https://github.com/tpaviot/ + EXTRACTSTO=opencascade-OCCT-${VERSION} + SOURCE=https://github.com/Open-Cascade-SAS/ fi unset CANDI_OPENCASCADE_LOAD_TARBALL @@ -49,27 +40,20 @@ BUILDCHAIN=cmake BUILDDIR=${BUILD_PATH}/${EXTRACTSTO} INSTALL_PATH=${INSTALL_PATH}/${EXTRACTSTO} -CONFOPTS="\ - -D OCE_INSTALL_PREFIX=${INSTALL_PATH} \ - -D OCE_VISUALISATION:BOOL=OFF \ - -D OCE_DISABLE_TKSERVICE_FONT:BOOL=ON \ - -D OCE_DATAEXCHANGE:BOOL=ON \ - -D OCE_OCAF:BOOL=OFF \ - -D OCE_DISABLE_X11:BOOL=ON" - -package_specific_patch () { - cd ${UNPACK_PATH}/${EXTRACTSTO} - cecho ${WARN} "applying patch for missing xlocale.h for glibc v2.26 and above" - patch -p0 --forward < ${ORIG_DIR}/${PROJECT}/patches/oce-xlocale.patch || true - cecho ${WARN} "applying patch for isfinite" - patch -p0 --forward < ${ORIG_DIR}/${PROJECT}/patches/oce-isfinite.patch -} - package_specific_register () { export OPENCASCADE_DIR=${INSTALL_PATH} export CASROOT=${INSTALL_PATH} } +CONFOPTS="\ + -D USE_TK=OFF \ + -D USE_FREETYPE=OFF \ + -D USE_XLIB=OFF \ + -D USE_VTK=OFF \ + -D USE_OPENGL=OFF \ + -D USE_GLES2=OFF \ + -D BUILD_MODULE_Draw=OFF" + package_specific_conf () { # Generate configuration file CONFIG_FILE=${CONFIGURATION_PATH}/${NAME} diff --git a/deal.II-toolchain/patches/oce-isfinite.patch b/deal.II-toolchain/patches/oce-isfinite.patch deleted file mode 100644 index 1811187d..00000000 --- a/deal.II-toolchain/patches/oce-isfinite.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/OSD/OSD.cxx 2022-02-11 14:34:21.726133403 -0500 -+++ src.patched/OSD/OSD.cxx 2022-02-11 14:33:27.025817808 -0500 -@@ -18,7 +18,7 @@ - #include - #ifdef WNT - # define finite _finite --#elif defined(isfinite) -+#else - # define finite isfinite - #endif - diff --git a/deal.II-toolchain/patches/oce-xlocale.patch b/deal.II-toolchain/patches/oce-xlocale.patch deleted file mode 100644 index fc63531b..00000000 --- a/deal.II-toolchain/patches/oce-xlocale.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -u -r -N src.patched/Standard/Standard_CLocaleSentry.hxx src/Standard/Standard_CLocaleSentry.hxx ---- src.patched/Standard/Standard_CLocaleSentry.hxx 2017-08-11 07:51:11.000000000 +0200 -+++ src/Standard/Standard_CLocaleSentry.hxx 2017-10-23 10:53:43.571058000 +0200 -@@ -29,9 +29,11 @@ - #define HAVE_XLOCALE_H - #endif - -- //! We check _GNU_SOURCE for glibc extensions here and it is always defined by g++ compiler. -+ //! We check _GNU_SOURCE for glibc <= v2.25 extensions here and it is always defined by g++ compiler. - #if defined(_GNU_SOURCE) && !defined(__ANDROID__) -- #define HAVE_XLOCALE_H -+ #if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ <= 25 -+ #define HAVE_XLOCALE_H -+ #endif - #endif - #endif // ifndef HAVE_LOCALE_H - diff --git a/deal.II-toolchain/platforms/supported/debian.platform b/deal.II-toolchain/platforms/supported/debian.platform index a5f9ccfd..99be8087 100644 --- a/deal.II-toolchain/platforms/supported/debian.platform +++ b/deal.II-toolchain/platforms/supported/debian.platform @@ -7,6 +7,7 @@ # openmpi-bin openmpi-common libopenmpi-dev cmake subversion git \ # libblas-dev liblapack-dev libblas3 liblapack3 splint tcl tcl-dev \ # environment-modules libsuitesparse-dev libtool libboost-all-dev \ +# libgl1-mesa-dev libegl1-mesa-dev \ # qt4-dev-tools libgmp-dev # # Then reboot and run candi again. diff --git a/deal.II-toolchain/platforms/supported/ubuntu.platform b/deal.II-toolchain/platforms/supported/ubuntu.platform index a8c3f783..f5da5ba5 100644 --- a/deal.II-toolchain/platforms/supported/ubuntu.platform +++ b/deal.II-toolchain/platforms/supported/ubuntu.platform @@ -7,6 +7,7 @@ # build-essential autoconf automake cmake libtool gfortran python3 \ # libboost-all-dev zlib1g-dev \ # openmpi-bin openmpi-common libopenmpi-dev \ +# libgl1-mesa-dev libegl1-mesa-dev \ # libblas3 libblas-dev liblapack3 liblapack-dev libsuitesparse-dev # # Then run candi again.