From 7df7efdc3f58477e3bd7cd95f68c9ef2ae2319fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Fri, 12 May 2023 17:13:21 +0200
Subject: [PATCH] vulkan: minor meson clean ups

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4621>
---
 .../gst-plugins-bad/ext/vulkan/meson.build    | 13 +++++-------
 .../ext/vulkan/shaders/meson.build            | 20 +++++++++----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/subprojects/gst-plugins-bad/ext/vulkan/meson.build b/subprojects/gst-plugins-bad/ext/vulkan/meson.build
index 0b10e255f1..4471cc4940 100644
--- a/subprojects/gst-plugins-bad/ext/vulkan/meson.build
+++ b/subprojects/gst-plugins-bad/ext/vulkan/meson.build
@@ -15,7 +15,7 @@ assert(glslc.found(), 'Expected glslc to be available')
 
 subdir('shaders')
 
-vulkan_sources = [
+vulkan_sources = files(
   'gstvulkan.c',
   'gstvulkanelement.c',
   'vkcolorconvert.c',
@@ -27,22 +27,19 @@ vulkan_sources = [
   'vkupload.c',
   'vkviewconvert.c',
   'vkoverlaycompositor.c',
-]
+)
 
-vulkan_plugin_enum_headers = [
+vulkan_plugin_enum_headers = files(
   'vkviewconvert.h',
-]
+)
 
 vulkan_plugin_enums = gnome.mkenums_simple('gstvulkan-plugins-enumtypes',
     sources : vulkan_plugin_enum_headers,
     body_prefix : '#ifdef HAVE_CONFIG_H\n#include "config.h"\n#endif',
     header_prefix : '#include <gst/gst.h>')
-vulkan_plugin_enumtypes_c = vulkan_plugin_enums[0]
-vulkan_plugin_enumtypes_h = vulkan_plugin_enums[1]
-vulkan_plugin_gen_sources = [vulkan_plugin_enumtypes_h]
 
 gstvulkan_plugin = library('gstvulkan',
-  vulkan_sources, vulkan_compiled_shader_sources, vulkan_plugin_enumtypes_c, vulkan_plugin_enumtypes_h,
+  vulkan_sources, vulkan_compiled_shader_sources, vulkan_plugin_enums,
   c_args : gst_plugins_bad_args,
   objc_args : gst_plugins_bad_args,
   link_args : noseh_link_args,
diff --git a/subprojects/gst-plugins-bad/ext/vulkan/shaders/meson.build b/subprojects/gst-plugins-bad/ext/vulkan/shaders/meson.build
index 6048f631e7..ba3981b5c2 100644
--- a/subprojects/gst-plugins-bad/ext/vulkan/shaders/meson.build
+++ b/subprojects/gst-plugins-bad/ext/vulkan/shaders/meson.build
@@ -43,16 +43,14 @@ foreach shader: gst_vulkan_shader_sources
   c_shader_header = basename + '.h'
 
   compiled_shader = custom_target(spv_shader,
-                                  input: shader,
-                                  output: spv_shader,
-                                  depfile: '@PLAINNAME@.d',
-                                  command: [glslc] + glslc_build_options + [
-                                    stage_arg,
-                                    '--target-env=vulkan1.0',
-                                    '-MD', '-MF', '@DEPFILE@',
-                                    '@INPUT@',
-                                    '-o', '@OUTPUT@'
-                                  ])
+      input: shader,
+      output: spv_shader,
+      depfile: '@PLAINNAME@.d',
+      command: [glslc] + glslc_build_options + [stage_arg,
+        '--target-env=vulkan1.0',
+        '-MD', '-MF', '@DEPFILE@',
+        '@INPUT@',
+        '-o', '@OUTPUT@'])
 
   c_shader = custom_target (c_shader_source,
       input: compiled_shader,
@@ -63,7 +61,7 @@ foreach shader: gst_vulkan_shader_sources
         '--element-type=gchar',
         '--element-size=1',
         '--linebreak=8',
-        '--input', '@INPUT@', 
+        '--input', '@INPUT@',
         '--output', '@OUTPUT0@',
         '--header-output', '@OUTPUT1@'])