diff --git a/.github/workflows/CreateRelease.yml b/.github/workflows/CreateRelease.yml index 9e9385470..af4e141c7 100644 --- a/.github/workflows/CreateRelease.yml +++ b/.github/workflows/CreateRelease.yml @@ -46,7 +46,7 @@ jobs: uses: jurplel/install-qt-action@v2 - name: Install dependencies run: | - sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev libcgal-dev libboost-all-dev libxerces-c-dev + sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev libcgal-dev libboost-all-dev #needed by qt 5.15 on linux sudo apt-get install libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-render-util0-dev libxcb-xinerama0-dev - name: Setup env variables diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index b04f1f678..356aa43da 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -19,7 +19,7 @@ jobs: uses: jurplel/install-qt-action@v2 - name: Install dependencies run: | - sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev libcgal-dev libboost-all-dev libxerces-c-dev + sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libgmp-dev libcgal-dev libboost-all-dev #needed by qt 5.15 on linux sudo apt-get install libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-render-util0-dev libxcb-xinerama0-dev - name: Setup env variables diff --git a/.github/workflows/LinuxSnap.yml b/.github/workflows/LinuxSnap.yml deleted file mode 100644 index c03a08c80..000000000 --- a/.github/workflows/LinuxSnap.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: LinuxSnap - -on: - workflow_dispatch - -jobs: - linux_build_snap: - name: Build MeshLab (Linux - Snap) - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - with: - submodules: true - - name: Install dependencies - run: | - #needed for some reason... - curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add - - sudo apt update - sudo apt-get install -y snapcraft - - name: Setup env variables - id: envs - run: | - echo ::set-output name=date::"$(cat ML_VERSION)" - - name: Build MeshLab Snap - run: | - snapcraft - - name: Rename Snap - run: | - mv ./meshlab*.snap ./MeshLab${{steps.envs.outputs.date}}-linux.snap - - name: Upload Meshlab Snap - uses: actions/upload-artifact@v1 - with: - name: meshlab_linux_snap - path: MeshLab${{steps.envs.outputs.date}}-linux.snap diff --git a/scripts/Linux/0_setup_env_ubuntu.sh b/scripts/Linux/0_setup_env_ubuntu.sh index 09a69516e..86ab6a703 100644 --- a/scripts/Linux/0_setup_env_ubuntu.sh +++ b/scripts/Linux/0_setup_env_ubuntu.sh @@ -4,7 +4,7 @@ # # Run this script if you never installed any of the MeshLab dependencies. -sudo apt-get update +sudo apt-get update sudo apt-get install -y qt5-default qttools5-dev-tools qtdeclarative5-dev -sudo apt-get install -y mesa-common-dev libglu1-mesa-dev libglew-dev lib3ds-dev libeigen3-dev -sudo apt-get install -y libopenctm-dev libgmp-dev libqhull-dev libcgal-dev libboost-all-dev patchelf cmake +sudo apt-get install -y mesa-common-dev libglu1-mesa-dev +sudo apt-get install -y libgmp-devlibcgal-dev libboost-all-dev patchelf cmake diff --git a/scripts/Linux/2_deploy.sh b/scripts/Linux/2_deploy.sh index a0f61fb6a..c78b00f17 100644 --- a/scripts/Linux/2_deploy.sh +++ b/scripts/Linux/2_deploy.sh @@ -35,8 +35,7 @@ $SCRIPTS_PATH/resources/linuxdeployqt $INSTALL_PATH/usr/share/applications/meshl -executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libfilter_sketchfab.so \ -executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libio_3ds.so \ -executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libio_ctm.so \ - -executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libfilter_mesh_booleans.so \ - -executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libio_e57.so + -executable=$INSTALL_PATH/usr/lib/meshlab/plugins/libfilter_mesh_booleans.so chmod +x $INSTALL_PATH/usr/bin/meshlab