Skip to content

pipewire: 0.3.63 -> 0.3.64 #210351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
K900 merged 3 commits into from
Jan 13, 2023
Merged

pipewire: 0.3.63 -> 0.3.64 #210351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0db6b38
roc-toolkit: 0.1.5 -> 0.2.1
bgamari Jan 3, 2023
91558c8
roc-toolkit: propagate buildInputs
K900 Jan 12, 2023
202c6e5
pipewire: 0.3.63 -> 0.3.64
K900 Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions pkgs/development/libraries/audio/roc-toolkit/0001-Remove-deprecated-scons-call.patch
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions pkgs/development/libraries/audio/roc-toolkit/0002-Fix-compatibility-with-new-SCons.patch
View file
Open in desktop

This file was deleted.

16 changes: 7 additions & 9 deletions pkgs/development/libraries/audio/roc-toolkit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
libuv,
openfecSupport ? true,
openfec,
speexdsp,
libunwindSupport ? true,
libunwind,
pulseaudioSupport ? true,
Expand All @@ -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 = [
Expand All @@ -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)
Expand All @@ -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; {
Expand Down
13 changes: 13 additions & 0 deletions pkgs/development/libraries/audio/roc-toolkit/fix-pkgconfig-installation.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
18 changes: 2 additions & 16 deletions pkgs/development/libraries/pipewire/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
, lib
, buildPackages
, fetchFromGitLab
, fetchpatch
, python3
, meson
, ninja
Expand Down Expand Up @@ -68,7 +67,7 @@ let

self = stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.63";
version = "0.3.64";

outputs = [
"out"
Expand All @@ -86,7 +85,7 @@ let
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "sha256-GQJpw5G9YN7T2upu2FLUxE8UvMRev3K2j4Z1uK1/dt4=";
sha256 = "sha256-wIvdciLBWIQjENEipzbVID0eliOcEwqS567pLxVVOsc=";
};

patches = [
Expand All @@ -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 {
Copy link
Member

@SuperSandro2000 SuperSandro2000 Jan 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove the unused fetchpatch from inputs.

Copy link
Contributor Author

@K900 K900 Jan 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

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 = [
Expand Down