From ee3cfc5cc425dd96c1979049823c604bc3e9d348 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Mon, 23 Dec 2024 18:54:24 +0100 Subject: [PATCH] meson: Add and enable dav1d for AV1 decoding --- .gitignore | 1 + meson.build | 2 +- src/dialog_about.cpp | 1 + subprojects/dav1d.wrap | 7 +++++++ 4 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 subprojects/dav1d.wrap diff --git a/.gitignore b/.gitignore index 932939c82..2c2bbc245 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ build*/ subprojects/boost*/ subprojects/cairo* subprojects/curl-* +subprojects/dav1d subprojects/ffmpeg subprojects/ffms2* subprojects/fontconfig* diff --git a/meson.build b/meson.build index 685a9efad..d58c9e389 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('Aegisub', ['c', 'cpp'], license: 'BSD-3-Clause', meson_version: '>=0.57.0', - default_options: ['cpp_std=c++20', 'buildtype=debugoptimized', 'harfbuzz:icu=disabled'], + default_options: ['cpp_std=c++20', 'buildtype=debugoptimized', 'harfbuzz:icu=disabled', 'ffmpeg:libdav1d=enabled'], version: '3.4.0') cmake = import('cmake') diff --git a/src/dialog_about.cpp b/src/dialog_about.cpp index 6ff0d64ba..bc769b3ce 100644 --- a/src/dialog_about.cpp +++ b/src/dialog_about.cpp @@ -104,6 +104,7 @@ void ShowAboutDialog(wxWindow *parent) { #ifdef WITH_FFMS2 " FFmpeg - Copyright (c) Fabrice Bellard;\n" " FFMS2 - Copyright (c) Fredrik Mellbin;\n" + " dav1d - Copyright (c) VideoLAN and dav1d authors;\n" #endif #ifdef WITH_AVISYNTH " Avisynth 2.5 - Copyright (c) Ben Rudiak-Gould et al;\n" diff --git a/subprojects/dav1d.wrap b/subprojects/dav1d.wrap new file mode 100644 index 000000000..9b8ebf872 --- /dev/null +++ b/subprojects/dav1d.wrap @@ -0,0 +1,7 @@ +[wrap-git] +directory = dav1d +url = https://github.com/videolan/dav1d.git +revision = head + +[provide] +dav1d = dav1d_dep