diff options
Diffstat (limited to 'meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch')
-rw-r--r-- | meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch | 101 |
1 files changed, 21 insertions, 80 deletions
diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch index 42f01086a..89507df60 100644 --- a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch +++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-treewide-meson.build-use-project_-build-sourc.patch @@ -1,24 +1,21 @@ -From e850a4c080c80fc218224521727996062ebb9487 Mon Sep 17 00:00:00 2001 +From 7bf582601f73c5f796b23a7cc2868424b03a0fd1 Mon Sep 17 00:00:00 2001 From: Ashok Sidipotu <ashok.sidipotu@collabora.com> Date: Fri, 14 Jan 2022 16:12:55 +0530 -Subject: [PATCH 1/4] Revert "treewide: meson.build: use +Subject: [PATCH 01/12] Revert "treewide: meson.build: use project_{build,source}_root()" This reverts commit 8ed46a283fa1f8623b940eaeb9f7cbcc52eebf0e. Upstream-Status: Inappropriate[meson version dependent] --- - doc/meson.build | 34 ++++++++++++++-------------- - meson.build | 8 +++---- - spa/plugins/audioconvert/meson.build | 4 ++-- - spa/tests/meson.build | 4 ++-- - src/daemon/meson.build | 6 ++--- - src/modules/meson.build | 6 ++--- - src/tests/meson.build | 6 ++--- - test/meson.build | 4 ++-- - 8 files changed, 36 insertions(+), 36 deletions(-) + doc/meson.build | 34 +++++++++++++++++----------------- + meson.build | 8 ++++---- + spa/tests/meson.build | 4 ++-- + src/daemon/meson.build | 6 +++--- + test/meson.build | 4 ++-- + 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/doc/meson.build b/doc/meson.build -index 0e6d7f8e3..082780145 100644 +index 7e876bce5..95fecffc2 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -1,8 +1,8 @@ @@ -32,7 +29,7 @@ index 0e6d7f8e3..082780145 100644 dot_found = find_program('dot', required: false).found() summary({'dot (used with doxygen)': dot_found}, bool_yn: true, section: 'Optional programs') -@@ -49,35 +49,35 @@ extra_docs = [ +@@ -48,35 +48,35 @@ extra_docs = [ inputs = [] foreach extra : extra_docs @@ -81,7 +78,7 @@ index 0e6d7f8e3..082780145 100644 ] # Example files (in order from simple to esoteric) -@@ -118,8 +118,8 @@ input_dirs += [ 'doc/examples.dox' ] +@@ -141,8 +141,8 @@ input_dirs += [ 'doc/pipewire-tools.dox' ] doxyfile_conf.set('inputs', ' '.join(inputs + input_dirs)) doxyfile_conf.set('cssfiles', ' '.join(cssfiles)) doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes)) @@ -93,10 +90,10 @@ index 0e6d7f8e3..082780145 100644 doxyfile = configure_file(input: 'Doxyfile.in', output: 'Doxyfile', diff --git a/meson.build b/meson.build -index b1ea32f7a..67e697c15 100644 +index 440845e37..338192073 100644 --- a/meson.build +++ b/meson.build -@@ -304,9 +304,9 @@ includes_inc = include_directories('include') +@@ -247,9 +247,9 @@ includes_inc = include_directories('include') pipewire_inc = include_directories('src') makedata = configuration_data() @@ -109,7 +106,7 @@ index b1ea32f7a..67e697c15 100644 if version_arr.length() == 4 makedata.set('TAG', 'HEAD') else -@@ -498,7 +498,7 @@ endif +@@ -436,7 +436,7 @@ endif setenv = find_program('pw-uninstalled.sh') run_target('pw-uninstalled', command : [setenv, @@ -118,30 +115,8 @@ index b1ea32f7a..67e697c15 100644 '-v@0@'.format(pipewire_version)] ) -diff --git a/spa/plugins/audioconvert/meson.build b/spa/plugins/audioconvert/meson.build -index de9f491af..4d15271f5 100644 ---- a/spa/plugins/audioconvert/meson.build -+++ b/spa/plugins/audioconvert/meson.build -@@ -140,7 +140,7 @@ foreach a : test_apps - install : installed_tests_enabled, - install_dir : installed_tests_execdir / 'audioconvert'), - env : [ -- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')), -+ 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), - ]) - - if installed_tests_enabled -@@ -170,7 +170,7 @@ foreach a : benchmark_apps - install : installed_tests_enabled, - install_dir : installed_tests_execdir / 'audioconvert'), - env : [ -- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')), -+ 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), - ]) - - if installed_tests_enabled diff --git a/spa/tests/meson.build b/spa/tests/meson.build -index 990df87bd..9e2a211e2 100644 +index c73c887f4..9c78dcbd2 100644 --- a/spa/tests/meson.build +++ b/spa/tests/meson.build @@ -5,7 +5,7 @@ find = find_program('find', required: false) @@ -153,17 +128,17 @@ index 990df87bd..9e2a211e2 100644 '-name', '*.h', '-not', '-name', 'type-info.h', '-type', 'f', -@@ -40,7 +40,7 @@ foreach a : benchmark_apps +@@ -41,7 +41,7 @@ foreach a : benchmark_apps install_dir : installed_tests_execdir, ), env : [ -- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')), +- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable('plugindir')), + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), ] ) diff --git a/src/daemon/meson.build b/src/daemon/meson.build -index 44a574337..5e64287a1 100644 +index a2e4c55e3..647d7393d 100644 --- a/src/daemon/meson.build +++ b/src/daemon/meson.build @@ -18,9 +18,9 @@ conf_config.set('pulse_comment', '#') @@ -178,7 +153,7 @@ index 44a574337..5e64287a1 100644 conf_config_uninstalled.set('pulse_comment', '') build_ms = 'media-session' in get_option('session-managers') -@@ -105,7 +105,7 @@ custom_target('pipewire-uninstalled', +@@ -106,7 +106,7 @@ custom_target('pipewire-uninstalled', install: false, input: pipewire_exec, output: 'pipewire-uninstalled', @@ -187,42 +162,8 @@ index 44a574337..5e64287a1 100644 ) #desktop_file = i18n.merge_file( -diff --git a/src/modules/meson.build b/src/modules/meson.build -index 93dc70173..45852f3b9 100644 ---- a/src/modules/meson.build -+++ b/src/modules/meson.build -@@ -370,9 +370,9 @@ test('pw-test-protocol-native', - install_dir : installed_tests_execdir, - ), - env : [ -- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')), -- 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')), -- 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')), -+ 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), -+ 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()), -+ 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root()) - ] - ) - -diff --git a/src/tests/meson.build b/src/tests/meson.build -index 3e8d05012..1b03967fb 100644 ---- a/src/tests/meson.build -+++ b/src/tests/meson.build -@@ -13,9 +13,9 @@ foreach a : test_apps - install : installed_tests_enabled, - install_dir : installed_tests_execdir), - env : [ -- 'SPA_PLUGIN_DIR=@0@'.format(spa_dep.get_variable(internal: 'plugindir')), -- 'PIPEWIRE_CONFIG_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'confdatadir')), -- 'PIPEWIRE_MODULE_DIR=@0@'.format(pipewire_dep.get_variable(internal: 'moduledir')), -+ 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), -+ 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()), -+ 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root()) - ]) - - if installed_tests_enabled diff --git a/test/meson.build b/test/meson.build -index 20bdcb210..89f2bc2ec 100644 +index 74908d587..eca92eb24 100644 --- a/test/meson.build +++ b/test/meson.build @@ -14,8 +14,8 @@ pwtest_deps = [ @@ -237,5 +178,5 @@ index 20bdcb210..89f2bc2ec 100644 pwtest_inc = [ -- -2.34.1 +2.35.1 |