Merge pull request #210351 from K900/pipewire-0.3.64

pipewire: 0.3.63 -> 0.3.64

pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch

@@ -1,24 +0,0 @@
-From abdfbb94df98fe88be4dd92ca587500126558411 Mon Sep 17 00:00:00 2001
-From: Victor Gaydov <victor@enise.org>
-Date: Sun, 26 Jul 2020 11:54:52 +0300
-Subject: [PATCH] Remove deprecated scons call
-
----
- SConstruct | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/SConstruct b/SConstruct
-index 407025d8..04afa91f 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -49,7 +49,6 @@ env = Environment(ENV=os.environ, tools=[
- # performance tuning
- env.Decider('MD5-timestamp')
- env.SetOption('implicit_cache', 1)
--env.SourceCode('.', None)
- 
- # provide absolute path to force single sconsign file
- # per-directory sconsign files seems to be buggy with generated sources
--- 
-2.34.1
-

pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch

@@ -1,31 +0,0 @@
-From 15b37bb12a362c7889ac431eca4a47d6b2bdb97c Mon Sep 17 00:00:00 2001
-From: Victor Gaydov <victor@enise.org>
-Date: Sat, 5 Dec 2020 18:38:36 +0300
-Subject: [PATCH] Fix compatibility with new SCons
-
----
- site_scons/site_tools/roc/config.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/site_scons/site_tools/roc/config.py b/site_scons/site_tools/roc/config.py
-index b42b3adb..03b76be7 100644
---- a/site_scons/site_tools/roc/config.py
-+++ b/site_scons/site_tools/roc/config.py
-@@ -13,7 +13,13 @@ def _run_prog(context, src, suffix):
-     # RunProg may incorrectly use cached results from a previous run saved for
-     # different file contents but the same invocation number. To prevent this, we
-     # monkey patch its global counter with a hashsum of the file contents.
--    SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16)
-+    # The workaround is needed only for older versions of SCons, where
-+    # _ac_build_counter was an integer.
-+    try:
-+        if type(SCons.SConf._ac_build_counter) is int:
-+            SCons.SConf._ac_build_counter = int(hashlib.md5(src.encode()).hexdigest(), 16)
-+    except:
-+        pass
-     return context.RunProg(src, suffix)
- 
- def CheckLibWithHeaderExt(context, libs, headers, language, expr='1', run=True):
--- 
-2.34.1
-

pkgs/development/libraries/audio/roc-toolkit/default.nix

@@ -8,6 +8,7 @@
   libuv,
   openfecSupport ? true,
   openfec,
+  speexdsp,
   libunwindSupport ? true,
   libunwind,
   pulseaudioSupport ? true,
@@ -16,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "roc-toolkit";
-  version = "0.1.5";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "roc-streaming";
     repo = "roc-toolkit";
     rev = "v${version}";
-    sha256 = "sha256:1pld340zfch4p3qaf5anrspq7vmxrgf9ddsdsq92pk49axaaz19w";
+    sha256 = "sha256-W8PiI5W1T6pNaYzR4u6fPtkP8DKq/Z85Kq/WF5dXVxo=";
   };
 
   nativeBuildInputs = [
@@ -32,20 +33,19 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  buildInputs = [
+  propagatedBuildInputs = [
     libuv
     libunwind
     openfec
     libpulseaudio
+    speexdsp
   ];
 
   sconsFlags =
     [ "--build=${stdenv.buildPlatform.config}"
       "--host=${stdenv.hostPlatform.config}"
       "--prefix=${placeholder "out"}"
-      "--disable-sox"
-      "--disable-doc"
-      "--disable-tests" ] ++
+      "--disable-sox" ] ++
     lib.optional (!libunwindSupport) "--disable-libunwind" ++
     lib.optional (!pulseaudioSupport) "--disable-pulseaudio" ++
     (if (!openfecSupport)
@@ -56,10 +56,8 @@ stdenv.mkDerivation rec {
   prePatch = lib.optionalString stdenv.isAarch64
     "sed -i 's/c++98/c++11/g' SConstruct";
 
-  # TODO: Remove these patches in the next version.
   patches = [
-    ./0001-Remove-deprecated-scons-call.patch
-    ./0002-Fix-compatibility-with-new-SCons.patch
+    ./fix-pkgconfig-installation.patch
   ];
 
   meta = with lib; {

pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch

@@ -0,0 +1,13 @@
+diff --git a/src/SConscript b/src/SConscript
+index b59f67a7..9f16e0a2 100644
+--- a/src/SConscript
++++ b/src/SConscript
+@@ -141,7 +141,7 @@ if not GetOption('disable_shared') or GetOption('enable_static') or GetOption('e
+                 desc='Real-time audio streaming over the network.',
+                 url='https://roc-streaming.org',
+                 version=env['ROC_VERSION'])
+-            env.AddDistFile(env['PKG_CONFIG_PATH'], pc_file)
++            env.AddDistFile(os.path.join(env['ROC_SYSTEM_LIBDIR'], 'pkgconfig'), pc_file)
+ 
+ if GetOption('enable_examples'):
+     examples_env = subenvs.examples.Clone()

pkgs/development/libraries/pipewire/default.nix

@@ -2,7 +2,6 @@
 , lib
 , buildPackages
 , fetchFromGitLab
-, fetchpatch
 , python3
 , meson
 , ninja
@@ -68,7 +67,7 @@ let
 
   self = stdenv.mkDerivation rec {
     pname = "pipewire";
-    version = "0.3.63";
+    version = "0.3.64";
 
     outputs = [
       "out"
@@ -86,7 +85,7 @@ let
       owner = "pipewire";
       repo = "pipewire";
       rev = version;
-      sha256 = "sha256-GQJpw5G9YN7T2upu2FLUxE8UvMRev3K2j4Z1uK1/dt4=";
+      sha256 = "sha256-wIvdciLBWIQjENEipzbVID0eliOcEwqS567pLxVVOsc=";
     };
 
     patches = [
@@ -102,19 +101,6 @@ let
       ./0090-pipewire-config-template-paths.patch
       # Place SPA data files in lib output to avoid dependency cycles
       ./0095-spa-data-dir.patch
-
-      # FIXME: backports, remove after 0.3.64
-      # fix bluetooth issues
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/c7b3ef0d9ff16a1e69a299870860bebcb628e298.patch";
-        hash = "sha256-hiZ6VUhMu8NgwX5DZ/JRVl/g1Go0nZQSjQVrmqIzXoY=";
-      })
-
-      # fix routes getting lost
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/89ac6b353521fb9a6d6eb6bb74724c4fa968f75c.patch";
-        hash = "sha256-vzHiKWGmyuUF2iDS/ZQws+bCXVYYEl048JaMckY/fGI=";
-      })
     ];
 
     nativeBuildInputs = [