meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Revert-wp-uninstalled-build-this-script-with-the-mes.patch

   1 From 1d39b68d88e967739d6beb3c9be7f4644b5d4077 Mon Sep 17 00:00:00 2001
   2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
   3 Date: Thu, 2 Dec 2021 16:23:09 +0530
   4 Subject: [PATCH] Revert "wp-uninstalled: build this script with the meson dirs
   5  filled in"
   6
   7 This reverts commit 52aaf96179584292f493c4b329bc2c409e6d3dee.
   8 ---
   9  meson.build       | 18 ------------------
  10  wp-uninstalled.sh | 11 ++---------
  11  2 files changed, 2 insertions(+), 27 deletions(-)
  12
  13 diff --git a/meson.build b/meson.build
  14 index 1affbc1..f2ca16c 100644
  15 --- a/meson.build
  16 +++ b/meson.build
  17 @@ -120,21 +120,3 @@ subdir('src')
  18  if get_option('tests')
  19    subdir('tests')
  20  endif
  21 -
  22 -conf_uninstalled = configuration_data()
  23 -conf_uninstalled.set('MESON', '')
  24 -conf_uninstalled.set('MESON_SOURCE_ROOT', meson.project_source_root())
  25 -conf_uninstalled.set('MESON_BUILD_ROOT', meson.project_build_root())
  26 -
  27 -wp_uninstalled = configure_file(
  28 -  input : 'wp-uninstalled.sh',
  29 -  output : 'wp-uninstalled.sh.in',
  30 -  configuration : conf_uninstalled,
  31 -)
  32 -
  33 -wireplumber_uninstalled = custom_target('wp-uninstalled',
  34 -  output : 'wp-uninstalled.sh',
  35 -  input : wp_uninstalled,
  36 -  build_by_default : true,
  37 -  command : ['cp', '@INPUT@', '@OUTPUT@'],
  38 -)
  39 diff --git a/wp-uninstalled.sh b/wp-uninstalled.sh
  40 index 79e53f2..d6279ff 100755
  41 --- a/wp-uninstalled.sh
  42 +++ b/wp-uninstalled.sh
  43 @@ -2,15 +2,8 @@
  44
  45  set -e
  46
  47 -# This is unset by meson
  48 -# shellcheck disable=SC2157
  49 -if [ -z "@MESON@" ]; then
  50 -  SOURCEDIR="@MESON_SOURCE_ROOT@"
  51 -  BUILDDIR="@MESON_BUILD_ROOT@"
  52 -else
  53 -  SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
  54 -  BUILDDIR=$(find "${SOURCEDIR}" -maxdepth 2 -name build.ninja -printf "%h\n" -quit 2>/dev/null || echo "${SOURCEDIR}/build")
  55 -fi
  56 +SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
  57 +BUILDDIR=${SOURCEDIR}/build
  58  CONFIGDIR=config
  59
  60  while getopts ":b:c:" opt; do
  61 --
  62 2.33.1
  63