From b64521ae10456d90eabbbcd445f36f29f2630c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Fri, 21 Jun 2024 20:27:20 +0200 Subject: [PATCH] ci/openbsd: bump to 7.5 and remove libplacebo subproject The available version is enough now. --- .github/workflows/build.yml | 7 ++++--- ci/build-openbsd.sh | 7 +------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b7e221227..6145c56b9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -413,10 +413,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Test in OpenBSD VM - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@v0.24.0 with: operating_system: openbsd - version: '7.4' + version: '7.5' run: | sudo pkg_add -U \ cmake \ @@ -428,6 +428,7 @@ jobs: libcdio-paranoia \ libdvdnav \ libiconv \ + libplacebo \ libv4l \ libxkbcommon \ luajit \ @@ -454,7 +455,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Test in FreeBSD VM - uses: cross-platform-actions/action@v0.23.0 + uses: cross-platform-actions/action@v0.24.0 with: operating_system: freebsd version: '14.0' diff --git a/ci/build-openbsd.sh b/ci/build-openbsd.sh index 20df568cd1..b48de5020e 100755 --- a/ci/build-openbsd.sh +++ b/ci/build-openbsd.sh @@ -1,14 +1,9 @@ #!/bin/sh set -e -# libplacebo on openBSD is too old; use a subproject +# FFmpeg on openBSD (4.4.4) is too old; use a subproject rm -rf subprojects mkdir -p subprojects -git clone https://code.videolan.org/videolan/libplacebo.git \ - --recurse-submodules --shallow-submodules \ - --depth=1 --recurse-submodules subprojects/libplacebo - -# FFmpeg on openBSD (4.4.4) is too old; use a subproject cat < subprojects/ffmpeg.wrap [wrap-git] url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git