diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index f45394adf1..4a29a133a1 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -97,7 +97,7 @@ jobs: libwayland-dev libxkbcommon-dev wayland-protocols extra-cmake-modules pkgconf \ libglu1-mesa-dev libcairo2-dev libgtk-3-dev libsoup2.4-dev libwebkit2gtk-${{ env.webkit-ver }}-dev \ libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev \ - gstreamer1.0-plugins-bad libosmesa6-dev wget sudo autoconf curl libunwind-dev texinfo + gstreamer1.0-plugins-bad wget sudo autoconf curl libunwind-dev texinfo - name: Build on Ubuntu if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 1102895cc0..1ae30f7b3b 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -243,7 +243,7 @@ jobs: ${{ env.apt-cmd }} install -y autoconf build-essential cmake curl eglexternalplatform-dev \ extra-cmake-modules file git libcairo2-dev libcurl4-openssl-dev libdbus-1-dev libglew-dev libglu1-mesa-dev \ libglu1-mesa-dev libgstreamer1.0-dev libgstreamerd-3-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-good1.0-dev \ - libgtk-3-dev libgtk-3-dev libmspack-dev libosmesa6-dev libsecret-1-dev libsoup2.4-dev libssl-dev libudev-dev libwayland-dev \ + libgtk-3-dev libgtk-3-dev libmspack-dev libsecret-1-dev libsoup2.4-dev libssl-dev libudev-dev libwayland-dev \ libwebkit2gtk-${{ env.webkit-ver }}-dev libxkbcommon-dev locales locales-all m4 pkgconf sudo wayland-protocols wget ${{ env.libfuse2-pkg }} - name: Install dependencies from build_linux.sh diff --git a/Dockerfile b/Dockerfile index db9bf705e1..0cc12ac2aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,6 @@ RUN apt-get update && apt-get install -y \ libgstreamer-plugins-good1.0-dev \ libgtk-3-dev \ libgtk-3-dev \ - libosmesa6-dev \ libsecret-1-dev \ libsoup2.4-dev \ libssl3 \ diff --git a/deps/GLEW/glew/README.md b/deps/GLEW/glew/README.md index bfec3064de..475c69afc8 100644 --- a/deps/GLEW/glew/README.md +++ b/deps/GLEW/glew/README.md @@ -22,7 +22,6 @@ https://github.com/nigels-com/glew * [Install build tools](#install-build-tools) * [Build](#build-1) * [Linux EGL](#linux-egl) - * [Linux OSMesa](#linux-osmesa) * [Linux mingw-w64](#linux-mingw-w64) * [Using cmake](#using-cmake) * [Install build tools](#install-build-tools-1) @@ -95,11 +94,6 @@ _Note: you may need to call `make` in the **auto** folder first_ $ sudo apt install libegl1-mesa-dev $ make SYSTEM=linux-egl -##### Linux OSMesa - - $ sudo apt install libosmesa-dev - $ make SYSTEM=linux-osmesa - ##### Linux mingw-w64 $ sudo apt install mingw-w64 @@ -140,7 +134,6 @@ RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel c | --------------- | ----------- | | BUILD_UTILS | Build the `glewinfo` and `visualinfo` executables. | | GLEW_REGAL | Build in Regal mode. | -| GLEW_OSMESA | Build in off-screen Mesa mode. | | BUILD_FRAMEWORK | Build as MacOSX Framework. Setting `CMAKE_INSTALL_PREFIX` to `/Library/Frameworks` is recommended. | ### Windows diff --git a/doc/How-to-build.md b/doc/How-to-build.md index c414bad3be..2377656e08 100644 --- a/doc/How-to-build.md +++ b/doc/How-to-build.md @@ -172,7 +172,6 @@ All required dependencies will be installed automatically by the provided shell - libgstreamerd-3-dev - libsecret-1-dev - libwebkit2gtk-4.0-dev -- libosmesa6-dev - libssl-dev - libcurl4-openssl-dev - eglexternalplatform-dev diff --git a/flatpak/io.github.softfever.OrcaSlicer.yml b/flatpak/io.github.softfever.OrcaSlicer.yml index 2f588045d3..3dde299a64 100755 --- a/flatpak/io.github.softfever.OrcaSlicer.yml +++ b/flatpak/io.github.softfever.OrcaSlicer.yml @@ -36,29 +36,6 @@ modules: url: https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.22.8.tar.xz sha256: e305b9f07f52743ca481da0a4e0c76c35efd60adaf1b0694eb3bb021e2137e39 - # For libOSMesa - - name: mesa - buildsystem: meson - config-opts: - - -Dosmesa=classic - - -Ddri-drivers=[] - - -Dgallium-drivers=[] - - -Dvulkan-drivers=[] - - -Dplatforms=[] - build-options: - arch: - aarch64: - config-opts: - - -Dlibunwind=disabled - cleanup: - - /share/drirc.d - - /include - - "*.a" - sources: - - type: archive - url: https://archive.mesa3d.org/older-versions/20.x/mesa-20.2.6.tar.xz - sha256: f12ca3c6c622f11cd79ad66b4220f04514fa96f795062fe92a37339ab19885db - - name: glu config-opts: - --disable-static diff --git a/linux.d/debian b/linux.d/debian index 121e53a3a7..cce41d74ce 100644 --- a/linux.d/debian +++ b/linux.d/debian @@ -15,7 +15,6 @@ REQUIRED_DEV_PACKAGES=( libgstreamerd-3-dev libgtk-3-dev libmspack-dev - libosmesa6-dev libsecret-1-dev libspnav-dev libssl-dev diff --git a/linux.d/fedora b/linux.d/fedora index bdfe05d567..ed91883dd9 100644 --- a/linux.d/fedora +++ b/linux.d/fedora @@ -22,7 +22,6 @@ REQUIRED_DEV_PACKAGES=( libtool m4 mesa-libGLU-devel - mesa-libOSMesa-devel ninja-build openssl-devel perl-FindBin diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index b3a28a1c6b..903b66368b 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -640,9 +640,9 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") FIND_LIBRARY(WAYLAND_EGL_LIBRARIES NAMES wayland-egl) FIND_LIBRARY(WAYLAND_CLIENT_LIBRARIES NAMES wayland-client) find_package(CURL REQUIRED) - target_link_libraries(libslic3r_gui ${DBUS_LIBRARIES} OSMesa) target_link_libraries(libslic3r_gui OpenGL::EGL + ${DBUS_LIBRARIES} ${WAYLAND_SERVER_LIBRARIES} ${WAYLAND_EGL_LIBRARIES} ${WAYLAND_CLIENT_LIBRARIES}