From 31efd7a11c56bb78a87ebb399cdce0e19e78d44a Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Thu, 6 Aug 2020 08:00:53 -0400
Subject: [PATCH] Meson: Use pkg-config generator

---
 meson.build                                       |  1 +
 validate/gst/validate/meson.build                 |  9 +++++++++
 validate/meson.build                              |  1 -
 validate/pkgconfig/gst-validate-uninstalled.pc.in | 12 ------------
 validate/pkgconfig/gst-validate.pc.in             | 11 -----------
 validate/pkgconfig/meson.build                    | 24 -----------------------
 6 files changed, 10 insertions(+), 48 deletions(-)
 delete mode 100644 validate/pkgconfig/gst-validate-uninstalled.pc.in
 delete mode 100644 validate/pkgconfig/gst-validate.pc.in
 delete mode 100644 validate/pkgconfig/meson.build

diff --git a/meson.build b/meson.build
index 055234e..2bff5ac 100644
--- a/meson.build
+++ b/meson.build
@@ -139,6 +139,7 @@ if get_option('default_library') == 'shared'
   # If we don't build static plugins there is no need to generate pc files
   plugins_pkgconfig_install_dir = disabler()
 endif
+pkgconfig_subdirs = ['gstreamer-1.0']
 
 plugins = []
 i18n = import('i18n')
diff --git a/validate/gst/validate/meson.build b/validate/gst/validate/meson.build
index f0b6aa3..d08586f 100644
--- a/validate/gst/validate/meson.build
+++ b/validate/gst/validate/meson.build
@@ -75,6 +75,13 @@ gstvalidatetracer = library('gstvalidatetracer',
     install_dir : plugins_install_dir,
     dependencies : validate_deps)
 
+pkgconfig.generate(gstvalidate,
+  libraries : [gst_dep],
+  subdirs : pkgconfig_subdirs,
+  name : 'gst-validate-1.0',
+  description : 'Gstreamer Validate',
+)
+
 validate_gen_sources = []
 if build_gir
     gst_validate_gir_extra_args = gir_init_section + [ '--c-include=gst/validate/validate.h' ]
@@ -104,4 +111,6 @@ validate_dep = declare_dependency(link_with : gstvalidate,
   sources : validate_gen_sources
 )
 
+meson.override_dependency('gst-validate-1.0', validate_dep)
+
 pkgconfig.generate(gstvalidatetracer, install_dir : plugins_pkgconfig_install_dir)
diff --git a/validate/meson.build b/validate/meson.build
index 2b12742..84ad240 100644
--- a/validate/meson.build
+++ b/validate/meson.build
@@ -24,7 +24,6 @@ subdir('gst')
 subdir('gst-libs')
 subdir('launcher')
 subdir('tools')
-subdir('pkgconfig')
 if not get_option('tests').disabled()
   subdir('tests')
 endif
diff --git a/validate/pkgconfig/gst-validate-uninstalled.pc.in b/validate/pkgconfig/gst-validate-uninstalled.pc.in
deleted file mode 100644
index 91a7461..0000000
--- a/validate/pkgconfig/gst-validate-uninstalled.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-# the standard variables don't make sense for an uninstalled copy
-prefix=
-exec_prefix=
-libdir=@validatelibdir@
-includedir=@abs_top_builddir@
-
-Name: gst-validate
-Description: GStreamer Validate
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@
-Libs: -L${libdir} -lgstvalidate-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@ -I@abs_top_builddir@
diff --git a/validate/pkgconfig/gst-validate.pc.in b/validate/pkgconfig/gst-validate.pc.in
deleted file mode 100644
index d136fed..0000000
--- a/validate/pkgconfig/gst-validate.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-
-Name: gst-validate
-Description: Gstreamer Validate
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@
-Libs: -L${libdir} -lgstvalidate-@GST_API_VERSION@
-Cflags: -I${includedir}
diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build
deleted file mode 100644
index 5cbbe7e..0000000
--- a/validate/pkgconfig/meson.build
+++ /dev/null
@@ -1,24 +0,0 @@
-pkgconf = configuration_data()
-
-pkgconf.set('prefix', get_option('prefix'))
-pkgconf.set('exec_prefix', '${prefix}')
-pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
-pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir')))
-pkgconf.set('GST_API_VERSION', apiversion)
-pkgconf.set('VERSION', gst_version)
-
-# needed for generating -uninstalled.pc files
-pkgconf.set('abs_top_builddir', join_paths(meson.current_build_dir(), '..'))
-pkgconf.set('abs_top_srcdir', join_paths(meson.current_source_dir(), '..'))
-pkgconf.set('validatelibdir', join_paths(meson.build_root(), gstvalidate.outdir()))
-
-pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
-
-configure_file(input : 'gst-validate.pc.in',
-  output : 'gst-validate-1.0.pc',
-  configuration : pkgconf,
-  install_dir : pkg_install_dir)
-
-configure_file(input : 'gst-validate-uninstalled.pc.in',
-  output : 'gst-validate-1.0-uninstalled.pc',
-  configuration : pkgconf)
-- 
2.7.4