parent
8de62b0292
commit
84cf3337ec
|
@ -1 +0,0 @@
|
|||
pipewire
|
|
@ -1,12 +0,0 @@
|
|||
Musl is stricter
|
||||
|
||||
--- spa/include/spa/param/meta.h
|
||||
+++ spa/include/spa/param/meta.h
|
||||
@@ -24,6 +24,7 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
+#include <fcntl.h> /* for off_t */
|
||||
#include <spa/utils/defs.h>
|
||||
#include <spa/param/param.h>
|
||||
#include <spa/support/type-map.h>
|
|
@ -10,15 +10,16 @@
|
|||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -209,6 +211,7 @@ int main(int argc, char *argv[])
|
||||
@@ -209,6 +211,8 @@ 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[])
|
||||
@@ -216,6 +220,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");
|
||||
|
@ -26,7 +27,7 @@
|
|||
|
||||
data.map = iface;
|
||||
data.support[0].type = SPA_TYPE__TypeMap;
|
||||
@@ -224,6 +228,7 @@ int main(int argc, char *argv[])
|
||||
@@ -224,6 +229,7 @@ int main(int argc, char *argv[])
|
||||
init_type(&data.type, data.map);
|
||||
spa_debug_set_type_map(data.map);
|
||||
|
||||
|
@ -34,7 +35,7 @@
|
|||
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[])
|
||||
@@ -234,6 +240,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");
|
||||
|
@ -42,7 +43,7 @@
|
|||
|
||||
data.log = iface;
|
||||
data.support[1].type = SPA_TYPE__Log;
|
||||
@@ -243,6 +249,7 @@ int main(int argc, char *argv[])
|
||||
@@ -243,6 +250,7 @@ int main(int argc, char *argv[])
|
||||
if ((str = getenv("SPA_DEBUG")))
|
||||
data.log->level = atoi(str);
|
||||
|
||||
|
@ -50,7 +51,19 @@
|
|||
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[])
|
||||
@@ -252,8 +260,11 @@ int main(int argc, char *argv[])
|
||||
spa_type_map_get_id(data.map, SPA_TYPE__Loop),
|
||||
&iface)) < 0)
|
||||
error(-1, res, "can't get loop interface");
|
||||
+#endif
|
||||
+
|
||||
data.loop = iface;
|
||||
|
||||
+#ifdef __GLIBC__
|
||||
if ((res = spa_handle_get_interface(handle,
|
||||
spa_type_map_get_id(data.map, SPA_TYPE__LoopControl),
|
||||
&iface)) < 0)
|
||||
@@ -265,6 +276,7 @@ int main(int argc, char *argv[])
|
||||
&iface)) < 0)
|
||||
error(-1, res, "can't get looputils interface");
|
||||
data.loop_utils = iface;
|
||||
|
@ -58,7 +71,7 @@
|
|||
|
||||
data.support[2].type = SPA_TYPE_LOOP__DataLoop;
|
||||
data.support[2].data = data.loop;
|
||||
@@ -276,6 +284,7 @@ int main(int argc, char *argv[])
|
||||
@@ -276,6 +288,7 @@ int main(int argc, char *argv[])
|
||||
data.support[5].data = data.loop_utils;
|
||||
data.n_support = 6;
|
||||
|
||||
|
@ -66,7 +79,22 @@
|
|||
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[])
|
||||
@@ -286,12 +299,14 @@ int main(int argc, char *argv[])
|
||||
spa_type_map_get_id(data.map, SPA_TYPE__DBus),
|
||||
&iface)) < 0)
|
||||
error(-1, res, "can't get dbus interface");
|
||||
+#endif
|
||||
|
||||
data.dbus = iface;
|
||||
data.support[6].type = SPA_TYPE__DBus;
|
||||
data.support[6].data = data.dbus;
|
||||
data.n_support = 7;
|
||||
|
||||
+#ifdef __GLIBC__
|
||||
if ((res = get_handle(&data, &handle,
|
||||
"build/spa/plugins/bluez5/libspa-bluez5.so",
|
||||
"bluez5-monitor")) < 0) {
|
||||
@@ -302,6 +317,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");
|
|
@ -1,10 +0,0 @@
|
|||
--- src/pipewire/private.h
|
||||
+++ src/pipewire/private.h
|
||||
@@ -25,6 +25,7 @@ extern "C" {
|
||||
#endif
|
||||
|
||||
#include <sys/socket.h>
|
||||
+#include <sys/types.h> /* for pthread_t */
|
||||
|
||||
|
||||
#include "pipewire/mem.h"
|
|
@ -1,6 +1,6 @@
|
|||
--- src/pipewire/data-loop.c
|
||||
+++ src/pipewire/data-loop.c
|
||||
@@ -47,6 +47,7 @@ static void make_realtime(struct pw_data_loop *this)
|
||||
--- src/modules/module-rtkit.c
|
||||
+++ src/modules/module-rtkit.c
|
||||
@@ -417,6 +417,7 @@ static void idle_func(struct spa_source *source)
|
||||
system_bus = pw_rtkit_bus_get_system();
|
||||
|
||||
rl.rlim_cur = rl.rlim_max = rttime;
|
||||
|
@ -8,7 +8,7 @@
|
|||
if ((r = setrlimit(RLIMIT_RTTIME, &rl)) < 0)
|
||||
pw_log_debug("setrlimit() failed: %s", strerror(errno));
|
||||
|
||||
@@ -60,6 +61,7 @@ static void make_realtime(struct pw_data_loop *this)
|
||||
@@ -430,6 +431,7 @@ static void idle_func(struct spa_source *source)
|
||||
pw_log_debug("setrlimit() failed: %s", strerror(errno));
|
||||
}
|
||||
}
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'pipewire'
|
||||
pkgname=pipewire
|
||||
version=0.1.8
|
||||
version=0.1.9
|
||||
revision=1
|
||||
configure_args="-Denable_docs=true -Denable_man=true -Denable_gstreamer=false"
|
||||
configure_args="-Denable_man=true -Denable_gstreamer=false"
|
||||
build_style=meson
|
||||
hostmakedepends="pkg-config xmltoman doxygen graphviz"
|
||||
hostmakedepends="pkg-config xmltoman"
|
||||
makedepends="dbus-devel jack-devel alsa-lib-devel v4l-utils-devel SDL2-devel
|
||||
ffmpeg-devel libX11-devel"
|
||||
short_desc="Server and user space API to deal with multimedia pipelines"
|
||||
|
@ -12,15 +12,7 @@ maintainer="maxice8 <thinkabit.ukim@gmail.com>"
|
|||
license="LGPL-2.1"
|
||||
homepage="https://pipewire.org/"
|
||||
distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz"
|
||||
checksum=8e9e782d1193a0d28703860909a395725874b23678e939c5565d06f8156327fd
|
||||
|
||||
pipewire-doc_package() {
|
||||
noarch=yes
|
||||
short_desc+=" - documentation"
|
||||
pkg_install() {
|
||||
vmove usr/share/doc
|
||||
}
|
||||
}
|
||||
checksum=d7dc591d60c3544f3c24b2b0ab1db458991dd69d0610337fd0accf136373916b
|
||||
|
||||
# XXX: There is potential to further divide into more subpkgs one for libpipewire
|
||||
# and another for libspa
|
||||
|
|
Loading…
Reference in New Issue