Meson: Use pkg-config generator

diff --git a/ges/meson.build b/ges/meson.build
index 830a47e..cf835ed 100644 (file)
--- a/ges/meson.build
+++ b/ges/meson.build
@@ -183,6 +183,13 @@ libges = library('ges-1.0', ges_sources, parser, ges_resources,
     install : true,
     dependencies : libges_deps)
 
+pkgconfig.generate(libges,
+  libraries : [gst_dep, gstbase_dep, gstpbutils_dep, gstcontroller_dep],
+  subdirs : pkgconfig_subdirs,
+  name : 'gst-editing-services-1.0',
+  description : 'GStreamer Editing Services',
+)
+
 ges_gen_sources = []
 if build_gir
     ges_gir_extra_args = gir_init_section + [ '--c-include=ges/ges.h' ]
@@ -215,3 +222,5 @@ ges_dep = declare_dependency(link_with : libges,
   sources : ges_gen_sources,
   dependencies : libges_deps,
 )
+
+meson.override_dependency('gst-editing-services-1.0', ges_dep)

diff --git a/meson.build b/meson.build
index b08ee26..7d81312 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -243,13 +243,15 @@ foreach extra_arg : warning_flags
 endforeach
 
 python3 = import('python').find_installation()
+pkgconfig = import('pkgconfig')
+pkgconfig_subdirs = ['gstreamer-1.0']
+
 configinc = include_directories('.')
 subdir('ges')
 subdir('plugins')
 if not get_option('tools').disabled()
   subdir('tools')
 endif
-subdir('pkgconfig')
 subdir('tests')
 if not get_option('examples').disabled()
   subdir('examples')

diff --git a/pkgconfig/gst-editing-services-uninstalled.pc.in b/pkgconfig/gst-editing-services-uninstalled.pc.in
deleted file mode 100644 (file)
index 9cd1b61..0000000
--- a/pkgconfig/gst-editing-services-uninstalled.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-# the standard variables don't make sense for an uninstalled copy
-prefix=
-exec_prefix=
-libdir=@geslibdir@
-includedir=@abs_top_builddir@
-
-Name: gst-editing-services
-Description: GStreamer Editing Services
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-controller-@GST_API_VERSION@ gstreamer-pbutils-@GST_API_VERSION@
-Libs: -L${libdir} -lges-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@ -I@abs_top_builddir@

diff --git a/pkgconfig/gst-editing-services.pc.in b/pkgconfig/gst-editing-services.pc.in
deleted file mode 100644 (file)
index 3469e35..0000000
--- a/pkgconfig/gst-editing-services.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-
-Name: gst-editing-services
-Description: GStreamer Editing Services
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-controller-@GST_API_VERSION@ gstreamer-pbutils-@GST_API_VERSION@
-Libs: -L${libdir} -lges-@GST_API_VERSION@
-Cflags: -I${includedir}

diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
deleted file mode 100644 (file)
index a612b21..0000000
--- a/pkgconfig/meson.build
+++ /dev/null
@@ -1,33 +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('geslibdir', join_paths(meson.build_root(), libges.outdir()))
-
-pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
-
-pkg_files = ['gst-editing-services']
-
-foreach p : pkg_files
-  infile = p + '.pc.in'
-  outfile = p + '-1.0.pc'
-  configure_file(input : infile,
-    output : outfile,
-    configuration : pkgconf,
-    install_dir : pkg_install_dir)
-
-  infile = p + '-uninstalled.pc.in'
-  outfile = p + '-1.0-uninstalled.pc'
-  configure_file(input : infile,
-    output : outfile,
-    configuration : pkgconf)
-endforeach
-