Unified · Split
| @@ -356,13 +356,13 @@ jobs: · 355 unmodified lines | |||
| 356 | run: | | 356 | run: | |
| 357 | cat ./build/meson-logs/meson-log.txt | 357 | cat ./build/meson-logs/meson-log.txt |
| 358 | 358 | ||
| 359 | linux-ffmpeg-4-4: | 359 | linux-ffmpeg-6-1: |
| 360 | runs-on: ubuntu-latest | 360 | runs-on: ubuntu-latest |
| 361 | container: | 361 | container: |
| 362 | # We want to test ffmpeg 4.4 which alpine 3.15 has exactly. | 362 | # We want to test ffmpeg 6.1.1 which alpine 3.19 has exactly. |
| 363 | # Furthermore, this is a very minimal build of mpv without commonly | 363 | # Furthermore, this is a very minimal build of mpv without commonly |
| 364 | # used features to test build compatibility. Musl is a nice bonus as well | 364 | # used features to test build compatibility. Musl is a nice bonus as well |
| 365 | image: alpine:3.15 | 365 | image: alpine:3.19 |
| 366 | steps: | 366 | steps: |
| 367 | - uses: actions/checkout@v4 | 367 | - uses: actions/checkout@v4 |
| 368 | - name: Install dependencies | 368 | - name: Install dependencies |
| @@ -383,10 +383,9 @@ jobs: · 14 unmodified lines | |||
| 383 | libxrandr-dev \ | 383 | libxrandr-dev \ |
| 384 | libxpresent-dev \ | 384 | libxpresent-dev \ |
| 385 | libxscrnsaver-dev \ | 385 | libxscrnsaver-dev \ |
| 386 | meson \ | ||
| 386 | musl-dev \ | 387 | musl-dev \ |
| 387 | py3-pip \ | ||
| 388 | samurai | 388 | samurai |
| 389 | pip install meson | ||
| 390 | 389 | ||
| 391 | - name: Build with meson | 390 | - name: Build with meson |
| 392 | id: build | 391 | id: build |
| @@ -8,7 +8,24 @@ git clone https://code.videolan.org/videolan/libplacebo.git \ · 7 unmodified lines | |||
| 8 | --recurse-submodules --shallow-submodules \ | 8 | --recurse-submodules --shallow-submodules \ |
| 9 | --depth=1 --recurse-submodules subprojects/libplacebo | 9 | --depth=1 --recurse-submodules subprojects/libplacebo |
| 10 | 10 | ||
| 11 | # FFmpeg on openBSD (4.4.4) is too old; use a subproject | ||
| 12 | cat <<EOF > subprojects/ffmpeg.wrap | ||
| 13 | [wrap-git] | ||
| 14 | url = https://gitlab.freedesktop.org/gstreamer/meson-ports/ffmpeg.git | ||
| 15 | revision = meson-6.1 | ||
| 16 | depth = 1 | ||
| 17 | [provide] | ||
| 18 | libavcodec = libavcodec_dep | ||
| 19 | libavdevice = libavdevice_dep | ||
| 20 | libavfilter = libavfilter_dep | ||
| 21 | libavformat = libavformat_dep | ||
| 22 | libavutil = libavutil_dep | ||
| 23 | libswresample = libswresample_dep | ||
| 24 | libswscale = libswscale_dep | ||
| 25 | EOF | ||
| 26 | |||
| 11 | meson setup build \ | 27 | meson setup build \ |
| 28 | -Dffmpeg:vulkan=auto \ | ||
| 12 | -Dlibmpv=true \ | 29 | -Dlibmpv=true \ |
| 13 | -Dlua=enabled \ | 30 | -Dlua=enabled \ |
| 14 | -Dopenal=enabled \ | 31 | -Dopenal=enabled \ |
| @@ -19,12 +19,12 @@ source_root = meson.project_source_root() · 18 unmodified lines | |||
| 19 | python = find_program('python3') | 19 | python = find_program('python3') |
| 20 | 20 | ||
| 21 | # ffmpeg | 21 | # ffmpeg |
| 22 | libavcodec = dependency('libavcodec', version: '>= 58.134.100') | 22 | libavcodec = dependency('libavcodec', version: '>= 60.31.102') |
| 23 | libavfilter = dependency('libavfilter', version: '>= 7.110.100') | 23 | libavfilter = dependency('libavfilter', version: '>= 9.12.100') |
| 24 | libavformat = dependency('libavformat', version: '>= 58.76.100') | 24 | libavformat = dependency('libavformat', version: '>= 60.16.100') |
| 25 | libavutil = dependency('libavutil', version: '>= 56.70.100') | 25 | libavutil = dependency('libavutil', version: '>= 58.29.100') |
| 26 | libswresample = dependency('libswresample', version: '>= 3.9.100') | 26 | libswresample = dependency('libswresample', version: '>= 4.12.100') |
| 27 | libswscale = dependency('libswscale', version: '>= 5.9.100') | 27 | libswscale = dependency('libswscale', version: '>= 7.5.100') |
| 28 | 28 | ||
| 29 | libplacebo = dependency('libplacebo', version: '>=6.338.2', | 29 | libplacebo = dependency('libplacebo', version: '>=6.338.2', |
| 30 | default_options: ['default_library=static', 'demos=false']) | 30 | default_options: ['default_library=static', 'demos=false']) |
| @@ -669,7 +669,7 @@ if features['libarchive'] · 638 unmodified lines | |||
| 669 | 'stream/stream_libarchive.c') | 669 | 'stream/stream_libarchive.c') |
| 670 | endif | 670 | endif |
| 671 | 671 | ||
| 672 | libavdevice = dependency('libavdevice', version: '>= 58.13.100', required: get_option('libavdevice')) | 672 | libavdevice = dependency('libavdevice', version: '>= 60.3.100', required: get_option('libavdevice')) |
| 673 | features += {'libavdevice': libavdevice.found()} | 673 | features += {'libavdevice': libavdevice.found()} |
| 674 | if features['libavdevice'] | 674 | if features['libavdevice'] |
| 675 | dependencies += libavdevice | 675 | dependencies += libavdevice |