meta-pipewire/recipes-multimedia/pipewire/pipewire/0007-Revert-meson-use-meson-variables-for-the-SMs-uninsta.patch

   1 From 4e8241675e68d5fb082d42ff597e681955eabbc4 Mon Sep 17 00:00:00 2001
   2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
   3 Date: Thu, 24 Feb 2022 12:37:27 +0530
   4 Subject: [PATCH 07/12] Revert "meson: use meson variables for the SMs'
   5  uninstalled scripts"
   6
   7 This reverts commit d5825b8551c34cefabf278a6b5ed04bc6ab0f301.
   8 Upstream-Status: Inappropriate[meson version dependent]
   9 ---
  10  src/daemon/meson.build | 16 ++++++++++------
  11  1 file changed, 10 insertions(+), 6 deletions(-)
  12
  13 diff --git a/src/daemon/meson.build b/src/daemon/meson.build
  14 index 28cbe4467..cd17d23c3 100644
  15 --- a/src/daemon/meson.build
  16 +++ b/src/daemon/meson.build
  17 @@ -46,17 +46,21 @@ elif default_sm == 'media-session'
  18    ms_bindir = ms_proj.get_variable('media_session_bin_dir', pipewire_bindir)
  19    conf_config.set('session_manager_path', ms_bindir / 'pipewire-media-session')
  20
  21 -  ms_uninstalled = ms_proj.get_variable('media_session_uninstalled')
  22 -  conf_config_uninstalled.set('session_manager_path', ms_uninstalled.full_path())
  23 -  conf_config_uninstalled.set('session_manager_args', 'pipewire-media-session')
  24 +  conf_config_uninstalled.set('session_manager_path',
  25 +    meson.source_root() / 'subprojects' / 'media-session' / 'media-session-uninstalled.sh')
  26 +  conf_config_uninstalled.set('session_manager_args',
  27 +    '-b ' + meson.build_root() / 'subprojects' / 'media-session' + ' pipewire-media-session')
  28    conf_config_uninstalled.set('sm_comment', '')
  29  elif default_sm == 'wireplumber'
  30    wp_bindir = wp_proj.get_variable('wireplumber_bin_dir', pipewire_bindir)
  31 +
  32    conf_config.set('session_manager_path', wp_bindir / 'wireplumber')
  33
  34 -  wp_uninstalled = wp_proj.get_variable('wireplumber_uninstalled')
  35 -  conf_config_uninstalled.set('session_manager_path', wp_uninstalled.full_path())
  36 -  conf_config_uninstalled.set('session_manager_args', 'wireplumber')
  37 +  # wp-uninstalled.sh -b path/to/wp/build/root wireplumber
  38 +  conf_config_uninstalled.set('session_manager_path',
  39 +    meson.source_root() / 'subprojects' / 'wireplumber' / 'wp-uninstalled.sh')
  40 +  conf_config_uninstalled.set('session_manager_args',
  41 +    '-b ' + meson.build_root() / 'subprojects' / 'wireplumber' + ' wireplumber')
  42    conf_config_uninstalled.set('sm_comment', '')
  43  else
  44    conf_config_uninstalled.set('session_manager_path', default_sm)
  45 --
  46 2.35.1
  47