From c99afb87422f1ada02340a0e633486f96db8e546 Mon Sep 17 00:00:00 2001 From: voluntas Date: Fri, 13 Dec 2024 19:16:24 +0900 Subject: [PATCH 1/3] =?UTF-8?q?libva/libdrm=20=E3=82=92=E8=A8=80=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E3=82=93=E5=89=8A=E9=99=A4=E3=81=97=E3=81=A6=E3=83=93?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=97=E3=81=A6=E3=81=BF=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- CMakeLists.txt | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d71e413..427f34c 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 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( From 13fe815bc00a9ecb23600be3c9061cef4f06643c Mon Sep 17 00:00:00 2001 From: voluntas Date: Fri, 13 Dec 2024 19:19:03 +0900 Subject: [PATCH 2/3] =?UTF-8?q?libdrm=20/=20libva=20=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 2 +- .github/workflows/e2e-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 427f34c..ae14862 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 From 17b06a7edb17292cc2d55ad069efa81c0187fc2c Mon Sep 17 00:00:00 2001 From: voluntas Date: Fri, 13 Dec 2024 19:28:05 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E5=B1=A5=E6=AD=B4?= =?UTF-8?q?=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) 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 を削除する