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

Revert "Drop api version suffix from library name"

Browse source 
This reverts commit 76ab7eb9fb.
This commit is contained in:
Wim Taymans 2018-07-27 11:24:41 +02:00
parent 76ab7eb9fb
commit a223a35a5b
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
meson.build
View file

@ -28,7 +28,7 @@ pipewire_libdir = join_paths(prefix, get_option('libdir'))
pipewire_localedir = join_paths(prefix, get_option('localedir')) pipewire_localedir = join_paths(prefix, get_option('localedir'))
pipewire_sysconfdir = join_paths(prefix, get_option('sysconfdir')) pipewire_sysconfdir = join_paths(prefix, get_option('sysconfdir'))
modules_install_dir = join_paths(get_option('libdir'), 'pipewire') modules_install_dir = join_paths(get_option('libdir'), 'pipewire-@0@'.format(apiversion))
gnome = import('gnome') gnome = import('gnome')
@ -54,7 +54,7 @@ cdata.set('PACKAGE_STRING', '"PipeWire @0@"'.format(pipewire_version))
cdata.set('PACKAGE_TARNAME', '"pipewire"') cdata.set('PACKAGE_TARNAME', '"pipewire"')
cdata.set('PACKAGE_URL', '"http://pipewire.org"') cdata.set('PACKAGE_URL', '"http://pipewire.org"')
cdata.set('PACKAGE_VERSION', '"@0@"'.format(pipewire_version)) cdata.set('PACKAGE_VERSION', '"@0@"'.format(pipewire_version))
cdata.set('MODULEDIR', '"@0@/pipewire"'.format(pipewire_libdir)) cdata.set('MODULEDIR', '"@0@/pipewire-@1@"'.format(pipewire_libdir,apiversion))
cdata.set('PIPEWIRE_CONFIG_DIR', '"@0@/pipewire"'.format(pipewire_sysconfdir)) cdata.set('PIPEWIRE_CONFIG_DIR', '"@0@/pipewire"'.format(pipewire_sysconfdir))
cdata.set('VERSION', '"@0@"'.format(pipewire_version)) cdata.set('VERSION', '"@0@"'.format(pipewire_version))
cdata.set('PLUGINDIR', '"@0@/spa"'.format(pipewire_libdir)) cdata.set('PLUGINDIR', '"@0@/spa"'.format(pipewire_libdir))

2
pkgconfig/libpipewire.pc.in
View file

@ -7,5 +7,5 @@ moduledir=@moduledir@
Name: libpipewire Name: libpipewire
Description: PipeWire Interface Description: PipeWire Interface
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lpipewire Libs: -L${libdir} -lpipewire-@PIPEWIRE_API_VERSION@
Cflags: -I${includedir} -D_REENTRANT Cflags: -I${includedir} -D_REENTRANT

2
pkgconfig/meson.build
View file

@ -17,7 +17,7 @@ pkg_files = [
foreach p : pkg_files foreach p : pkg_files
infile = p + '.pc.in' infile = p + '.pc.in'
outfile = p + '.pc' outfile = p + '-0.1.pc'
configure_file(input : infile, configure_file(input : infile,
output : outfile, output : outfile,
configuration : pkgconf, configuration : pkgconf,

6
src/modules/spa/meson.build
View file

@ -9,7 +9,7 @@ pipewire_module_spa_monitor = shared_library('pipewire-module-spa-monitor',
include_directories : [configinc, spa_inc], include_directories : [configinc, spa_inc],
link_with : spalib, link_with : spalib,
install : true, install : true,
install_dir : '@0@/pipewire'.format(get_option('libdir')), install_dir : '@0@/pipewire-0.1'.format(get_option('libdir')),
dependencies : [mathlib, dl_lib, pipewire_dep], dependencies : [mathlib, dl_lib, pipewire_dep],
) )
@ -19,7 +19,7 @@ pipewire_module_spa_node = shared_library('pipewire-module-spa-node',
include_directories : [configinc, spa_inc], include_directories : [configinc, spa_inc],
link_with : spalib, link_with : spalib,
install : true, install : true,
install_dir : '@0@/pipewire'.format(get_option('libdir')), install_dir : '@0@/pipewire-0.1'.format(get_option('libdir')),
dependencies : [mathlib, dl_lib, pipewire_dep], dependencies : [mathlib, dl_lib, pipewire_dep],
) )
@ -29,6 +29,6 @@ pipewire_module_spa_node_factory = shared_library('pipewire-module-spa-node-fact
include_directories : [configinc, spa_inc], include_directories : [configinc, spa_inc],
link_with : spalib, link_with : spalib,
install : true, install : true,
install_dir : '@0@/pipewire'.format(get_option('libdir')), install_dir : '@0@/pipewire-0.1'.format(get_option('libdir')),
dependencies : [mathlib, dl_lib, pipewire_dep], dependencies : [mathlib, dl_lib, pipewire_dep],
) )

2
src/pipewire/meson.build
View file

@ -74,7 +74,7 @@ libpipewire_c_args = [
'-D_POSIX_C_SOURCE', '-D_POSIX_C_SOURCE',
] ]
libpipewire = shared_library('pipewire', pipewire_sources, libpipewire = shared_library('pipewire-@0@'.format(apiversion), pipewire_sources,
version : libversion, version : libversion,
soversion : soversion, soversion : soversion,
c_args : libpipewire_c_args, c_args : libpipewire_c_args,