Skip to content

Commit

Permalink
pipewire: update to v0.3.56
Browse files Browse the repository at this point in the history
Add the configuration to make pipewire work as a drop-in replacement for pulseaudio-server.

Add pipewire-media-session as a standalone recipe, since pipewire would fetch the code as a
subproject at do_configure.

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
  • Loading branch information
MarkusVolk authored and kraj committed Aug 22, 2022
1 parent f36a158 commit f6eb4c8
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 61 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
SUMMARY = "PipeWire Media Session is an example session manager for PipeWire"
HOMEPAGE = "https://gitlab.freedesktop.org/pipewire/media-session"
LICENSE = "MIT"

LIC_FILES_CHKSUM = "file://COPYING;md5=97be96ca4fab23e9657ffa590b931c1a"

DEPENDS = " \
pipewire \
alsa-lib \
dbus \
"

SRC_URI = "git://gitlab.freedesktop.org/pipewire/media-session.git;protocol=https;branch=master"

S = "${WORKDIR}/git"
SRCREV = "e5d5cf2404786af8bcc40bdb8a2962bef4ec18b6"

inherit meson pkgconfig

FILES:${PN} += " \
${systemd_user_unitdir}/pipewire-media-session.service \
${datadir}/pipewire/media-session.d/* \
"

RRECOMMENDS:${PN} += "pipewire"
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
From 1a5ec4452fa21592eaeeb823ad95a1db6eb60376 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Tue, 19 Jul 2022 13:49:42 +0200
Subject: [PATCH 001/113] avb: fix compilation on big endian

Patch-Status: Backport

---
src/modules/module-avb/aaf.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/module-avb/aaf.h b/src/modules/module-avb/aaf.h
index cb4871ca6..b444ce251 100644
--- a/src/modules/module-avb/aaf.h
+++ b/src/modules/module-avb/aaf.h
@@ -35,7 +35,7 @@ struct avb_packet_aaf {
unsigned gv:1;
unsigned tv:1;

- uint8_t seq_number;
+ uint8_t seq_num;

unsigned _r2:7;
unsigned tu:1;
diff --git a/src/modules/module-avb/iec61883.h b/src/modules/module-avb/iec61883.h
index d3b3a7daa..6ca8724ad 100644
--- a/src/modules/module-avb/iec61883.h
+++ b/src/modules/module-avb/iec61883.h
@@ -37,7 +37,7 @@ struct avb_packet_iec61883 {
unsigned gv:1;
unsigned tv:1;

- uint8_t seq_number;
+ uint8_t seq_num;

unsigned _r2:7;
unsigned tu:1;
diff --git a/spa/plugins/avb/avbtp/packets.h b/spa/plugins/avb/avbtp/packets.h
index 7047456bf..3d4a652ee 100644
--- a/spa/plugins/avb/avbtp/packets.h
+++ b/spa/plugins/avb/avbtp/packets.h
@@ -116,7 +116,7 @@ struct spa_avbtp_packet_aaf {
unsigned gv:1;
unsigned tv:1;

- uint8_t seq_number;
+ uint8_t seq_num;

unsigned _r2:7;
unsigned tu:1;
--
2.34.1

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ LIC_FILES_CHKSUM = " \

DEPENDS = "dbus ncurses"

SRCREV = "64cf5e80e6240284e6b757907b900507fe56f1b5"
SRCREV = "f274e53d25ee8f483ac6fce9e516bb1830abe88b"
SRC_URI = " \
git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=master;protocol=https \
file://0001-spa-fix-c90-header-include.patch \
file://0001-avb-fix-compilation-on-big-endian.patch \
"

S = "${WORKDIR}/git"
Expand Down Expand Up @@ -62,7 +62,6 @@ EXTRA_OEMESON += " \
-Dudevrulesdir=${nonarch_base_libdir}/udev/rules.d/ \
-Dsystemd-system-unit-dir=${systemd_system_unitdir} \
-Dsystemd-user-unit-dir=${systemd_user_unitdir} \
-Dvulkan=disabled \
-Dman=disabled \
-Dsession-managers='[]' \
-Dlv2=disabled \
Expand All @@ -72,30 +71,46 @@ EXTRA_OEMESON += " \
-Dlegacy-rtkit=false \
"

PACKAGECONFIG:class-target ??= "\
# spa alsa plugin code uses typedef redefinition, which is officially a C11 feature.
# Pipewire builds with 'c_std=gnu99' by default. Recent versions of gcc don't issue this warning in gnu99
# mode but it looks like clang still does
CFLAGS:append = " -Wno-typedef-redefinition"

# According to wireplumber documentation only one session manager should be installed at a time
# Possible options are media-session, which has fewer dependencies but is very simple,
# or wireplumber, which is more powerful.
PIPEWIRE_SESSION_MANAGER ??= "media-session"

FFMPEG_AVAILABLE = "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'ffmpeg', '', d)}"
BLUETOOTH_AAC = "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'bluez-aac', '', d)}"

PACKAGECONFIG:class-target ??= " \
${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'alsa', d)} \
gstreamer jack libusb pw-cat raop sndfile v4l2 \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez ${BLUETOOTH_AAC}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-system-service systemd-user-service', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'alsa vulkan pulseaudio', d)} \
${PIPEWIRE_SESSION_MANAGER} \
${FFMPEG_AVAILABLE} gstreamer jack libusb pw-cat raop sndfile v4l2 udev volume \
"

# "jack" and "pipewire-jack" packageconfigs cannot be both enabled,
# since "jack" imports libjack, and "pipewire-jack" generates
# libjack.so* files, thus colliding with the libpack package. This
# is why these two are marked in their respective packageconfigs
# as being in conflict.
PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev"
PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib udev,,pipewire-alsa pipewire-alsa-card-profile"
PACKAGECONFIG[avahi] = "-Davahi=enabled,-Davahi=disabled,avahi"
PACKAGECONFIG[bluez] = "-Dbluez5=enabled,-Dbluez5=disabled,bluez5 sbc"
PACKAGECONFIG[bluez-aac] = "-Dbluez5-codec-aac=enabled,-Dbluez5-codec-aac=disabled,fdk-aac"
PACKAGECONFIG[docs] = "-Ddocs=enabled,-Ddocs=disabled,doxygen-native graphviz-native"
PACKAGECONFIG[ffmpeg] = "-Dffmpeg=enabled,-Dffmpeg=disabled,ffmpeg"
PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base,,gstreamer1.0-pipewire"
PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack,,,pipewire-jack"
PACKAGECONFIG[libcamera] = "-Dlibcamera=enabled,-Dlibcamera=disabled,libcamera"
PACKAGECONFIG[libcamera] = "-Dlibcamera=enabled,-Dlibcamera=disabled,libcamera libdrm"
PACKAGECONFIG[libcanberra] = "-Dlibcanberra=enabled,-Dlibcanberra=disabled,libcanberra"
PACKAGECONFIG[libusb] = "-Dlibusb=enabled,-Dlibusb=disabled,libusb"
PACKAGECONFIG[media-session] = ",,,pipewire-media-session"
PACKAGECONFIG[pulseaudio] = "-Dlibpulse=enabled,-Dlibpulse=disabled,pulseaudio,,pipewire-pulse"
PACKAGECONFIG[pipewire-alsa] = "-Dpipewire-alsa=enabled,-Dpipewire-alsa=disabled,alsa-lib"
PACKAGECONFIG[pipewire-jack] = "-Dpipewire-jack=enabled -Dlibjack-path=${libdir}/${PW_MODULE_SUBDIR}/jack,-Dpipewire-jack=disabled,jack,,,jack"
PACKAGECONFIG[pw-cat] = "-Dpw-cat=enabled,-Dpw-cat=disabled"
Expand All @@ -109,8 +124,12 @@ PACKAGECONFIG[systemd-system-service] = "-Dsystemd-system-service=enabled,-Dsyst
# currently lacks the feature of enabling user services.
PACKAGECONFIG[systemd-user-service] = "-Dsystemd-user-service=enabled,-Dsystemd-user-service=disabled,systemd"
# pw-cat needs sndfile packageconfig to be enabled
PACKAGECONFIG[udev] = "-Dudev=enabled,-Dudev=disabled,udev"
PACKAGECONFIG[v4l2] = "-Dv4l2=enabled,-Dv4l2=disabled,udev"
PACKAGECONFIG[volume] = "-Dvolume=enabled,-Dvolume=disabled"
PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled,vulkan-headers vulkan-loader"
PACKAGECONFIG[webrtc-echo-cancelling] = "-Decho-cancel-webrtc=enabled,-Decho-cancel-webrtc=disabled,webrtc-audio-processing"
PACKAGECONFIG[wireplumber] = ",,,wireplumber"

PACKAGESPLITFUNCS:prepend = " split_dynamic_packages "
PACKAGESPLITFUNCS:append = " set_dynamic_metapkg_rdepends "
Expand Down Expand Up @@ -227,10 +246,16 @@ PACKAGES_DYNAMIC = "^${PN}-spa-plugins.* ^${PN}-modules.*"
SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'systemd-system-service', 'pipewire.service', '', d)}"
CONFFILES:${PN} += "${datadir}/pipewire/pipewire.conf"
FILES:${PN} = " \
${datadir}/pipewire/pipewire.conf \
${systemd_system_unitdir}/pipewire.* \
${systemd_user_unitdir}/pipewire.* \
${datadir}/pipewire \
${systemd_system_unitdir}/pipewire* \
${systemd_user_unitdir}/pipewire* \
${bindir}/pipewire \
${bindir}/pipewire-avb \
"

RRECOMMENDS:${PN}:class-target += " \
pipewire-modules-meta \
pipewire-spa-plugins-meta \
"

FILES:${PN}-dev += " \
Expand Down

0 comments on commit f6eb4c8

Please sign in to comment.