diff --git a/srcpkgs/pipewire/patches/fix-usage-of-error_h.patch b/srcpkgs/pipewire/patches/fix-usage-of-error_h.patch index f7a43c83cfb..6aa61557619 100644 --- a/srcpkgs/pipewire/patches/fix-usage-of-error_h.patch +++ b/srcpkgs/pipewire/patches/fix-usage-of-error_h.patch @@ -1,3 +1,79 @@ +--- spa/tests/test-bluez5.c ++++ spa/tests/test-bluez5.c +@@ -18,7 +18,9 @@ + */ + + #include ++#ifdef __GLIBC__ + #include ++#endif + #include + #include + #include +@@ -209,6 +211,7 @@ int main(int argc, char *argv[]) + void *iface; + + spa_zero(data); ++#ifdef __GLIBC__ + if ((res = get_handle(&data, &handle, + "build/spa/plugins/support/libspa-support.so", + "mapper")) < 0) { +@@ -216,6 +219,7 @@ int main(int argc, char *argv[]) + } + if ((res = spa_handle_get_interface(handle, 0, &iface)) < 0) + error(-1, res, "can't get mapper interface"); ++#endif + + data.map = iface; + data.support[0].type = SPA_TYPE__TypeMap; +@@ -224,6 +228,7 @@ int main(int argc, char *argv[]) + init_type(&data.type, data.map); + spa_debug_set_type_map(data.map); + ++#ifdef __GLIBC__ + if ((res = get_handle(&data, &handle, + "build/spa/plugins/support/libspa-support.so", + "logger")) < 0) { +@@ -234,6 +239,7 @@ int main(int argc, char *argv[]) + spa_type_map_get_id(data.map, SPA_TYPE__Log), + &iface)) < 0) + error(-1, res, "can't get log interface"); ++#endif + + data.log = iface; + data.support[1].type = SPA_TYPE__Log; +@@ -243,6 +249,7 @@ int main(int argc, char *argv[]) + if ((str = getenv("SPA_DEBUG"))) + data.log->level = atoi(str); + ++#ifdef __GLIBC__ + if ((res = get_handle(&data, &handle, + "build/spa/plugins/support/libspa-support.so", + "loop")) < 0) { +@@ -265,6 +272,7 @@ int main(int argc, char *argv[]) + &iface)) < 0) + error(-1, res, "can't get looputils interface"); + data.loop_utils = iface; ++#endif + + data.support[2].type = SPA_TYPE_LOOP__DataLoop; + data.support[2].data = data.loop; +@@ -276,6 +284,7 @@ int main(int argc, char *argv[]) + data.support[5].data = data.loop_utils; + data.n_support = 6; + ++#ifdef __GLIBC__ + if ((res = get_handle(&data, &handle, + "build/spa/plugins/support/libspa-dbus.so", + "dbus")) < 0) { +@@ -302,6 +311,7 @@ int main(int argc, char *argv[]) + spa_type_map_get_id(data.map, SPA_TYPE__Monitor), + &iface)) < 0) + error(-1, res, "can't get monitor interface"); ++#endif + + data.monitor = iface; + --- spa/tests/test-control.c +++ spa/tests/test-control.c @@ -18,7 +18,9 @@ @@ -13,7 +89,7 @@ @@ -358,8 +360,10 @@ static int make_nodes(struct data *data, const char *device) spa_pod_builder_init(&b, buffer, sizeof(buffer)); if ((res = spa_node_port_enum_params(data->source, SPA_DIRECTION_OUTPUT, 0, - data->type.param.idIO, &idx, NULL, ¶m, &b)) < 1) { + data->type.param_io.idPropsIn, &idx, NULL, ¶m, &b)) < 1) { +#ifdef __GLIBC__ if (res < 0) error(0, -res, "port_enum_params"); @@ -140,7 +216,18 @@ break; } -@@ -214,8 +224,10 @@ static void inspect_factory(struct data *data, const struct spa_handle_factory * +@@ -204,8 +214,10 @@ static void inspect_factory(struct data *data, const struct spa_handle_factory * + if ((res = spa_handle_factory_enum_interface_info(factory, &info, &index)) <= 0) { + if (res == 0) + break; ++#ifdef __GLIBC__ + else + error(0, -res, "spa_handle_factory_enum_interface_info"); ++#endif + } + printf(" interface: '%s'\n", info->type); + } +@@ -225,8 +237,10 @@ static void inspect_factory(struct data *data, const struct spa_handle_factory * if ((res = spa_handle_factory_enum_interface_info(factory, &info, &index)) <= 0) { if (res == 0) break; @@ -151,7 +238,7 @@ } printf(" interface: '%s'\n", info->type); -@@ -297,8 +309,10 @@ int main(int argc, char *argv[]) +@@ -315,8 +329,10 @@ int main(int argc, char *argv[]) const struct spa_handle_factory *factory; if ((res = enum_func(&factory, &index)) <= 0) { diff --git a/srcpkgs/pipewire/patches/remove-systemd-dependency.patch b/srcpkgs/pipewire/patches/remove-systemd-dependency.patch deleted file mode 100644 index 95a557103f4..00000000000 --- a/srcpkgs/pipewire/patches/remove-systemd-dependency.patch +++ /dev/null @@ -1,10 +0,0 @@ -nt fazefrench - ---- src/daemon/meson.build -+++ src/daemon/meson.build -@@ -29,5 +29,3 @@ executable('pipewire', - include_directories : [configinc, spa_inc], - dependencies : [pipewire_dep], - ) -- --subdir('systemd') diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 74d0f6da549..f577e1222ec 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,6 +1,6 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.1.7 +version=0.1.8 revision=1 configure_args="-Denable_docs=true -Denable_man=true -Denable_gstreamer=false" build_style=meson @@ -12,7 +12,7 @@ maintainer="maxice8 " license="LGPL-2.1" homepage="https://pipewire.org/" distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz" -checksum=ed186539e08e20886f4ab0720e0e15c24fc71671480684118df004e9abebf125 +checksum=8e9e782d1193a0d28703860909a395725874b23678e939c5565d06f8156327fd pipewire-doc_package() { noarch=yes