[setup] Update cloud packaging for EGL (#22197)

Add ubuntu dependency on libegl1 so that it can be dlopen'd. Remove xvfb from deepnote.
RobotLocomotion · Nov 18, 2024 · b4da271 · b4da271
1 parent e4144f7
commit b4da271
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 65 deletions.
diff --git a/doc/_pages/release_playbook.md b/doc/_pages/release_playbook.md
@@ -230,11 +230,9 @@ the email address associated with your github account.
       with your github account; otherwise, the file is read-only).
       1. For reference, the typical content is thus:
          ```
-         FROM robotlocomotion/drake:jammy-20230518
+         FROM robotlocomotion/drake:jammy-20241114
 
-         RUN apt-get -q update && apt-get -q install -y --no-install-recommends nginx-light xvfb && apt-get -q clean
-
-         ENV DISPLAY=:1
+         RUN apt-get -q update && apt-get -q install -y --no-install-recommends nginx-light && apt-get -q clean
 
          ENV PATH="/opt/drake/bin:${PATH}" \
            PYTHONPATH="/opt/drake/lib/python3.10/site-packages:${PYTHONPATH}"
@@ -258,9 +256,7 @@ the email address associated with your github account.
    ```
    %%bash
    /opt/drake/share/drake/setup/deepnote/install_nginx
-   /opt/drake/share/drake/setup/deepnote/install_xvfb
    ```
-   In case the display server is not working later on, this might be a good place to double-check.
    For Jammy we also needed to add ``cd /work`` atop the stanza that checks for
    ``requirements.txt`` to get it working again.
 5. Copy the updated tutorials from the pinned Dockerfile release

diff --git a/setup/BUILD.bazel b/setup/BUILD.bazel
@@ -48,9 +48,7 @@ install_files(
         ],
         "//tools/cc_toolchain:linux": [
             "deepnote/install_nginx",
-            "deepnote/install_xvfb",
             "deepnote/nginx-meshcat-proxy.conf",
-            "deepnote/xvfb",
             "ubuntu/binary_distribution/install_prereqs.sh",
             "ubuntu/binary_distribution/packages-jammy.txt",
             "ubuntu/binary_distribution/packages-noble.txt",

diff --git a/setup/deepnote/README.md b/setup/deepnote/README.md
@@ -2,9 +2,6 @@ The nginx-related files are used by pydrake.geometry.SetupMeshcat() to
 configure a Deepnote notebook to allow for MeshCat traffic to flow.  Refer
 to the implementation in bindings/pydrake/_geometry_extra.py for details.
 
-The xvfb-related files are used to launch an X display suitable for Drake's
-image rendering simulations.
-
 Even though these files are used on Ubuntu- or Debian-based systems,
 we don't place them under drake/setup/ubuntu/... because they are not
 relevant to most Drake users on Ubuntu -- they are only useful for the

diff --git a/setup/deepnote/install_xvfb b/setup/deepnote/install_xvfb
diff --git a/setup/deepnote/xvfb b/setup/deepnote/xvfb
diff --git a/setup/ubuntu/binary_distribution/packages-jammy.txt b/setup/ubuntu/binary_distribution/packages-jammy.txt
@@ -1,6 +1,7 @@
 default-jre
 jupyter-notebook
 libblas-dev
+libegl1
 libeigen3-dev
 libgfortran5
 libglib2.0-0

diff --git a/setup/ubuntu/binary_distribution/packages-noble.txt b/setup/ubuntu/binary_distribution/packages-noble.txt
@@ -1,6 +1,7 @@
 default-jre
 jupyter-notebook
 libblas-dev
+libegl1
 libeigen3-dev
 libgfortran5
 libglib2.0-0

diff --git a/tools/wheel/content/INSTALLATION b/tools/wheel/content/INSTALLATION
@@ -2,11 +2,11 @@
 For Ubuntu 22.04, install these additional libraries:
 
     sudo apt-get install --no-install-recommends \
-      libx11-6 libsm6 libglib2.0-0
+      libegl1 libx11-6 libsm6 libglib2.0-0
 
 For Ubuntu 24.04, install these additional libraries:
 
     sudo apt-get install --no-install-recommends \
-      libx11-6 libsm6 libglib2.0-0t64
+      libegl1 libx11-6 libsm6 libglib2.0-0t64
 
 For macOS, ensure that you're using Homebrew Python (not Apple's system Python).