From b6e27822e5d91e55f3c76fa033f0366e16a53da0 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 7 Jun 2021 16:02:58 +1000
Subject: [PATCH] pipewire: use RUNNING_ON_VALGRIND to determine if we're in
 valgrind

This removes the use of the VALGRIND environment variable
---
 Makefile.in              | 2 +-
 src/pipewire/meson.build | 2 +-
 src/pipewire/pipewire.c  | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 0c633d74d..73e832433 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,7 @@ gdb:
 	$(MAKE) run DBG=gdb
 
 valgrind:
-	$(MAKE) run DBG="DISABLE_RTKIT=1 VALGRIND=1 valgrind --trace-children=yes"
+	$(MAKE) run DBG="DISABLE_RTKIT=1 valgrind --trace-children=yes"
 
 test: all
 	ninja -C $(BUILD_ROOT) test
diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
index 0fa6643a2..c57ecc857 100644
--- a/src/pipewire/meson.build
+++ b/src/pipewire/meson.build
@@ -100,7 +100,7 @@ libpipewire = shared_library(pipewire_name, pipewire_sources,
   version : libversion,
   soversion : soversion,
   c_args : libpipewire_c_args,
-  include_directories : [pipewire_inc, configinc, spa_inc],
+  include_directories : [pipewire_inc, configinc, spa_inc, includes_inc],
   install : true,
   dependencies : [dl_lib, mathlib, pthread_lib, libintl_dep, atomic_dep, ],
 )
diff --git a/src/pipewire/pipewire.c b/src/pipewire/pipewire.c
index 7afc0a6d0..83349db16 100644
--- a/src/pipewire/pipewire.c
+++ b/src/pipewire/pipewire.c
@@ -39,6 +39,8 @@
 #include <locale.h>
 #include <libintl.h>
 
+#include <valgrind/valgrind.h>
+
 #include <spa/utils/names.h>
 #include <spa/utils/string.h>
 #include <spa/support/cpu.h>
@@ -489,8 +491,7 @@ void pw_init(int *argc, char **argv[])
 	if (support->registry != NULL)
 		return;
 
-	if ((str = getenv("VALGRIND")) != NULL)
-		support->in_valgrind = pw_properties_parse_bool(str);
+	support->in_valgrind = RUNNING_ON_VALGRIND;
 
 	if ((str = getenv("NO_COLOR")) != NULL)
 		support->no_color = true;