wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2724 from fewtarius/dev

Browse source 
Update bluez, pipewire, pulseaudio, and wireplumber.
This commit is contained in:
fewtarius 2024-01-22 09:54:59 -05:00 committed by GitHub
commit 124c513b66
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/audio/pipewire/package.mk
View file

@ -2,7 +2,7 @@
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pipewire" PKG_NAME="pipewire"
PKG_VERSION="0.3.84" PKG_VERSION="1.0.1"
PKG_LICENSE="LGPL" PKG_LICENSE="LGPL"
PKG_SITE="https://pipewire.org" PKG_SITE="https://pipewire.org"
PKG_URL="https://github.com/PipeWire/pipewire/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/PipeWire/pipewire/archive/${PKG_VERSION}.tar.gz"

44
packages/audio/pipewire/patches/001-pipewire-pulse.patch
View file

@ -1,7 +1,7 @@
diff -rupN pipewire-0.3.84.orig/src/daemon/pipewire-pulse.conf.in pipewire-0.3.84/src/daemon/pipewire-pulse.conf.in diff -rupN pipewire-1.0.0.orig/src/daemon/pipewire-pulse.conf.in pipewire-1.0.0/src/daemon/pipewire-pulse.conf.in
--- pipewire-0.3.84.orig/src/daemon/pipewire-pulse.conf.in 2023-11-13 16:35:56.502690919 +0000 --- pipewire-1.0.0.orig/src/daemon/pipewire-pulse.conf.in 2023-12-29 13:41:35.329947857 +0000
+++ pipewire-0.3.84/src/daemon/pipewire-pulse.conf.in 2023-11-13 16:36:28.096495134 +0000 +++ pipewire-1.0.0/src/daemon/pipewire-pulse.conf.in 2023-12-29 13:41:46.850669838 +0000
@@ -90,11 +90,11 @@ pulse.properties = { @@ -92,11 +92,11 @@ pulse.properties = {
#"tcp:[::]:9999" # IPv6 on all addresses #"tcp:[::]:9999" # IPv6 on all addresses
#"tcp:127.0.0.1:8888" # IPv4 on a single address #"tcp:127.0.0.1:8888" # IPv4 on a single address
# #
@ -18,23 +18,17 @@ diff -rupN pipewire-0.3.84.orig/src/daemon/pipewire-pulse.conf.in pipewire-0.3.8
] ]
#server.dbus-name = "org.pulseaudio.Server" #server.dbus-name = "org.pulseaudio.Server"
#pulse.min.req = 128/48000 # 2.7ms #pulse.min.req = 128/48000 # 2.7ms
diff -rupN pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.service.in pipewire-0.3.84/src/daemon/systemd/system/pipewire.service.in diff -rupN pipewire-1.0.0.orig/src/daemon/systemd/system/pipewire.service.in pipewire-1.0.0/src/daemon/systemd/system/pipewire.service.in
--- pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.service.in 2023-11-13 16:35:56.502690919 +0000 --- pipewire-1.0.0.orig/src/daemon/systemd/system/pipewire.service.in 2023-12-29 13:41:35.329947857 +0000
+++ pipewire-0.3.84/src/daemon/systemd/system/pipewire.service.in 2023-11-13 16:36:28.096495134 +0000 +++ pipewire-1.0.0/src/daemon/systemd/system/pipewire.service.in 2023-12-29 13:43:32.217227049 +0000
@@ -15,21 +15,24 @@ Description=PipeWire Multimedia Service @@ -21,15 +21,25 @@ NoNewPrivileges=yes
Requires=pipewire.socket RestrictNamespaces=yes
SystemCallArchitectures=native
[Service] SystemCallFilter=@system-service
-LockPersonality=yes
-MemoryDenyWriteExecute=yes
-NoNewPrivileges=yes
-RestrictNamespaces=yes
-SystemCallArchitectures=native
-SystemCallFilter=@system-service
+Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket +Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket
+User=root +User=root
Type=simple Type=simple
-AmbientCapabilities=CAP_SYS_NICE AmbientCapabilities=CAP_SYS_NICE
-ExecStart=@PW_BINARY@ -ExecStart=@PW_BINARY@
+ExecStart=/usr/bin/pipewire +ExecStart=/usr/bin/pipewire
Restart=on-failure Restart=on-failure
@ -53,16 +47,16 @@ diff -rupN pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.service.in pi
+Environment=HOME=/storage +Environment=HOME=/storage
[Install] [Install]
-Also=pipewire.socket -Also=pipewire.socket pipewire-manager.socket
+Also=pipewire-pulse.socket +Also=pipewire.socket pipewire-pulse.socket pipewire-manager.socket
WantedBy=default.target WantedBy=default.target
diff -rupN pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.socket pipewire-0.3.84/src/daemon/systemd/system/pipewire.socket diff -rupN pipewire-1.0.0.orig/src/daemon/systemd/system/pipewire.socket pipewire-1.0.0/src/daemon/systemd/system/pipewire.socket
--- pipewire-0.3.84.orig/src/daemon/systemd/system/pipewire.socket 2023-11-13 16:35:56.502690919 +0000 --- pipewire-1.0.0.orig/src/daemon/systemd/system/pipewire.socket 2023-12-29 13:41:35.329947857 +0000
+++ pipewire-0.3.84/src/daemon/systemd/system/pipewire.socket 2023-11-13 16:36:58.434228383 +0000 +++ pipewire-1.0.0/src/daemon/systemd/system/pipewire.socket 2023-12-29 13:44:04.291208172 +0000
@@ -5,8 +5,8 @@ Description=PipeWire Multimedia System S @@ -4,8 +4,8 @@ Description=PipeWire Multimedia System S
[Socket]
Priority=6 Priority=6
ListenStream=%t/pipewire/pipewire-0 ListenStream=%t/pipewire/pipewire-0
ListenStream=%t/pipewire/pipewire-0-manager
-SocketUser=pipewire -SocketUser=pipewire
-SocketGroup=pipewire -SocketGroup=pipewire
+SocketUser=root +SocketUser=root

2
packages/audio/pulseaudio/package.mk
View file

@ -3,7 +3,7 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pulseaudio" PKG_NAME="pulseaudio"
PKG_VERSION="16.1" PKG_VERSION="17.0"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://pulseaudio.org/" PKG_SITE="http://pulseaudio.org/"
PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_URL="http://www.freedesktop.org/software/pulseaudio/releases/${PKG_NAME}-${PKG_VERSION}.tar.xz"

3
packages/audio/wireplumber/package.mk
View file

@ -2,7 +2,7 @@
# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="wireplumber" PKG_NAME="wireplumber"
PKG_VERSION="0.4.15" PKG_VERSION="0.4.17"
PKG_LICENSE="MIT" PKG_LICENSE="MIT"
PKG_SITE="https://gitlab.freedesktop.org/pipewire/wireplumber" PKG_SITE="https://gitlab.freedesktop.org/pipewire/wireplumber"
PKG_URL="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz" PKG_URL="https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
@ -21,6 +21,7 @@ PKG_MESON_OPTS_TARGET="-Dintrospection=disabled \
post_makeinstall_target() { post_makeinstall_target() {
mkdir -p ${INSTALL}/usr/share/wireplumber/{main.lua.d,bluetooth.lua.d}
# ref https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/0da29f38181e391160fa8702623050b8544ec775 # ref https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/0da29f38181e391160fa8702623050b8544ec775
cat > ${INSTALL}/usr/share/wireplumber/main.lua.d/89-disable-session-dbus-dependent-features.lua << EOF cat > ${INSTALL}/usr/share/wireplumber/main.lua.d/89-disable-session-dbus-dependent-features.lua << EOF
alsa_monitor.properties["alsa.reserve"] = false alsa_monitor.properties["alsa.reserve"] = false

4
packages/network/bluez/autostart/009-bluetooth
View file

@ -7,6 +7,10 @@
if [ "$(get_setting bluetooth.enabled)" == "1" ] if [ "$(get_setting bluetooth.enabled)" == "1" ]
then then
tocon "Starting bluetooth..." tocon "Starting bluetooth..."
if [ ! -e "/storage/.cache/services/bluez.conf" ]
then
cp -f /usr/share/services/bluez.conf /storage/.cache/services/bluez.conf
fi
nohup systemctl start bluetooth & nohup systemctl start bluetooth &
nohup systemctl start bluetooth-agent & nohup systemctl start bluetooth-agent &
nohup systemctl start bluetoothsense & nohup systemctl start bluetoothsense &

8
packages/network/bluez/package.mk
View file

@ -3,7 +3,7 @@
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="bluez" PKG_NAME="bluez"
PKG_VERSION="5.70" PKG_VERSION="5.72"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.bluez.org/" PKG_SITE="http://www.bluez.org/"
PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_URL="https://www.kernel.org/pub/linux/bluetooth/${PKG_NAME}-${PKG_VERSION}.tar.xz"
@ -71,9 +71,15 @@ post_makeinstall_target() {
mkdir -p ${INSTALL}/etc/bluetooth mkdir -p ${INSTALL}/etc/bluetooth
cp src/main.conf ${INSTALL}/etc/bluetooth cp src/main.conf ${INSTALL}/etc/bluetooth
cat <<EOF >${INSTALL}/etc/bluetooth/input.conf
[General]
ClassicBondedOnly=false
EOF
mkdir -p ${INSTALL}/usr/share/services mkdir -p ${INSTALL}/usr/share/services
cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services cp -P ${PKG_DIR}/default.d/*.conf ${INSTALL}/usr/share/services
# bluez looks in /etc/firmware/ # bluez looks in /etc/firmware/
ln -sf /usr/lib/firmware ${INSTALL}/etc/firmware ln -sf /usr/lib/firmware ${INSTALL}/etc/firmware