pipewire: 0.3.7 -> 0.3.9

Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Nathaniel Glen 2020-08-05 00:13:04 -04:00
parent ccefdd9dae
commit 89021b9a18
2 changed files with 25 additions and 3 deletions

View File

@ -0,0 +1,13 @@
diff --git a/meson.build b/meson.build
index ffee41b4..f3e4ec74 100644
--- a/meson.build
+++ b/meson.build
@@ -53,7 +53,7 @@ endif
spa_plugindir = join_paths(pipewire_libdir, spa_name)
-alsadatadir = join_paths(pipewire_datadir, 'alsa-card-profile', 'mixer')
+alsadatadir = join_paths(pipewire_libdir, '..', 'share', 'alsa-card-profile', 'mixer')
pipewire_headers_dir = join_paths(pipewire_name, 'pipewire')

View File

@ -24,6 +24,8 @@
, vulkan-loader
, libpulseaudio
, makeFontsConf
, ofonoSupport ? true
, nativeHspSupport ? true
}:
let
@ -33,7 +35,7 @@ let
in
stdenv.mkDerivation rec {
pname = "pipewire";
version = "0.3.7";
version = "0.3.9";
outputs = [ "out" "lib" "dev" "doc" ];
@ -42,9 +44,14 @@ stdenv.mkDerivation rec {
owner = "pipewire";
repo = "pipewire";
rev = version;
sha256 = "04l66p0wj553gp2zf3vwwh6jbr1vkf6wrq4za9zlm9dn144am4j2";
sha256 = "0q781r32mnm3qy6xcdd2rnb8g50gdi7mi50zmdiq24s24sr8f8r9";
};
patches = [
# Break up a dependency cycle between outputs.
./alsa-profiles-use-libdir.patch
];
nativeBuildInputs = [
doxygen
graphviz
@ -78,7 +85,9 @@ stdenv.mkDerivation rec {
"-Ddocs=true"
"-Dman=false" # we don't have xmltoman
"-Dgstreamer=true"
];
"-Dudevrulesdir=lib/udev/rules.d"
] ++ stdenv.lib.optional nativeHspSupport "-Dbluez5-backend-native=true"
++ stdenv.lib.optional ofonoSupport "-Dbluez5-backend-ofono=true";
FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file