From 1d1535ff9124fdeb3c81a2f089551e2cc8404613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Michaj=C5=82ow?= Date: Thu, 22 May 2025 21:58:10 +0200 Subject: [PATCH] ci/openbsd: bump to 7.7 and remove ffmpeg subproject --- .github/workflows/build.yml | 6 +++--- ci/build-openbsd.sh | 18 ------------------ 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ab0ee96f6b..87cf754c79 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -419,10 +419,10 @@ jobs: steps: - uses: actions/checkout@v4 - name: Test in OpenBSD VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: operating_system: openbsd - version: '7.6' + version: '7.7' run: | sudo pkg_add -U \ cmake \ @@ -464,7 +464,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Test in FreeBSD VM - uses: cross-platform-actions/action@v0.27.0 + uses: cross-platform-actions/action@v0.28.0 with: operating_system: freebsd version: '14.2' diff --git a/ci/build-openbsd.sh b/ci/build-openbsd.sh index f01e5e5201..7da5f4e6e4 100755 --- a/ci/build-openbsd.sh +++ b/ci/build-openbsd.sh @@ -3,24 +3,6 @@ set -e . ./ci/build-common.sh -# FFmpeg on openBSD (4.4.4) is too old; use a subproject -rm -rf subprojects -mkdir -p subprojects -cat < subprojects/ffmpeg.wrap -[wrap-git] -url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git -revision = meson-7.1 -depth = 1 -[provide] -libavcodec = libavcodec_dep -libavdevice = libavdevice_dep -libavfilter = libavfilter_dep -libavformat = libavformat_dep -libavutil = libavutil_dep -libswresample = libswresample_dep -libswscale = libswscale_dep -EOF - meson setup build $common_args \ -Dffmpeg:vulkan=auto \ -Dffmpeg:werror=false \