mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Fix API version usage

Browse source 
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.
This commit is contained in:
Jonas Ådahl 2017-05-11 16:23:29 +08:00 • committed by Wim Taymans
parent 3b33e3d362
commit 1d8504565a
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
meson.build
View file

@ -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

12
pinos/modules/meson.build
View file

@ -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],
)

2
pkgconfig/libpinos.pc.in
View file

@ -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