From c0911c66278d4fc974d16280a6b54ea8f91b4f93 Mon Sep 17 00:00:00 2001 From: Jeremy Nimmer Date: Wed, 11 Oct 2023 12:13:49 -0700 Subject: [PATCH] [setup] Add nasm to source prereqs (#20353) This will be required to build libjpeg-turbo from source. --- setup/mac/source_distribution/Brewfile | 1 + setup/ubuntu/source_distribution/packages-focal.txt | 1 + setup/ubuntu/source_distribution/packages-jammy.txt | 1 + tools/wheel/image/packages-focal | 1 + tools/wheel/image/packages-macos | 1 + 5 files changed, 5 insertions(+) diff --git a/setup/mac/source_distribution/Brewfile b/setup/mac/source_distribution/Brewfile index 3b2ef9276c41..75aa2317e1e4 100644 --- a/setup/mac/source_distribution/Brewfile +++ b/setup/mac/source_distribution/Brewfile @@ -2,3 +2,4 @@ # vi: set ft=ruby : brew 'bazelisk' +brew 'nasm' diff --git a/setup/ubuntu/source_distribution/packages-focal.txt b/setup/ubuntu/source_distribution/packages-focal.txt index 8f8ecd860108..4389302846e9 100644 --- a/setup/ubuntu/source_distribution/packages-focal.txt +++ b/setup/ubuntu/source_distribution/packages-focal.txt @@ -17,6 +17,7 @@ libopengl-dev libtinyxml-dev libtool libx11-dev +nasm ocl-icd-opencl-dev opencl-headers openssh-client diff --git a/setup/ubuntu/source_distribution/packages-jammy.txt b/setup/ubuntu/source_distribution/packages-jammy.txt index 5f64d8534d19..54eaf1eed52e 100644 --- a/setup/ubuntu/source_distribution/packages-jammy.txt +++ b/setup/ubuntu/source_distribution/packages-jammy.txt @@ -16,6 +16,7 @@ libopengl-dev libtinyxml-dev libtool libx11-dev +nasm ocl-icd-opencl-dev opencl-headers openssh-client diff --git a/tools/wheel/image/packages-focal b/tools/wheel/image/packages-focal index 8f10df6e46e1..0a98e37775ba 100644 --- a/tools/wheel/image/packages-focal +++ b/tools/wheel/image/packages-focal @@ -10,6 +10,7 @@ gcc g++ gfortran libgfortran-7-dev +nasm yasm # Clang (for mkdoc). libclang-12-dev diff --git a/tools/wheel/image/packages-macos b/tools/wheel/image/packages-macos index d47af5976db1..245842f50f5c 100644 --- a/tools/wheel/image/packages-macos +++ b/tools/wheel/image/packages-macos @@ -2,5 +2,6 @@ # Drake itself. We assume that Drake's own prerequisites are already installed. brew 'bash' brew 'coreutils' +brew 'nasm' brew 'ninja' brew 'yasm'