From 8f849c179ec9b8e88d974bf28f713cc873a36724 Mon Sep 17 00:00:00 2001 From: Almar Klein Date: Thu, 17 Oct 2024 13:22:23 +0200 Subject: [PATCH] Fix install of mesa drivers (#622) --- .github/workflows/ci.yml | 4 ++-- .github/workflows/screenshots.yml | 2 +- .readthedocs.yaml | 2 +- docs/start.rst | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21ae9aa5..0c496358 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -117,7 +117,7 @@ jobs: - name: Install llvmpipe and lavapipe for offscreen canvas run: | sudo apt-get update -y -qq - sudo apt install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers + sudo apt install -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers - name: Install dev dependencies run: | python -m pip install --upgrade pip @@ -189,7 +189,7 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | sudo apt-get update -y -qq - sudo apt install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers + sudo apt install -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers - name: Install dev dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml index 3a8815d4..1654518a 100644 --- a/.github/workflows/screenshots.yml +++ b/.github/workflows/screenshots.yml @@ -22,7 +22,7 @@ jobs: sudo apt-get update -y -qq sudo add-apt-repository ppa:oibaf/graphics-drivers -y sudo apt-get update -y -qq - sudo apt install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers + sudo apt install -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers - name: Install dev dependencies run: | python -m pip install --upgrade pip diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 7c3e63c8..43afffc9 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -9,7 +9,7 @@ build: python: "3.11" # If we ever want to run wgpu stuff in the doc build # apt_packages: -# - libegl1-mesa +# - libegl1-mesa-dev # - libgl1-mesa-dri # - libxcb-xfixes0-dev # - mesa-vulkan-drivers diff --git a/docs/start.rst b/docs/start.rst index 218a9ea3..dbd23e73 100644 --- a/docs/start.rst +++ b/docs/start.rst @@ -120,7 +120,7 @@ On Windows this (probably) just works via DX12. On Linux you can use LavaPipe: .. code-block:: bash sudo apt update -y -qq - sudo apt install --no-install-recommends -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers + sudo apt install --no-install-recommends -y libegl1-mesa-dev libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers The distribution's version of Lavapipe may be a bit outdated. To get a more recent version, you can use this PPA: