diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-06-25 19:47:24 +0200 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-06-26 14:37:56 +0000 |
commit | 4ce8411bb9c47a59d67ffe431f43cc4bc408dce1 (patch) | |
tree | 327687c68d5e57f2aaed9d667872db13b965d872 /meta-pipewire/recipes-multimedia/wireplumber/wireplumber | |
parent | 6ba0b4d2b38b88fef8bb847fe8631995d72910b6 (diff) |
Move meta-agl-profile-graphical-html5 and meta-pipewire into the main layer
Reasoning:
- the profile-graphical-html5 belongs in the main layer
- meta-pipewire is enabled by default
For reference - the original location is:
https://gerrit.automotivelinux.org/gerrit/gitweb?p=AGL%2Fmeta-agl-devel.git;a=commit;h=8479cd0c37e5e5e207a16f21c864610103e4f20f
Bug-AGL: SPEC-3453
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Change-Id: Ib475331bb6f84437020728fbb3f17b4acaab0106
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24875
Reviewed-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'meta-pipewire/recipes-multimedia/wireplumber/wireplumber')
-rw-r--r-- | meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Build-cpptoml-without-a-cmake-subproject.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Build-cpptoml-without-a-cmake-subproject.patch b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Build-cpptoml-without-a-cmake-subproject.patch new file mode 100644 index 000000000..726b35e74 --- /dev/null +++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber/0001-Build-cpptoml-without-a-cmake-subproject.patch @@ -0,0 +1,28 @@ +From e5efe3d4f0abc28251dac245ce0cf4124e7e2a12 Mon Sep 17 00:00:00 2001 +From: George Kiagiadakis <george.kiagiadakis@collabora.com> +Date: Thu, 5 Dec 2019 17:59:44 +0200 +Subject: [PATCH] Build cpptoml without a cmake subproject + +Upstream-Status: Inappropriate +--- + meson.build | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 5a75d96..0b21377 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,9 +24,7 @@ else + wireplumber_config_dir = join_paths(get_option('prefix'), get_option('sysconfdir'), 'wireplumber') + endif + +-cmake = import('cmake') +-cpptoml = cmake.subproject('cpptoml') +-cpptoml_dep = cpptoml.dependency('cpptoml') ++cpptoml_dep = declare_dependency(include_directories: include_directories('subprojects/cpptoml')) + + gobject_dep = dependency('gobject-2.0') + gmodule_dep = dependency('gmodule-2.0') +-- +2.24.0 + |