Merge pull request #4599 from openscad/update-manifold

Bump manifold version to latest master.

.circleci/config.yml

@@ -87,7 +87,6 @@ jobs:
               export OPENSCAD_VERSION="$(date +%Y.%m.%d).ai${CIRCLE_BUILD_NUM}"
               if [ x"${CIRCLE_BRANCH}" = xmaster ]; then export SUFFIX=""; else export SUFFIX="_$(echo ${CIRCLE_BRANCH} | sed -e 's,pull/,PR,')"; fi
               git submodule update --init --recursive
-              ( cd submodules/manifold && git apply thrust.diff )
               mkdir build && cd build
               cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DEXPERIMENTAL=ON -DSNAPSHOT=ON -DOPENSCAD_VERSION="$OPENSCAD_VERSION" -DOPENSCAD_COMMIT="$OPENSCAD_COMMIT"
               make -j4
@@ -126,7 +125,6 @@ jobs:
               if [ x"${CIRCLE_BRANCH}" = xmaster ]; then export SUFFIX=""; else export SUFFIX="_$(echo ${CIRCLE_BRANCH} | sed -e 's,pull/,PR,')"; fi
               export PKG_CONFIG_PATH="/emsdk/upstream/emscripten/cache/sysroot/lib/pkgconfig"
               git submodule update --init --recursive
-              ( cd submodules/manifold && git apply thrust.diff )
               emcmake cmake -B ../build . \
                   -DWASM=ON \
                   -DSNAPSHOT=ON \
@@ -173,7 +171,6 @@ jobs:
     steps:
       - checkout
       - run: git submodule update --init --recursive
-      - run: ( cd submodules/manifold && git apply thrust.diff )
       - run:
           name: System Info
           command: |

.github/workflows/codeql-analysis.yml

@@ -38,9 +38,6 @@ jobs:
     - name: Submodules
       run: git submodule update --init --recursive
 
-    - name: Manifold patches
-      run: ( cd submodules/manifold && git apply thrust.diff )
-
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/linux.yml

@@ -29,8 +29,6 @@ jobs:
       uses: actions/checkout@v3
     - name: Submodules
       run: git submodule update --init --recursive
-    - name: Manifold patches
-      run: ( cd submodules/manifold && git apply thrust.diff )
     - name: Install dependencies
       run: ./scripts/travis-ci-before-install-linux.sh ${{ matrix.distro }}
     - name: Dependency fixup

README.md

@@ -135,7 +135,6 @@ To pull the various submodules (incl. the [MCAD library](https://github.com/open
 
     cd openscad
     git submodule update --init --recursive
-    ( cd submodules/manifold && git apply thrust.diff )
 
 ### Building for macOS
 

scripts/docker-build.sh

@@ -7,9 +7,7 @@
 
 test -d openscad || git clone --depth=50 --branch=master https://github.com/openscad/openscad.git openscad
 ( cd openscad; \
-  git submodule update --init --recursive; \
-  cd submodules/manifold; \
-  git apply thrust.diff )
+  git submodule update --init --recursive; )
 
 mkdir -p docker
 cat <<'EOF'> docker/Dockerfile

scripts/release-common.sh

@@ -170,7 +170,6 @@ esac
 echo "Checking pre-requisites..."
 
 git submodule update --init --recursive
-( cd submodules/manifold ; git apply thrust.diff || true )
 
 echo "Building openscad-$VERSION ($VERSIONDATE)"
 echo "  CMake args: $CMAKE_CONFIG"