diff --git a/media/video/pipewire/pipewire-launcher.sh b/media/video/pipewire/pipewire-launcher.sh deleted file mode 100755 index 94dd1355..00000000 --- a/media/video/pipewire/pipewire-launcher.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -source /etc/profile.d/pipewire.sh -# We need to kill any existing pipewire instance to restore sound -pkill -u "${USER}" -fx /usr/bin/pipewire-pulse 1>/dev/null 2>&1 -pkill -u "${USER}" -fx /usr/bin/pipewire-media-session 1>/dev/null 2>&1 -pkill -u "${USER}" -fx /usr/bin/wireplumber 1>/dev/null 2>&1 -pkill -u "${USER}" -fx /usr/bin/pipewire 1>/dev/null 2>&1 - -exec /usr/bin/pipewire & - -# wait for pipewire to start before attempting to start related daemons -while [ "$(pgrep -f /usr/bin/pipewire)" = "" ]; do - sleep 1 -done - -if [ -x /usr/bin/wireplumber ]; then - exec /usr/bin/wireplumber & -elif [ -x /usr/bin/pipewire-media-session ]; then - exec /usr/bin/pipewire-media-session & -fi - -[ -f "/usr/share/pipewire/pipewire-pulse.conf" ] && exec /usr/bin/pipewire-pulse & diff --git a/media/video/pipewire/pipewire.desktop b/media/video/pipewire/pipewire.desktop deleted file mode 100755 index 1b7c78c7..00000000 --- a/media/video/pipewire/pipewire.desktop +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Version=1.0 -Name=Pipewire -Comment=Start Pipewire -Exec=/usr/libexec/pipewire-launcher -Terminal=false -Type=Application -X-KDE-autostart-phase=1 diff --git a/media/video/pipewire/pipewire.env b/media/video/pipewire/pipewire.env deleted file mode 100644 index 350af948..00000000 --- a/media/video/pipewire/pipewire.env +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -[ -d $HOME/.config/pipewire ] || mkdir -p $HOME/.config/pipewire -[ -d $HOME/.config/pulse ] || mkdir -p $HOME/.config/pulse - -export PULSE_SERVER=unix:$HOME/.config/pulse/native -export PULSE_RUNTIME_PATH=$HOME/.config/pulse/ -export PIPEWIRE_RUNTIME_DIR=$HOME/.config/pipewire diff --git a/media/video/pipewire/ympbuild b/media/video/pipewire/ympbuild index 85c0984e..1f851459 100644 --- a/media/video/pipewire/ympbuild +++ b/media/video/pipewire/ympbuild @@ -1,22 +1,18 @@ #!/usr/bin/env bash name='pipewire' -release='2' -version='1.4.2' +release='3' +version='1.6.3' url='https://pipewire.org/' description='Multimedia processing graphs' email='bayramk@gmail.com' maintainer='bk' license=('GPLv3') source=("https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$version/pipewire-$version.tar.gz" - "pipewire.env" - "pipewire.desktop" - "pipewire-launcher.sh") + "https://github.com/my-garbage-stuff/pipewire-system/archive/refs/tags/1.0.0.tar.gz") depends=(lilv libpulse alsa-lib dbus) makedepends=() -sha256sums=('4712aada64b9b49ad41fbb8b440914481432a560f2619ffbdd49461f8d22994f' - 'SKIP' - 'SKIP' - 'SKIP') +sha256sums=('93db72dc06768db548d48ae2b8e96e7c299c89a47f5c4426f152221aa90b0f2d' + 'ec6329020ee5535b07f2313181f1f3a4414c57ffeeffc4bcf89a1b0850e7e20b') group=(media.video) uses=(alsa gstreamer bluetooth jack) uses_extra=(v4l2) @@ -25,6 +21,9 @@ arch=('x86_64') cd $name-$version +unset CFLAGS +unset CXXFLAGS + setup(){ meson setup build --prefix=/usr \ @@ -48,9 +47,6 @@ build(){ package(){ ninja -C build install mkdir -p ${DESTDIR}/usr/libexec ${DESTDIR}/etc/xdg/autostart/ ${DESTDIR}/etc/profile.d - # pipewire launcher from alpine linux - install ../pipewire-launcher.sh ${DESTDIR}/usr/libexec/pipewire-launcher - install ../pipewire.env ${DESTDIR}/etc/profile.d/pipewire.sh - install ../pipewire.desktop ${DESTDIR}/etc/xdg/autostart/ + make install -C ../pipewire-system-1.0.0 }