diff options
author | David P. <megver83@parabola.nu> | 2024-04-07 00:26:27 -0400 |
---|---|---|
committer | David P. <megver83@parabola.nu> | 2024-04-07 00:26:27 -0400 |
commit | aa59d210cdc0421f4e3562121c92b08b4500257c (patch) | |
tree | 54bd8fe10fc90d5d41dbf5d8f7fa5459c2197fde | |
parent | 7543d99d7afd778cf735ab4961fc978dfeeffc1c (diff) |
updpkg: nonsystemd/pipewire 1:1.0.4-3.nonsystemd1
Signed-off-by: David P. <megver83@parabola.nu>
-rw-r--r-- | nonsystemd/pipewire/PKGBUILD | 39 | ||||
-rw-r--r-- | nonsystemd/pipewire/artix-pipewire-launcher | 66 | ||||
-rw-r--r-- | nonsystemd/pipewire/pipewire.desktop | 13 |
3 files changed, 20 insertions, 98 deletions
diff --git a/nonsystemd/pipewire/PKGBUILD b/nonsystemd/pipewire/PKGBUILD index 048814d23..756885621 100644 --- a/nonsystemd/pipewire/PKGBUILD +++ b/nonsystemd/pipewire/PKGBUILD @@ -3,9 +3,6 @@ # Maintainer (Arch): Jan Alexander Steffens (heftig) <heftig@archlinux.org> # Contributor (Arch): Jan de Groot <jgc@archlinux.org> -# Parabola changes and rationale: -# - install pipewire.desktop in /etc/xdg/autostart rather than /usr/share/applications - pkgbase=pipewire pkgname=( pipewire @@ -26,10 +23,10 @@ pkgname=( pipewire-session-manager pulse-native-provider ) -_commit=6ab86209f23a841de7eac6bc0c1009aceb9ffd87 # tags/1.0.3 -pkgver=1.0.3 +_commit=f2874ad1c2f7f0b9a1da05cc4f402b3ea3761ee6 # tags/1.0.4 +pkgver=1.0.4 _so_ver=0.3 -pkgrel=1 +pkgrel=3 pkgrel+=.nonsystemd1 epoch=1 pkgdesc="Low-latency audio/video router and processor" @@ -66,6 +63,7 @@ makedepends=( ncurses opus python-docutils + python-packaging readline roc-toolkit rtkit @@ -80,12 +78,8 @@ checkdepends=( ) source=( "git+https://gitlab.freedesktop.org/pipewire/pipewire.git#commit=$_commit" - artix-pipewire-launcher - pipewire.desktop ) -b2sums=('SKIP' - 'b24d6c83d6846dd9de8806ea5cd8da5745a13645cea6e0904c4ce6bfb2f018e189f698e2ff1d44e38538d1233b63fd3ad0c1492e3e3ed0d62ae78282ff696755' - '9571effe6042a51a9ef770000e65c1f35aaf56bb07eb191407b5038bdee209dd49572b5f457312ea6b6fbab1b04454468d1b9ad57d8fa7e4e0a94773e7c07197') +b2sums=('a1a9905ec4b09fe7d24bdf08164d96a1b2ee285576b53b941b6c245bf4c63991295398cb14e22555e4ba2bdff8d16523ef27fa05f81a336df3991f2ac9d911e1') pkgver() { cd pipewire @@ -94,8 +88,13 @@ pkgver() { prepare() { cd pipewire - # fix libcamera integration for 0.2.0 - git cherry-pick -n fd33d2d3bb6333c7d6e74cbaa806bff2d908f589 + + # Gst plugin fixes + git cherry-pick -n \ + f1b75fc6f803f866d2ed0f7d1366f56ef96f0610 \ + 8a271a87b77e4508bb698f9b9e9fe3624884bfa6 \ + 1a6bb994a502d95434e326a35a83a1fb5f4ebad8 \ + 8848c7e7920618b97016243912bcb20c69a71960 } build() { @@ -103,13 +102,13 @@ build() { -D bluez5-codec-lc3plus=disabled -D docs=enabled -D jack-devel=true - -D systemd=disabled -D libjack-path=/usr/lib -D man=enabled -D rlimits-install=false -D selinux=disabled -D session-managers=[] -D udevrulesdir=/usr/lib/udev/rules.d + -D systemd=disabled ) arch-meson pipewire build "${meson_options[@]}" @@ -117,7 +116,7 @@ build() { } check() { - meson test -C build --print-errorlogs || : + meson test -C build --print-errorlogs } _pick() { @@ -193,14 +192,16 @@ package_pipewire() { _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-fallback-sink.so _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-filter-chain*.so _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-loopback.so - _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-netjack2-*.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-netjack2*.so _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-pipe-tunnel.so _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-protocol-simple.so _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-rtp-{sap,sink,source}.so - _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-vban-{recv,send}.so + _pick audio usr/lib/pipewire-$_so_ver/libpipewire-module-vban*.so _pick audio usr/lib/spa-0.2/{aec,alsa,audio*,avb,bluez5} _pick audio usr/share/alsa _pick audio usr/share/man/man1/pw-{cat,loopback,mididump}.1 + _pick audio usr/share/man/man1/spa-{acp-tool,resample}.1 + _pick audio usr/share/man/man5/pipewire-filter-chain.conf.5 _pick audio usr/share/man/man7/libpipewire-module-{avb,echo-cancel,fallback-sink,filter-chain*,loopback,netjack2*,pipe-tunnel,protocol-simple,rtp-{sap,sink,source},vban*}.7 _pick audio usr/share/pipewire/filter-chain* _pick audio usr/share/pipewire/pipewire-{aes67,avb}.conf @@ -218,6 +219,7 @@ package_pipewire() { _pick jack usr/lib/libjack* _pick jack usr/lib/pkgconfig/jack.pc _pick jack usr/share/man/man1/pw-jack.1 + _pick jack usr/share/man/man5/pipewire-jack.conf.5 _pick jack usr/share/pipewire/jack.conf _pick pulse usr/bin/pipewire-pulse @@ -239,6 +241,7 @@ package_pipewire() { _pick zeroconf usr/share/man/man7/libpipewire-module-{raop-*,rtp-session,zeroconf*}.7 _pick v4l2 usr/bin/pw-v4l2 usr/lib/pipewire-$_so_ver/v4l2 + _pick v4l2 usr/share/man/man1/pw-v4l2.1 _pick x11-bell usr/lib/pipewire-$_so_ver/libpipewire-module-x11-bell.so _pick x11-bell usr/share/man/man7/libpipewire-module-x11-bell.7 @@ -246,8 +249,6 @@ package_pipewire() { # directories for overrides mkdir -p etc/pipewire/{client-rt,client,minimal,pipewire}.conf.d ) - install -Dm755 "$srcdir"/artix-pipewire-launcher "$pkgdir"/usr/bin/artix-pipewire-launcher - install -Dm644 "$srcdir"/pipewire.desktop "$pkgdir"/etc/xdg/autostart/pipewire.desktop install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 pipewire/COPYING } diff --git a/nonsystemd/pipewire/artix-pipewire-launcher b/nonsystemd/pipewire/artix-pipewire-launcher deleted file mode 100644 index aafd84b18..000000000 --- a/nonsystemd/pipewire/artix-pipewire-launcher +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/sh - -# WARNING: This script assumes being run inside XDG compliant session, -# which means D-Bus session instance is expected to be correctly set up -# prior to this script starting. If that is not true, things may break! - -DATE_FORMAT='+%Y-%m-%dT%H:%M:%S%Z' - -CONF="${XDG_CONFIG_HOME}/artix-pipewire-launcher.conf" -if [ -f "${CONF}" ]; then - . "${CONF}" -else - ARTIX_PIPEWIRE_LOG='/dev/null' - ARTIX_PIPEWIRE_PULSE_LOG='/dev/null' - ARTIX_WIREPLUMBER_LOG='/dev/null' -fi -for L in \ - "${ARTIX_PIPEWIRE_LOG}" \ - "${ARTIX_PIPEWIRE_PULSE_LOG}" \ - "${ARTIX_WIREPLUMBER_LOG}"; do - if [ ! -e "${L}" ]; then - touch "${L}" - fi -done - -restart() { - echo "Terminating PipeWire processes ..." - pkill -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1 - pidwait -u "${USER}" -x pipewire\|wireplumber - echo "PipeWire terminated." -} - -if [ "${#}" -gt 0 ]; then - if [ "${1}" = 'restart' ]; then - restart - else - echo "Unrecognised argument." >&2 - echo "Usage: artix-pipewire-launcher [restart]" >&2 - exit 1 - fi -fi - -if pgrep -u "${USER}" -x pipewire\|wireplumber 1>/dev/null 2>&1; then - echo "PipeWire already running, exiting." >&2 - echo "(Use 'artix-pipewire-launcher restart' to restart PipeWire and WirePlumber.)" >&2 - exit 1 -fi - -# The core daemon which by itself does probably nothing. -echo "[/bin/date ${DATE_FORMAT})] Starting PipeWire." 1>>"${ARTIX_PIPEWIRE_LOG}" -/usr/bin/pipewire 1>>"${ARTIX_PIPEWIRE_LOG}" 2>&1 & - -# The so called pipewire-pulse daemon used for PulseAudio compatibility. -# Commenting this out will stop the PA proxying daemon from starting, -# however ALSA (with pipewire-alsa), JACK (with jack-sdk) and PW API using -# clients will still have access to audio and may end up clashing with -# non-PW apps over HW control (most notably, /usr/bin/pulseaudio daemon). -echo "[/bin/date ${DATE_FORMAT})] Starting PipeWire-Pulse." 1>>"${ARTIX_PIPEWIRE_PULSE_LOG}" -/usr/bin/pipewire -c pipewire-pulse.conf 1>>"${ARTIX_PIPEWIRE_PULSE_LOG}" 2>&1 & - -# Hack for bug #822498 -sleep 1 - -# Finally a session manager is required for PipeWire to do anything. -echo "[/bin/date ${DATE_FORMAT})] Starting WirePlumber." 1>>"${ARTIX_WIREPLUMBER_LOG}" -exec /usr/bin/wireplumber 1>>"${ARTIX_WIREPLUMBER_LOG}" 2>&1 diff --git a/nonsystemd/pipewire/pipewire.desktop b/nonsystemd/pipewire/pipewire.desktop deleted file mode 100644 index 99661fdd9..000000000 --- a/nonsystemd/pipewire/pipewire.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name[de]=PipeWire Mediensystem -Name=PipeWire Media System -Categories=Audio;AudioVideo -Comment[de]=Das PipeWire Mediensystem starten -Comment=Start the PipeWire Media System -Exec=/usr/bin/artix-pipewire-launcher restart -Terminal=false -Type=Application -X-GNOME-HiddenUnderSystemd=true -X-KDE-HiddenUnderSystemd=true -X-systemd-skip=true |