From 1d8504565a383c5b25a6c0cc12b0caeb8fef40c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 11 May 2017 16:23:29 +0800
Subject: [PATCH] build: Fix API version usage

It was sometimes assumed to be 0.1, sometimes 1.0, and sometimes not to
be used at all. This commit makes things consistent and so that it is
possible to link externally.
---
 meson.build               |  7 +++----
 pinos/modules/meson.build | 12 ++++++------
 pkgconfig/libpinos.pc.in  |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/meson.build b/meson.build
index fae5356b9..ad700f1bc 100644
--- a/meson.build
+++ b/meson.build
@@ -17,7 +17,7 @@ else
   pinos_version_nano = 0
 endif
 
-apiversion = '1.0'
+apiversion = '0.1'
 soversion = 0
 libversion = '@0@.@1@.0'.format(soversion, pinos_version_minor.to_int() * 100 + pinos_version_micro.to_int())
 
@@ -37,7 +37,6 @@ cdata.set('PINOS_API_VERSION', '"@0@"'.format(apiversion))
 cdata.set('PINOS_DATADIR', '"@0@/@1@"'.format(prefix, get_option('datadir')))
 cdata.set('LOCALEDIR', '"@0@/@1@"'.format(prefix, get_option('localedir')))
 cdata.set('LIBDIR', '"@0@/@1@"'.format(prefix, get_option('libdir')))
-cdata.set('PINOS_API_VERSION', '"0.1"')
 cdata.set('GETTEXT_PACKAGE', '"pinos"')
 cdata.set('PINOS_LICENSE', '"LGPL"')
 cdata.set('PINOS_PACKAGE_ORIGIN', '"Unknown package origin"')
@@ -48,8 +47,8 @@ cdata.set('PACKAGE_STRING', '"Pinos @0@"'.format(pinos_version))
 cdata.set('PACKAGE_TARNAME', '"pinos"')
 cdata.set('PACKAGE_URL', '""')
 cdata.set('PACKAGE_VERSION', '"@0@"'.format(pinos_version))
-cdata.set('PLUGINDIR', '"@0@/@1@/pinos"'.format(get_option('prefix'),get_option('libdir')))
-cdata.set('MODULEDIR', '"@0@/@1@/pinos"'.format(get_option('prefix'),get_option('libdir')))
+cdata.set('PLUGINDIR', '"@0@/@1@/pinos-@2@"'.format(get_option('prefix'),get_option('libdir'),apiversion))
+cdata.set('MODULEDIR', '"@0@/@1@/pinos-@2@"'.format(get_option('prefix'),get_option('libdir'),apiversion))
 cdata.set('PINOS_CONFIG_DIR', '"@0@/etc/pinos"'.format(get_option('prefix')))
 cdata.set('VERSION', '"@0@"'.format(pinos_version))
 # FIXME: --with-memory-alignment],[8,N,malloc,pagesize (default is 32)]) option
diff --git a/pinos/modules/meson.build b/pinos/modules/meson.build
index 7df92dd29..648647597 100644
--- a/pinos/modules/meson.build
+++ b/pinos/modules/meson.build
@@ -11,7 +11,7 @@ pinos_module_flatpak = shared_library('pinos-module-flatpak', [ 'module-flatpak.
   include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
-  install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
+  install_dir : '@0@/pinos-@1@'.format(get_option('libdir'), apiversion),
   dependencies : [dbus_dep, mathlib, dl_lib, pinos_dep, pinoscore_dep],
 )
 
@@ -20,7 +20,7 @@ pinos_module_autolink = shared_library('pinos-module-autolink', [ 'module-autoli
   include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
-  install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
+  install_dir : '@0@/pinos-@1@'.format(get_option('libdir'), apiversion),
   dependencies : [mathlib, dl_lib, pinos_dep, pinoscore_dep],
 )
 
@@ -29,7 +29,7 @@ pinos_module_mixer = shared_library('pinos-module-mixer', [ 'module-mixer.c' ],
   include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
-  install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
+  install_dir : '@0@/pinos-@1@'.format(get_option('libdir'), apiversion),
   dependencies : [mathlib, dl_lib, pinos_dep, pinoscore_dep],
 )
 
@@ -38,7 +38,7 @@ pinos_module_protocol_dbus = shared_library('pinos-module-protocol-dbus', [ 'mod
   include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
-  install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
+  install_dir : '@0@/pinos-@1@'.format(get_option('libdir'), apiversion),
   dependencies : [glib_dep, gio_dep, mathlib, dl_lib, pinos_dep, pinoscore_dep],
 )
 
@@ -47,7 +47,7 @@ pinos_module_protocol_native = shared_library('pinos-module-protocol-native', [
   include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
-  install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
+  install_dir : '@0@/pinos-@1@'.format(get_option('libdir'), apiversion),
   dependencies : [mathlib, dl_lib, pinos_dep, pinoscore_dep],
 )
 
@@ -56,6 +56,6 @@ pinos_module_suspend_on_idle = shared_library('pinos-module-suspend-on-idle', [
   include_directories : [configinc, spa_inc],
   link_with : spalib,
   install : true,
-  install_dir : '@0@/pinos-0.1'.format(get_option('libdir')),
+  install_dir : '@0@/pinos-@1@'.format(get_option('libdir'), apiversion),
   dependencies : [mathlib, dl_lib, pinos_dep, pinoscore_dep],
 )
diff --git a/pkgconfig/libpinos.pc.in b/pkgconfig/libpinos.pc.in
index c41863cf3..52a5895bd 100644
--- a/pkgconfig/libpinos.pc.in
+++ b/pkgconfig/libpinos.pc.in
@@ -7,5 +7,5 @@ moduledir=@moduledir@
 Name: libpinos
 Description: Pinos Client Interface
 Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lpinos-@PINOS_MAJORMINOR@
+Libs: -L${libdir} -lpinos
 Cflags: -I${includedir} -D_REENTRANT