diff --git a/BuildLinux.sh b/BuildLinux.sh index 1461e63b8..02ec0e4e3 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -88,7 +88,7 @@ then fi # Addtional Dev packages for BambuStudio -export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules" +export REQUIRED_DEV_PACKAGES="libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules" # libwebkit2gtk-4.1-dev ?? export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w) if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then diff --git a/Containerfile b/Containerfile index 62f68463a..a44215537 100644 --- a/Containerfile +++ b/Containerfile @@ -44,7 +44,6 @@ RUN apt-get update && apt-get install -y \ libgtk-3-dev libwebkit2gtk-4.0-dev \ libsoup2.4-dev \ libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev libgstreamerd-3-dev \ - libmspack-dev \ libosmesa6-dev \ libssl3 libssl-dev libcurl4-openssl-dev libsecret-1-dev \ libudev-dev \ diff --git a/Dockerfile b/Dockerfile index 3e43313eb..58834089e 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 \ - libmspack-dev \ libosmesa6-dev \ libsecret-1-dev \ libsoup2.4-dev \ diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index 227abe185..bd4351f2a 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -45,6 +45,7 @@ bambustudio_add_cmake_project(wxWidgets ${_wx_edge} -DwxUSE_WEBVIEW_IE=OFF -DwxUSE_REGEX=builtin + -DwxUSE_LIBMSPACK=OFF -DwxUSE_LIBXPM=builtin -DwxUSE_LIBSDL=OFF -DwxUSE_XTEST=OFF