From 7b22dd8bfdc380be2e4037c1207fcb30a46ad296 Mon Sep 17 00:00:00 2001
From: Sil Vilerino <sivileri@microsoft.com>
Date: Sat, 28 Oct 2023 11:07:32 -0400
Subject: [PATCH] meson: add vp9 and av1 codec support options

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26223>
---
 .gitlab-ci/meson/build.sh         | 2 +-
 .gitlab-ci/windows/mesa_build.ps1 | 2 +-
 meson.build                       | 2 +-
 meson_options.txt                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh
index 078e150f678..69657aa5607 100755
--- a/.gitlab-ci/meson/build.sh
+++ b/.gitlab-ci/meson/build.sh
@@ -87,7 +87,7 @@ meson setup _build \
       -D gallium-opencl=disabled \
       -D gallium-drivers=${GALLIUM_DRIVERS:-[]} \
       -D vulkan-drivers=${VULKAN_DRIVERS:-[]} \
-      -D video-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec \
+      -D video-codecs=h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec \
       -D werror=true \
       ${EXTRA_OPTION}
 cd _build
diff --git a/.gitlab-ci/windows/mesa_build.ps1 b/.gitlab-ci/windows/mesa_build.ps1
index a4f87c4eadb..e0c4252f87d 100644
--- a/.gitlab-ci/windows/mesa_build.ps1
+++ b/.gitlab-ci/windows/mesa_build.ps1
@@ -50,7 +50,7 @@ meson setup `
 -Dvulkan-drivers="swrast,amd,microsoft-experimental" `
 -Dgallium-drivers="swrast,d3d12,zink" `
 -Dgallium-va=enabled `
--Dvideo-codecs="h264dec,h264enc,h265dec,h265enc,vc1dec" `
+-Dvideo-codecs="h264dec,h264enc,h265dec,h265enc,vc1dec,av1dec,av1enc,vp9dec" `
 -Dshared-glapi=enabled `
 -Dgles1=enabled `
 -Dgles2=enabled `
diff --git a/meson.build b/meson.build
index 73ce657a144..e92ac428fbb 100644
--- a/meson.build
+++ b/meson.build
@@ -338,7 +338,7 @@ if with_vulkan_beta
 endif
 
 _codecs = get_option('video-codecs')
-foreach c : ['vc1dec', 'h264dec', 'h264enc', 'h265dec', 'h265enc']
+foreach c : ['vc1dec', 'h264dec', 'h264enc', 'h265dec', 'h265enc', 'av1dec', 'av1enc', 'vp9dec']
    pre_args += '-DVIDEO_CODEC_@0@=@1@'.format(c.to_upper(), _codecs.contains(c).to_int())
 endforeach
 
diff --git a/meson_options.txt b/meson_options.txt
index e885ba61a8a..adf2363c0e3 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -631,7 +631,7 @@ option(
   type : 'array',
   value : [],
   choices: [
-    'vc1dec', 'h264dec', 'h264enc', 'h265dec', 'h265enc'
+    'vc1dec', 'h264dec', 'h264enc', 'h265dec', 'h265enc', 'av1dec', 'av1enc', 'vp9dec'
   ],
   description : 'List of patent encumbered codecs to build support for. ' +
                 'Distros might want to consult their legal department before ' +