diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d71e413..ae14862 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: steps: - uses: actions/checkout@v4 - run: | - sudo apt-get -y install libva-dev libdrm-dev libx11-dev + sudo apt-get -y install libx11-dev - uses: astral-sh/setup-uv@v4 - run: uv python pin 3.13 - run: uv sync @@ -96,7 +96,7 @@ jobs: # libx11-dev は Ubuntu 24.04 の時に必要になる模様 - run: | sudo apt-get update - sudo apt-get -y install libva-dev libdrm-dev libx11-dev + sudo apt-get -y install libx11-dev if: ${{ matrix.platform.os == 'ubuntu' && matrix.platform.arch == 'x86_64' }} - run: | sudo apt-get -y install multistrap binutils-aarch64-linux-gnu diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml index 7c236a4..19721e0 100644 --- a/.github/workflows/e2e-test.yml +++ b/.github/workflows/e2e-test.yml @@ -44,7 +44,7 @@ jobs: # libx11-dev は Ubuntu 24.04 の時に必要になる模様 - run: | sudo apt-get update - sudo apt-get -y install libva2 libdrm2 libva-dev libdrm-dev libx11-dev portaudio19-dev + sudo apt-get -y install libva2 libdrm2 libx11-dev portaudio19-dev - name: Download openh264 run: | curl -LO http://ciscobinary.openh264.org/libopenh264-${{ env.OPENH264_VERSION }}-linux64.7.so.bz2 diff --git a/CHANGES.md b/CHANGES.md index 26f1392..eb3b100 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -74,6 +74,10 @@ - @voluntas - [UPDATE] ubuntu-latest を ubuntu-24.04 に変更する - @voluntas +- [CHANGE] CI の Ubuntu から libva と libdrm をインストールしないようにする + - @voluntas +- [CHANGE] CMakefile の依存から libva と libdrm を削除する + - @voluntas - [CHANGE] ruff と mypy と pytest はバージョンを未指定にして、常に最新版を利用するようにする - @voluntas - [CHANGE] 利用していなかった auditwheel を削除する diff --git a/CMakeLists.txt b/CMakeLists.txt index 10b45af..3c08181 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,10 +64,6 @@ find_package(nanobind CONFIG REQUIRED) if(NOT TARGET_OS STREQUAL "windows") find_package(Threads REQUIRED) endif() -if(TARGET_OS STREQUAL "ubuntu" AND NOT CMAKE_CROSSCOMPILING) - find_package(Libva REQUIRED) - find_package(Libdrm REQUIRED) -endif() nanobind_add_module(