1 From 8e959b7894047030edca21a04dd91994e8868a1f Mon Sep 17 00:00:00 2001
2 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
3 Date: Fri, 25 Feb 2022 06:05:43 +0530
4 Subject: [PATCH 2/2] Revert "wp-uninstalled: build this script with the meson
7 This reverts commit 52aaf96179584292f493c4b329bc2c409e6d3dee.
8 Upstream-Status: Inappropriate[meson version dependent]
10 meson.build | 31 -------------------------------
11 wp-uninstalled.sh | 11 ++---------
12 2 files changed, 2 insertions(+), 40 deletions(-)
14 diff --git a/meson.build b/meson.build
15 index e4323dc..185248f 100644
18 @@ -120,34 +120,3 @@ subdir('src')
19 if get_option('tests')
23 -conf_uninstalled = configuration_data()
24 -conf_uninstalled.set('MESON', '')
25 -conf_uninstalled.set('MESON_SOURCE_ROOT', meson.project_source_root())
26 -conf_uninstalled.set('MESON_BUILD_ROOT', meson.project_build_root())
28 -wp_uninstalled = configure_file(
29 - input : 'wp-uninstalled.sh',
30 - output : 'wp-uninstalled.sh.in',
31 - configuration : conf_uninstalled,
34 -wireplumber_uninstalled = custom_target('wp-uninstalled',
35 - output : 'wp-uninstalled.sh',
36 - input : wp_uninstalled,
37 - build_by_default : true,
38 - command : ['cp', '@INPUT@', '@OUTPUT@'],
41 -if meson.version().version_compare('>= 0.58')
42 - builddir = meson.project_build_root()
43 - srcdir = meson.project_source_root()
45 - devenv = environment({
46 - 'WIREPLUMBER_MODULE_DIR': builddir / 'modules',
47 - 'WIREPLUMBER_CONFIG_DIR': srcdir / 'src' / 'config',
48 - 'WIREPLUMBER_DATA_DIR': srcdir / 'src',
51 - meson.add_devenv(devenv)
53 diff --git a/wp-uninstalled.sh b/wp-uninstalled.sh
54 index 79e53f2..d6279ff 100755
55 --- a/wp-uninstalled.sh
56 +++ b/wp-uninstalled.sh
61 -# This is unset by meson
62 -# shellcheck disable=SC2157
63 -if [ -z "@MESON@" ]; then
64 - SOURCEDIR="@MESON_SOURCE_ROOT@"
65 - BUILDDIR="@MESON_BUILD_ROOT@"
67 - SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
68 - BUILDDIR=$(find "${SOURCEDIR}" -maxdepth 2 -name build.ninja -printf "%h\n" -quit 2>/dev/null || echo "${SOURCEDIR}/build")
70 +SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
71 +BUILDDIR=${SOURCEDIR}/build
74 while getopts ":b:c:" opt; do