pipewire: update to pw 0.3.43 and wp 0.4.7

[AGL/meta-agl.git] / meta-pipewire / recipes-multimedia / pipewire / pipewire / 0003-Revert-meson-declare-spa_dep-and-override_dependency.patch

diff --git a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-meson-declare-spa_dep-and-override_dependency.patch b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0003-Revert-meson-declare-spa_dep-and-override_dependency.patch
similarity index 70%
rename from meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-meson-declare-spa_dep-and-override_dependency.patch
rename to meta-pipewire/recipes-multimedia/pipewire/pipewire/0003-Revert-meson-declare-spa_dep-and-override_dependency.patch
index 4488acc..47e4f3c 100644 (file)
--- a/meta-pipewire/recipes-multimedia/pipewire/pipewire/0001-Revert-meson-declare-spa_dep-and-override_dependency.patch
+++ b/meta-pipewire/recipes-multimedia/pipewire/pipewire/0003-Revert-meson-declare-spa_dep-and-override_dependency.patch
@@ -1,37 +1,36 @@
-From 70e750804a700b06f62f91411d487b88e7c85fe5 Mon Sep 17 00:00:00 2001
+From 83b7f6457e5dca3ee2145e35f361f1520d24be42 Mon Sep 17 00:00:00 2001
 From: Ashok Sidipotu <ashok.sidipotu@collabora.com>
-Date: Fri, 26 Nov 2021 06:18:04 +0530
-Subject: [PATCH] Revert "meson: declare spa_dep and override_dependency() for
- spa and pipewire"
+Date: Fri, 14 Jan 2022 18:30:44 +0530
+Subject: [PATCH 3/4] Revert "meson: declare spa_dep and override_dependency()
+ for spa and pipewire"
 
 This reverts commit 7ab5c35cadc075bcdf44031f1f7d95352cf9a13b.
 
 Upstream-Status: Inappropriate[meson version dependent]
-
 ---
  meson.build              |  2 +-
- spa/meson.build          |  7 -------
+ spa/meson.build          | 13 +------------
  src/pipewire/meson.build | 10 ++--------
- 3 files changed, 3 insertions(+), 16 deletions(-)
+ 3 files changed, 4 insertions(+), 21 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 4a572bd42..4af179c87 100644
+index 67e697c15..476f722b7 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -1,7 +1,7 @@
  project('pipewire', ['c' ],
-   version : '0.3.40',
+   version : '0.3.43',
    license : [ 'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ],
--  meson_version : '>= 0.54.0',
+-  meson_version : '>= 0.56.0',
 +  meson_version : '>= 0.49.0',
    default_options : [ 'warning_level=3',
                        'c_std=gnu99',
-                       'b_pie=true',
+                       'cpp_std=c++17',
 diff --git a/spa/meson.build b/spa/meson.build
-index 483536b54..74ee5a737 100644
+index 2717b86d6..4e0f96727 100644
 --- a/spa/meson.build
 +++ b/spa/meson.build
-@@ -63,12 +63,6 @@ if not get_option('examples').disabled()
+@@ -56,20 +56,9 @@ if not get_option('examples').disabled()
    subdir('examples')
  endif
  
@@ -44,11 +43,15 @@ index 483536b54..74ee5a737 100644
  pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
    name : 'libspa',
    subdirs : spa_name,
-@@ -79,4 +73,3 @@ pkgconfig.generate(filebase : 'lib@0@'.format(spa_name),
-   uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
- )
- 
+   description : 'Simple Plugin API',
+   version : spaversion,
+-  extra_cflags : '-D_REENTRANT',
+-  variables : ['plugindir=${libdir}/@0@'.format(spa_name)],
+-  uninstalled_variables : ['plugindir=${prefix}/spa/plugins'],
+-)
+-
 -meson.override_dependency('lib@0@'.format(spa_name), spa_dep)
++  extra_cflags : '-D_REENTRANT')
 diff --git a/src/pipewire/meson.build b/src/pipewire/meson.build
 index f66ce8746..5cfaba3f9 100644
 --- a/src/pipewire/meson.build
@@ -76,5 +79,5 @@ index f66ce8746..5cfaba3f9 100644
 -
  subdir('extensions')
 -- 
-2.33.1
+2.34.1