prep for vendoring (#36169)

* prep for vendoring

* less stuff

* comment
pull/36170/head
Adeeb Shihadeh 2 days ago committed by GitHub
parent 852598fa0a
commit c6a2c99123
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 24
      tools/install_ubuntu_dependencies.sh
  2. 2
      tools/mac_setup.sh

@ -20,40 +20,43 @@ fi
# Install common packages # Install common packages
function install_ubuntu_common_requirements() { function install_ubuntu_common_requirements() {
$SUDO apt-get update $SUDO apt-get update
# normal stuff, mostly for the bare docker image
$SUDO apt-get install -y --no-install-recommends \ $SUDO apt-get install -y --no-install-recommends \
ca-certificates \ ca-certificates \
clang \ clang \
build-essential \ build-essential \
gcc-arm-none-eabi \
liblzma-dev \
capnproto \
libcapnp-dev \
curl \ curl \
libssl-dev \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
locales \
git \ git \
git-lfs \ git-lfs \
xvfb
# TODO: vendor the rest of these in third_party/
$SUDO apt-get install -y --no-install-recommends \
gcc-arm-none-eabi \
capnproto \
libcapnp-dev \
ffmpeg \ ffmpeg \
libavformat-dev \ libavformat-dev \
libavcodec-dev \ libavcodec-dev \
libavdevice-dev \ libavdevice-dev \
libavutil-dev \ libavutil-dev \
libavfilter-dev \ libavfilter-dev \
libbz2-dev \
libeigen3-dev \ libeigen3-dev \
libffi-dev \ libffi-dev \
libglew-dev \
libgles2-mesa-dev \ libgles2-mesa-dev \
libglfw3-dev \ libglfw3-dev \
libglib2.0-0 \ libglib2.0-0 \
libjpeg-dev \ libjpeg-dev \
libqt5charts5-dev \ libqt5charts5-dev \
libncurses5-dev \ libncurses5-dev \
libssl-dev \
libusb-1.0-0-dev \ libusb-1.0-0-dev \
libzmq3-dev \ libzmq3-dev \
libzstd-dev \ libzstd-dev \
libsqlite3-dev \ libsqlite3-dev \
locales \
opencl-headers \ opencl-headers \
ocl-icd-libopencl1 \ ocl-icd-libopencl1 \
ocl-icd-opencl-dev \ ocl-icd-opencl-dev \
@ -62,8 +65,7 @@ function install_ubuntu_common_requirements() {
libqt5svg5-dev \ libqt5svg5-dev \
libqt5serialbus5-dev \ libqt5serialbus5-dev \
libqt5x11extras5-dev \ libqt5x11extras5-dev \
libqt5opengl5-dev \ libqt5opengl5-dev
xvfb
} }
# Install Ubuntu 24.04 LTS packages # Install Ubuntu 24.04 LTS packages
@ -73,8 +75,6 @@ function install_ubuntu_lts_latest_requirements() {
$SUDO apt-get install -y --no-install-recommends \ $SUDO apt-get install -y --no-install-recommends \
g++-12 \ g++-12 \
qtbase5-dev \ qtbase5-dev \
qtchooser \
qt5-qmake \
qtbase5-dev-tools \ qtbase5-dev-tools \
python3-dev \ python3-dev \
python3-venv python3-venv

@ -34,13 +34,11 @@ fi
brew bundle --file=- <<-EOS brew bundle --file=- <<-EOS
brew "git-lfs" brew "git-lfs"
brew "zlib"
brew "capnp" brew "capnp"
brew "coreutils" brew "coreutils"
brew "eigen" brew "eigen"
brew "ffmpeg" brew "ffmpeg"
brew "glfw" brew "glfw"
brew "libarchive"
brew "libusb" brew "libusb"
brew "libtool" brew "libtool"
brew "llvm" brew "llvm"

Loading…
Cancel
Save