From 953dc22f5026ea700f65aaa0d13d44dfb4dba699 Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <george.kiagiadakis@collabora.com>
Date: Fri, 18 Jun 2021 17:32:28 +0300
Subject: [PATCH] src: move extensions into pipewire

This allows having the same directory structure for headers as it
is in $prefix/include when installed, so that we can build other
projects using pipewire uninstalled (via the -uninstalled.pc or
by using meson subprojects). Otherwise, external code that reasonably
includes <pipewire/extensions/foo.h> fails to compile.
---
 src/meson.build                                                 | 1 -
 src/{ => pipewire}/extensions/client-node.h                     | 0
 src/{ => pipewire}/extensions/meson.build                       | 0
 src/{ => pipewire}/extensions/metadata.h                        | 0
 src/{ => pipewire}/extensions/profiler.h                        | 0
 src/{ => pipewire}/extensions/protocol-native.h                 | 0
 src/{ => pipewire}/extensions/session-manager.h                 | 0
 src/{ => pipewire}/extensions/session-manager/impl-interfaces.h | 0
 src/{ => pipewire}/extensions/session-manager/interfaces.h      | 0
 .../extensions/session-manager/introspect-funcs.h               | 0
 src/{ => pipewire}/extensions/session-manager/introspect.h      | 0
 src/{ => pipewire}/extensions/session-manager/keys.h            | 0
 src/pipewire/meson.build                                        | 2 ++
 13 files changed, 2 insertions(+), 1 deletion(-)
 rename src/{ => pipewire}/extensions/client-node.h (100%)
 rename src/{ => pipewire}/extensions/meson.build (100%)
 rename src/{ => pipewire}/extensions/metadata.h (100%)
 rename src/{ => pipewire}/extensions/profiler.h (100%)
 rename src/{ => pipewire}/extensions/protocol-native.h (100%)
 rename src/{ => pipewire}/extensions/session-manager.h (100%)
 rename src/{ => pipewire}/extensions/session-manager/impl-interfaces.h (100%)
 rename src/{ => pipewire}/extensions/session-manager/interfaces.h (100%)
 rename src/{ => pipewire}/extensions/session-manager/introspect-funcs.h (100%)
 rename src/{ => pipewire}/extensions/session-manager/introspect.h (100%)
 rename src/{ => pipewire}/extensions/session-manager/keys.h (100%)

diff --git a/src/meson.build b/src/meson.build
index a4cf719d0..2fb73fd59 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,5 @@
 
 subdir('pipewire')
-subdir('extensions')
 subdir('daemon')
 subdir('tools')
 subdir('modules')
diff --git a/src/extensions/client-node.h b/src/pipewire/extensions/client-node.h
similarity index 100%
rename from src/extensions/client-node.h
rename to src/pipewire/extensions/client-node.h
diff --git a/src/extensions/meson.build b/src/pipewire/extensions/meson.build
similarity index 100%
rename from src/extensions/meson.build
rename to src/pipewire/extensions/meson.build
diff --git a/src/extensions/metadata.h b/src/pipewire/extensions/metadata.h
similarity index 100%
rename from src/extensions/metadata.h
rename to src/pipewire/extensions/metadata.h
diff --git a/src/extensions/profiler.h b/src/pipewire/extensions/profiler.h
similarity index 100%
rename from src/extensions/profiler.h
rename to src/pipewire/extensions/profiler.h
diff --git a/src/extensions/protocol-native.h b/src/pipewire/extensions/protocol-native.h
similarity index 100%
rename from src/extensions/protocol-native.h
rename to src/pipewire/extensions/protocol-native.h
diff --git a/src/extensions/session-manager.h b/src/pipewire/extensions/session-manager.h
similarity index 100%
rename from src/extensions/session-manager.h
rename to src/pipewire/extensions/session-manager.h
diff --git a/src/extensions/session-manager/impl-interfaces.h b/src/pipewire/extensions/session-manager/impl-interfaces.h
similarity index 100%
rename from src/extensions/session-manager/impl-interfaces.h
rename to src/pipewire/extensions/session-manager/impl-interfaces.h
diff --git a/src/extensions/session-manager/interfaces.h b/src/pipewire/extensions/session-manager/interfaces.h
similarity index 100%
rename from src/extensions/session-manager/interfaces.h
rename to src/pipewire/extensions/session-manager/interfaces.h
diff --git a/src/extensions/session-manager/introspect-funcs.h b/src/pipewire/extensions/session-manager/introspect-funcs.h
similarity index 100%
rename from src/extensions/session-manager/introspect-funcs.h
rename to src/pipewire/extensions/session-manager/introspect-funcs.h
diff --git a/src/extensions/session-manager/introspect.h b/src/pipewire/extensions/session-manager/introspect.h
similarity index 100%
rename from src/extensions/session-manager/introspect.h
rename to src/pipewire/extensions/session-manager/introspect.h
diff --git a/src/extensions/session-manager/keys.h b/src/pipewire/extensions/session-manager/keys.h
similarity index 100%
rename from src/extensions/session-manager/keys.h
rename to src/pipewire/extensions/session-manager/keys.h
diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
index 37f811f3c..570dbb1d2 100644
--- a/src/pipewire/meson.build
+++ b/src/pipewire/meson.build
@@ -120,3 +120,5 @@ pkgconfig.generate(filebase : 'lib@0@'.format(pipewire_name),
   version : pipewire_version,
   extra_cflags : '-D_REENTRANT',
   variables : ['moduledir=${libdir}/@0@'.format(pipewire_name)])
+
+subdir('extensions')