From 6f336227cd25017933c10da776964a3d4e52bc2f Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Mon, 29 Oct 2018 09:19:33 -0400
Subject: [PATCH] Meson: Use pkg-config generator

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server/-/merge_requests/1>
---
 gst/rtsp-server/meson.build                       |  9 +++++++++
 meson.build                                       |  3 ++-
 pkgconfig/gstreamer-rtsp-server-uninstalled.pc.in | 12 ------------
 pkgconfig/gstreamer-rtsp-server.pc.in             | 11 -----------
 pkgconfig/meson.build                             | 24 -----------------------
 5 files changed, 11 insertions(+), 48 deletions(-)
 delete mode 100644 pkgconfig/gstreamer-rtsp-server-uninstalled.pc.in
 delete mode 100644 pkgconfig/gstreamer-rtsp-server.pc.in
 delete mode 100644 pkgconfig/meson.build

diff --git a/gst/rtsp-server/meson.build b/gst/rtsp-server/meson.build
index 6e40cc6..24d7c39 100644
--- a/gst/rtsp-server/meson.build
+++ b/gst/rtsp-server/meson.build
@@ -66,6 +66,13 @@ gst_rtsp_server = library('gstrtspserver-@0@'.format(api_version),
   install : true,
   dependencies : gst_rtsp_server_deps)
 
+pkgconfig.generate(gst_rtsp_server,
+  libraries : [gst_dep],
+  subdirs : pkgconfig_subdirs,
+  name : 'gstreamer-rtsp-server-1.0',
+  description : 'GStreamer based RTSP server',
+)
+
 rtsp_server_gen_sources = []
 if build_gir
   gst_gir_extra_args = gir_init_section + ['--c-include=gst/rtsp-server/rtsp-server.h']
@@ -88,3 +95,5 @@ gst_rtsp_server_dep = declare_dependency(link_with : gst_rtsp_server,
   include_directories : rtspserver_incs,
   sources : rtsp_server_gen_sources,
   dependencies : [gstrtsp_dep, gstrtp_dep, gstsdp_dep, gstnet_dep, gstapp_dep])
+
+meson.override_dependency('gstreamer-rtsp-server-1.0', gst_rtsp_server_dep)
diff --git a/meson.build b/meson.build
index 7ffef51..6692864 100644
--- a/meson.build
+++ b/meson.build
@@ -186,6 +186,8 @@ if get_option('default_library') == 'shared'
 endif
 
 plugins = []
+pkgconfig_subdirs = ['gstreamer-1.0']
+
 subdir('gst')
 if not get_option('tests').disabled()
   subdir('tests')
@@ -193,7 +195,6 @@ endif
 if not get_option('examples').disabled()
   subdir('examples')
 endif
-subdir('pkgconfig')
 subdir('docs')
 
 # Set release date
diff --git a/pkgconfig/gstreamer-rtsp-server-uninstalled.pc.in b/pkgconfig/gstreamer-rtsp-server-uninstalled.pc.in
deleted file mode 100644
index 38e1df8..0000000
--- a/pkgconfig/gstreamer-rtsp-server-uninstalled.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-# the standard variables don't make sense for an uninstalled copy
-prefix=
-exec_prefix=
-libdir=@rtspserverlibdir@
-includedir=@abs_top_builddir@
-
-Name: gst-rtsp-server
-Description: GStreamer based RTSP server
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-plugins-base-@GST_API_VERSION@
-Libs: -L${libdir} -lgstrtspserver-@GST_API_VERSION@
-Cflags: -I@abs_top_srcdir@ -I@abs_top_builddir@
diff --git a/pkgconfig/gstreamer-rtsp-server.pc.in b/pkgconfig/gstreamer-rtsp-server.pc.in
deleted file mode 100644
index 3a1d820..0000000
--- a/pkgconfig/gstreamer-rtsp-server.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/gstreamer-@GST_API_VERSION@
-
-Name: gst-rtsp-server
-Description: GStreamer based RTSP server
-Version: @VERSION@
-Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
-Libs: -L${libdir} -lgstrtspserver-@GST_API_VERSION@
-Cflags: -I${includedir}
diff --git a/pkgconfig/meson.build b/pkgconfig/meson.build
deleted file mode 100644
index 8ed8299..0000000
--- a/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', api_version)
-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('rtspserverlibdir', join_paths(meson.build_root(), gst_rtsp_server.outdir()))
-
-pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
-
-configure_file(input : 'gstreamer-rtsp-server.pc.in',
-  output : 'gstreamer-rtsp-server-1.0.pc',
-  configuration : pkgconf,
-  install_dir : pkg_install_dir)
-
-configure_file(input : 'gstreamer-rtsp-server-uninstalled.pc.in',
-  output : 'gstreamer-rtsp-server-1.0-uninstalled.pc',
-  configuration : pkgconf)
-- 
2.7.4