diff --git a/meson.build b/meson.build index 7630fef83..5ecc46c8f 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ else pipewire_version_nano = 0 endif -spaversion = '0.1' +spaversion = '0.2' apiversion = '0.3' soversion = 0 libversion = '@0@.@1@.0'.format(soversion, pipewire_version_minor.to_int() * 100 + pipewire_version_micro.to_int()) @@ -32,7 +32,7 @@ pipewire_sysconfdir = join_paths(prefix, get_option('sysconfdir')) pipewire_configdir = join_paths(pipewire_sysconfdir, 'pipewire') modules_install_dir = join_paths(pipewire_libdir, 'pipewire-@0@'.format(apiversion)) -spa_plugindir = join_paths(pipewire_libdir, 'spa') +spa_plugindir = join_paths(pipewire_libdir, 'spa-@0@'.format(spaversion)) gnome = import('gnome') pkgconfig = import('pkgconfig') diff --git a/spa/plugins/alsa/meson.build b/spa/plugins/alsa/meson.build index 8442e645e..703b6bee7 100644 --- a/spa/plugins/alsa/meson.build +++ b/spa/plugins/alsa/meson.build @@ -12,4 +12,4 @@ spa_alsa = shared_library('spa-alsa', include_directories : [spa_inc], dependencies : [ alsa_dep, libudev_dep, mathlib, ], install : true, - install_dir : '@0@/spa/alsa'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'alsa')) diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build index 8c76016e5..69a499882 100644 --- a/spa/plugins/audioconvert/meson.build +++ b/spa/plugins/audioconvert/meson.build @@ -82,7 +82,7 @@ audioconvertlib = shared_library('spa-audioconvert', dependencies : [ mathlib ], link_with : simd_dependencies, install : true, - install_dir : '@0@/spa/audioconvert/'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'audioconvert')) test_lib = static_library('test_lib', ['test-source.c' ], diff --git a/spa/plugins/audiomixer/meson.build b/spa/plugins/audiomixer/meson.build index 4312566f8..374e2949a 100644 --- a/spa/plugins/audiomixer/meson.build +++ b/spa/plugins/audiomixer/meson.build @@ -53,4 +53,4 @@ audiomixerlib = shared_library('spa-audiomixer', include_directories : [spa_inc], dependencies : [ mathlib ], install : true, - install_dir : '@0@/spa/audiomixer/'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'audiomixer')) diff --git a/spa/plugins/audiotestsrc/meson.build b/spa/plugins/audiotestsrc/meson.build index d4ffc9de9..613c039ab 100644 --- a/spa/plugins/audiotestsrc/meson.build +++ b/spa/plugins/audiotestsrc/meson.build @@ -5,4 +5,4 @@ audiotestsrclib = shared_library('spa-audiotestsrc', include_directories : [spa_inc], dependencies : [mathlib, ], install : true, - install_dir : '@0@/spa/audiotestsrc'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'audiotestsrc')) diff --git a/spa/plugins/bluez5/meson.build b/spa/plugins/bluez5/meson.build index c055a3c17..83bef6df0 100644 --- a/spa/plugins/bluez5/meson.build +++ b/spa/plugins/bluez5/meson.build @@ -14,4 +14,4 @@ bluez5lib = shared_library('spa-bluez5', c_args : [ '-D_GNU_SOURCE' ], dependencies : [ dbus_dep, sbc_dep, bluez_dep ], install : true, - install_dir : '@0@/spa/bluez5'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'bluez5')) diff --git a/spa/plugins/control/meson.build b/spa/plugins/control/meson.build index d3a582c26..ffe81575b 100644 --- a/spa/plugins/control/meson.build +++ b/spa/plugins/control/meson.build @@ -6,4 +6,4 @@ controllib = shared_library('spa-control', include_directories : [spa_inc], dependencies : [ mathlib ], install : true, - install_dir : '@0@/spa/control/'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'control')) diff --git a/spa/plugins/ffmpeg/meson.build b/spa/plugins/ffmpeg/meson.build index 64789a1dd..29adfdc56 100644 --- a/spa/plugins/ffmpeg/meson.build +++ b/spa/plugins/ffmpeg/meson.build @@ -7,4 +7,4 @@ ffmpeglib = shared_library('spa-ffmpeg', include_directories : [spa_inc], dependencies : [ avcodec_dep, avformat_dep ], install : true, - install_dir : '@0@/spa/ffmpeg'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'fmmpeg')) diff --git a/spa/plugins/jack/meson.build b/spa/plugins/jack/meson.build index 1d58128d6..a1ed5cb15 100644 --- a/spa/plugins/jack/meson.build +++ b/spa/plugins/jack/meson.build @@ -9,4 +9,4 @@ spa_jack = shared_library('spa-jack', include_directories : [spa_inc], dependencies : [ jack_dep, mathlib ], install : true, - install_dir : '@0@/spa/jack'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'jack')) diff --git a/spa/plugins/support/meson.build b/spa/plugins/support/meson.build index c6179ca96..59460b93f 100644 --- a/spa/plugins/support/meson.build +++ b/spa/plugins/support/meson.build @@ -10,7 +10,7 @@ spa_support_lib = shared_library('spa-support', include_directories : [ spa_inc ], dependencies : [ pthread_lib, epoll_shim_dep ], install : true, - install_dir : '@0@/spa/support'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'support')) if get_option('evl') @@ -27,7 +27,7 @@ if get_option('evl') include_directories : [ spa_inc, evl_inc], dependencies : [ pthread_lib, evl_lib], install : true, - install_dir : '@0@/spa/support'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'support')) endif spa_dbus_sources = ['dbus.c'] @@ -37,4 +37,4 @@ spa_dbus_lib = shared_library('spa-dbus', include_directories : [ spa_inc], dependencies : [dbus_dep, ], install : true, - install_dir : '@0@/spa/support'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'support')) diff --git a/spa/plugins/test/meson.build b/spa/plugins/test/meson.build index 463a529c2..bd69c7ac8 100644 --- a/spa/plugins/test/meson.build +++ b/spa/plugins/test/meson.build @@ -5,4 +5,4 @@ testlib = shared_library('spa-test', include_directories : [ spa_inc], dependencies : [pthread_lib, ], install : true, - install_dir : '@0@/spa/test'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'test')) diff --git a/spa/plugins/v4l2/meson.build b/spa/plugins/v4l2/meson.build index 6cec23898..e92d7fe22 100644 --- a/spa/plugins/v4l2/meson.build +++ b/spa/plugins/v4l2/meson.build @@ -8,4 +8,4 @@ v4l2lib = shared_library('spa-v4l2', include_directories : [ spa_inc ], dependencies : [ libudev_dep, ], install : true, - install_dir : '@0@/spa/v4l2'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'v4l2')) diff --git a/spa/plugins/videoconvert/meson.build b/spa/plugins/videoconvert/meson.build index 2bed99e38..497bef885 100644 --- a/spa/plugins/videoconvert/meson.build +++ b/spa/plugins/videoconvert/meson.build @@ -11,4 +11,4 @@ videoconvertlib = shared_library('spa-videoconvert', dependencies : [ mathlib ], link_with : simd_dependencies, install : true, - install_dir : '@0@/spa/videoconvert/'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'videoconvert')) diff --git a/spa/plugins/videotestsrc/meson.build b/spa/plugins/videotestsrc/meson.build index 1644c550d..2a882d2a4 100644 --- a/spa/plugins/videotestsrc/meson.build +++ b/spa/plugins/videotestsrc/meson.build @@ -5,4 +5,4 @@ videotestsrclib = shared_library('spa-videotestsrc', include_directories : [ spa_inc], dependencies : [pthread_lib, ], install : true, - install_dir : '@0@/spa/videotestsrc'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'videotestsrc')) diff --git a/spa/plugins/volume/meson.build b/spa/plugins/volume/meson.build index 9d85f14ce..28fea04cc 100644 --- a/spa/plugins/volume/meson.build +++ b/spa/plugins/volume/meson.build @@ -4,4 +4,4 @@ volumelib = shared_library('spa-volume', volume_sources, include_directories : [spa_inc], install : true, - install_dir : '@0@/spa/volume'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'volume')) diff --git a/spa/plugins/vulkan/meson.build b/spa/plugins/vulkan/meson.build index 4bd795638..b88edd6ec 100644 --- a/spa/plugins/vulkan/meson.build +++ b/spa/plugins/vulkan/meson.build @@ -7,4 +7,4 @@ spa_vulkan = shared_library('spa-vulkan', include_directories : [spa_inc], dependencies : [ vulkan_dep, mathlib ], install : true, - install_dir : '@0@/spa/vulkan'.format(get_option('libdir'))) + install_dir : join_paths(spa_plugindir, 'vulkan'))