Don't unnecessarily install packages on Linux

Author: cbjeukendrup

buildscripts/ci/linux/setup.sh

@@ -60,83 +60,36 @@ fi
 ##########################################################################
 
 apt_packages=(
-  coreutils
+  # Alphabetical order please!
   curl
   desktop-file-utils # installs `desktop-file-validate` for appimagetool
-  gawk
-  git
   lcov
-  libasound2-dev
-  libcups2-dev
-  libfontconfig1-dev
-  libfreetype6-dev
-  libgcrypt20-dev
-  libgl1-mesa-dev
-  libglib2.0-dev
   libgpgme-dev # install for appimagetool
-  libjack-dev
-  libnss3-dev
-  libportmidi-dev
-  libpulse-dev
-  librsvg2-dev
   libsndfile1-dev
-  libssl-dev
-  libtool
-  make
   p7zip-full
-  sed
-  software-properties-common # installs `add-apt-repository`
   unzip
   wget
   zsync # installs `zsyncmake` for appimagetool
   )
 
-# MuseScore compiles without these but won't run without them
-apt_packages_runtime=(
-  # Alphabetical order please!
-  libdbus-1-3
-  libegl1-mesa-dev
-  libgles2-mesa-dev
-  libodbc2
-  libpq-dev
-  libssl-dev
-  libxcomposite-dev
-  libxcursor-dev
-  libxi-dev
-  libxkbcommon-x11-0
-  libxrandr2
-  libxtst-dev
-  libdrm-dev
-  libxcb-icccm4
-  libxcb-image0
-  libxcb-keysyms1
-  libxcb-randr0
-  libxcb-render-util0
-  libxcb-xinerama0
-  libxcb-xkb-dev
-  libxkbcommon-dev
-  libopengl-dev
-  libvulkan-dev
-  )
-
 apt_packages_ffmpeg=(
   ffmpeg
   libavcodec-dev
   libavformat-dev
   libswscale-dev
   )
 
-apt_packages_pw_deps=(
-  libdbus-1-dev
-  libudev-dev
-  )
+if $BUILD_PIPEWIRE ; then
+  apt_packages+=(
+    libdbus-1-dev
+    libudev-dev
+    )
+fi
 
 $SUDO apt-get update
 $SUDO apt-get install -y --no-install-recommends \
   "${apt_packages[@]}" \
-  "${apt_packages_runtime[@]}" \
-  "${apt_packages_ffmpeg[@]}" \
-  "${apt_packages_pw_deps[@]}"
+  "${apt_packages_ffmpeg[@]}"
 
 ##########################################################################
 # GET TOOLS

buildscripts/ci/withoutqt/setup.sh

@@ -41,64 +41,16 @@ echo "echo 'Setup MuseScore build environment'" >> $ENV_FILE
 # GET DEPENDENCIES
 ##########################################################################
 
-# DISTRIBUTION PACKAGES
-
-# These are installed by default on Travis CI, but not on Docker
-apt_packages_basic=(
-  # Alphabetical order please!
-  file
-  git
-  software-properties-common # installs `add-apt-repository`
-  unzip
-  p7zip-full
-  )
-
-# These are the same as on Travis CI
-apt_packages_standard=(
+apt_packages=(
   # Alphabetical order please!
   curl
-  libasound2-dev 
-  libfontconfig1-dev
-  libfreetype6-dev
-  libfreetype6
-  libgl1-mesa-dev
-  libjack-dev
-  libnss3-dev
-  libportmidi-dev
-  libpulse-dev
-  libsndfile1-dev
-  make
+  p7zip-full
+  unzip
   wget
   )
 
-# MuseScore compiles without these but won't run without them
-apt_packages_runtime=(
-  # Alphabetical order please!
-  libcups2
-  libdbus-1-3
-  libegl1-mesa-dev
-  libodbc1
-  libpq-dev
-  libxcomposite-dev
-  libxcursor-dev
-  libxi-dev
-  libxkbcommon-x11-0
-  libxrandr2
-  libxtst-dev
-  libdrm-dev
-  libxcb-icccm4
-  libxcb-image0
-  libxcb-keysyms1
-  libxcb-randr0
-  libxcb-render-util0
-  libxcb-xinerama0
-  )
-
-sudo apt-get update # no package lists in Docker image
-sudo apt-get install -y --no-install-recommends \
-  "${apt_packages_basic[@]}" \
-  "${apt_packages_standard[@]}" \
-  "${apt_packages_runtime[@]}" 
+sudo apt-get update
+sudo apt-get install -y --no-install-recommends "${apt_packages[@]}"
 
 
 ##########################################################################