ci/openbsd: bump to 7.7 and remove ffmpeg subproject
This commit is contained in:
1 parent
43e83dc74b
commit
1d1535ff91
2 files changed
+3
-21
No files matched your search
@@ -419,10 +419,10 @@ jobs:
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: Test in OpenBSD VM
|
||||
uses: cross-platform-actions/[email protected]7.0
|
||||
uses: cross-platform-actions/[email protected]8.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/[email protected]7.0
|
||||
uses: cross-platform-actions/[email protected]8.0
|
||||
with:
|
||||
operating_system: freebsd
|
||||
version: '14.2'
|
||||
|
||||
@@ -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 <<EOF > 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 \
|
||||
|
||||
Reference in new issue
Block a user