diff options
| author | sfan5 <sfan5@live.de> | 2023-11-28 22:25:57 +0100 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2023-11-29 20:36:37 +0100 |
| commit | 7dff735241b2c2f1aa540362f18a2698d3859ed8 (patch) | |
| tree | c14114a31ba5153bab719a439d5f8d017e357350 /ci | |
| parent | c69e3415d240cb2eb2ca94885b05fe3581854586 (diff) | |
| download | mpv-7dff735241b2c2f1aa540362f18a2698d3859ed8.tar.bz2 mpv-7dff735241b2c2f1aa540362f18a2698d3859ed8.tar.xz | |
ci: remove dvbin from freebsd run
As it is now, the FreeBSD CI is failing because meson can't find the
dvb headers.
FreeBSD puts the relevant headers into /usr/local which is bothersome
and in fact required a workaround to be added to the Wayland detection
already (3bdf702b1de8b0d0e0fb700b234b0fc69e04a630) but this should be
addressed by us adding the path to CFLAGS already.
With a more minimal example the detection works fine in my FreeBSD VM.
I'm at my wits end debugging this so just disable it for now.
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/build-freebsd.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ci/build-freebsd.sh b/ci/build-freebsd.sh index 51ff124cc4..c393fb25fe 100755 --- a/ci/build-freebsd.sh +++ b/ci/build-freebsd.sh @@ -5,6 +5,8 @@ export CFLAGS="$CFLAGS -isystem/usr/local/include" export CXXFLAGS="$CXXFLAGS -isystem/usr/local/include" export LDFLAGS="$LDFLAGS -L/usr/local/lib" +# TODO: readd -Ddvbin=enabled + meson setup build \ --werror \ -Dc_args="-Wno-error=deprecated -Wno-error=deprecated-declarations" \ @@ -18,7 +20,6 @@ meson setup build \ -Dvdpau=enabled \ -Dvulkan=enabled \ -Doss-audio=enabled \ - $(pkg info -q v4l_compat && echo -Ddvbin=enabled) \ $(pkg info -q libdvdnav && echo -Ddvdnav=enabled) \ $(pkg info -q libcdio-paranoia && echo -Dcdda=enabled) \ $(pkg info -q pipewire && echo -Dpipewire=enabled) \ |