From 65b4df13a8ad06b35f0ab51b33206c637038ebe8 Mon Sep 17 00:00:00 2001
From: Rafostar <40623528+Rafostar@users.noreply.github.com>
Date: Sun, 7 Feb 2021 12:35:41 +0100
Subject: [PATCH] Install gstclapper libs to app named subdirectory

---
 lib/gst/clapper/meson.build | 2 ++
 lib/meson.build             | 7 +++++--
 meson.build                 | 3 ---
 pkgs/rpm/clapper.spec       | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/gst/clapper/meson.build b/lib/gst/clapper/meson.build
index ea44b1da..961d2f14 100644
--- a/lib/gst/clapper/meson.build
+++ b/lib/gst/clapper/meson.build
@@ -70,6 +70,7 @@ gstclapper = library('gstclapper-' + api_version,
   include_directories : [configinc, libsinc],
   version : libversion,
   install : true,
+  install_dir : clapper_libdir,
   dependencies : [gtk4_dep, gstbase_dep, gstvideo_dep, gstaudio_dep,
     gsttag_dep, gstpbutils_dep, libm] + gtk_deps,
 )
@@ -84,6 +85,7 @@ clapper_gir = gnome.generate_gir(gstclapper,
   includes : ['Gst-1.0', 'GstPbutils-1.0', 'GstBase-1.0', 'GstVideo-1.0',
     'GstAudio-1.0', 'GstTag-1.0'],
   install : true,
+  install_dir_typelib : join_paths(clapper_libdir, 'girepository-1.0'),
   extra_args : gir_init_section + ['-DGST_USE_UNSTABLE_API'],
   dependencies : [gstbase_dep, gstvideo_dep, gstaudio_dep,
     gsttag_dep, gstpbutils_dep]
diff --git a/lib/meson.build b/lib/meson.build
index 12c4e926..786b437b 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -7,7 +7,10 @@ libversion = meson.project_version()
 cc = meson.get_compiler('c')
 cxx = meson.get_compiler('cpp')
 
-plugins_install_dir = join_paths(get_option('libdir'), 'gstreamer-1.0')
+clapper_libdir = join_paths(
+  get_option('prefix'), get_option('libdir'), meson.project_name()
+)
+
 cdata = configuration_data()
 
 if cc.get_id() == 'msvc'
@@ -139,7 +142,7 @@ cdata.set_quoted('PACKAGE_BUGREPORT', 'https://github.com/Rafostar/clapper/issue
 cdata.set_quoted('PACKAGE_NAME', 'GStreamer Clapper Libs')
 cdata.set_quoted('GST_API_VERSION', api_version)
 cdata.set_quoted('GST_LICENSE', 'LGPL')
-cdata.set_quoted('LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
+cdata.set_quoted('LIBDIR', clapper_libdir)
 cdata.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
 
 warning_flags = [
diff --git a/meson.build b/meson.build
index 53539a00..5b47d9d3 100644
--- a/meson.build
+++ b/meson.build
@@ -15,9 +15,6 @@ if not python_bin.found()
   error('No valid python3 binary found')
 endif
 
-conf = configuration_data()
-conf.set('bindir', join_paths(get_option('prefix'), 'bin'))
-
 if get_option('clapper-lib')
   subdir('lib')
 endif
diff --git a/pkgs/rpm/clapper.spec b/pkgs/rpm/clapper.spec
index 2ee4648c..ce2b1a3e 100644
--- a/pkgs/rpm/clapper.spec
+++ b/pkgs/rpm/clapper.spec
@@ -123,10 +123,12 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
 %{_datadir}/applications/*.desktop
 %{_datadir}/metainfo/*.metainfo.xml
 %{_datadir}/gir-1.0/GstClapper-1.0.gir
-%{_libdir}/libgstclapper-1.0.so*
-%{_libdir}/girepository-1.0/GstClapper-1.0.typelib
+%{_libdir}/%{appname}/
 
 %changelog
+* Sun Feb 7 2021 Rafostar <rafostar.github@gmail.com> - 0.0.0-10
+- Install gstclapper libs to app named subdirectory
+
 * Fri Feb 5 2021 Rafostar <rafostar.github@gmail.com> - 0.0.0-9
 - Update build with gstclapper libs support