From 4cb519e24094a052c41f783e21340dbc8b958425 Mon Sep 17 00:00:00 2001
From: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Date: Thu, 31 Mar 2022 11:04:40 +0900
Subject: [PATCH] meson: aggregate and move extra gir to metadata part

This commit refactors duplicated entries for depended gir name to reduce
difference of each meson configuration.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
---
 src/ctl/meson.build     | 7 +++----
 src/hwdep/meson.build   | 7 +++----
 src/meson.build         | 5 +++++
 src/rawmidi/meson.build | 7 +++----
 src/seq/meson.build     | 8 +++-----
 src/timer/meson.build   | 7 +++----
 6 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/ctl/meson.build b/src/ctl/meson.build
index e050c01..0e86b22 100644
--- a/src/ctl/meson.build
+++ b/src/ctl/meson.build
@@ -38,6 +38,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for control interface in asound.h'
 
+gir_includes = common_gir_includes
+
 # For test.
 build_dirs += {'alsactl': meson.current_build_dir()}
 
@@ -111,10 +113,7 @@ alsactl_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-  ],
+  includes: gir_includes,
   header: 'alsactl.h',
   install: true,
 )
diff --git a/src/hwdep/meson.build b/src/hwdep/meson.build
index 9f80be9..45941a2 100644
--- a/src/hwdep/meson.build
+++ b/src/hwdep/meson.build
@@ -30,6 +30,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for HwDep interface in asound.h'
 
+gir_includes = common_gir_includes
+
 # For test.
 build_dirs += {'alsahwdep': meson.current_build_dir()}
 
@@ -103,10 +105,7 @@ alsahwdep_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-  ],
+  includes: gir_includes,
   header: 'alsahwdep.h',
   install: true,
 )
diff --git a/src/meson.build b/src/meson.build
index b76e5f5..d6f8ab2 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -8,6 +8,11 @@ libudev_dependency = dependency('libudev')
 gnome = import('gnome')
 pkg = import('pkgconfig')
 
+common_gir_includes = [
+    'GLib-2.0',
+    'GObject-2.0',
+]
+
 build_dirs = {}
 
 subdir('ctl')
diff --git a/src/rawmidi/meson.build b/src/rawmidi/meson.build
index 70b445b..69d4d82 100644
--- a/src/rawmidi/meson.build
+++ b/src/rawmidi/meson.build
@@ -35,6 +35,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for RawMidi interface in asound.h'
 
+gir_includes = common_gir_includes
+
 # For test.
 build_dirs += {'alsarawmidi': meson.current_build_dir()}
 
@@ -108,10 +110,7 @@ alsarawmidi_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-  ],
+  includes: gir_includes,
   header: 'alsarawmidi.h',
   install: true,
 )
diff --git a/src/seq/meson.build b/src/seq/meson.build
index e98a071..e5402db 100644
--- a/src/seq/meson.build
+++ b/src/seq/meson.build
@@ -69,6 +69,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for sequencer interface in asequencer.h'
 
+gir_includes = [common_gir_includes, alsatimer_gir[0]]
+
 # For test.
 build_dirs += {'alsaseq': meson.current_build_dir()}
 
@@ -142,11 +144,7 @@ alsaseq_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-    alsatimer_gir[0],
-  ],
+  includes: gir_includes,
   header: 'alsaseq.h',
   install: true,
 )
diff --git a/src/timer/meson.build b/src/timer/meson.build
index c033619..0c60f2e 100644
--- a/src/timer/meson.build
+++ b/src/timer/meson.build
@@ -50,6 +50,8 @@ dependencies = [
 
 pc_desc = 'GObject instrospection library for timer interface in asound.h'
 
+gir_includes = common_gir_includes
+
 # For test.
 build_dirs += {'alsatimer': meson.current_build_dir()}
 
@@ -123,10 +125,7 @@ alsatimer_gir = gnome.generate_gir(library,
   identifier_prefix: namespace,
   export_packages: name,
   dependencies: dependencies,
-  includes: [
-    'GLib-2.0',
-    'GObject-2.0',
-  ],
+  includes: gir_includes,
   header: 'alsatimer.h',
   install: true,
 )
-- 
2.47.3