summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072021-03-05 16:40:17 +0100
committersL1pKn072021-03-05 16:40:17 +0100
commitdf6b8d301c8ef167a12c3ea2a098914e40875273 (patch)
treecb118a0dab712bdf9f24498f79929560e87ec4b5
parent9e50a36971b62770ac2d5a5ca7917ac33949f673 (diff)
downloadaur-df6b8d301c8ef167a12c3ea2a098914e40875273.tar.gz
bump
-rw-r--r--.SRCINFO55
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD100
-rw-r--r--pipewire-media-session.install15
4 files changed, 104 insertions, 67 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7f4a80f5ab3..52b6503a2fb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pipewire-git
- pkgdesc = Server and user space API to deal with multimedia pipelines. (GIT version)
- pkgver = 0.3.22.17.g686524ce
+ pkgdesc = Low-latency audio/video router and processor (GIT version)
+ pkgver = 0.3.23.7.gb40397d9
pkgrel = 1
url = https://pipewire.org
arch = x86_64
@@ -14,7 +14,6 @@ pkgbase = pipewire-git
makedepends = valgrind
makedepends = libpulse
makedepends = alsa-lib
- makedepends = jack2
makedepends = sbc
makedepends = rtkit
makedepends = dbus
@@ -32,15 +31,15 @@ pkgbase = pipewire-git
pkgname = pipewire-git
install = pipewire-git.install
depends = alsa-card-profiles-git
- depends = bluez-libs
depends = rtkit
- depends = sbc
depends = libasound.so
+ depends = libbluetooth.so
depends = libdbus-1.so
depends = libfdk-aac.so
depends = libldacBT_enc.so
depends = libncursesw.so
depends = libopenaptx.so
+ depends = libsbc.so
depends = libsndfile.so
depends = libsystemd.so
depends = libudev.so
@@ -49,47 +48,43 @@ pkgname = pipewire-git
optdepends = pipewire-alsa-git: ALSA support
optdepends = pipewire-pulse-git: PulseAudio support
optdepends = pipewire-ffmpeg-git: ffmpeg support
+ optdepends = pipewire-media-session-git: Default session manager
optdepends = gst-plugin-pipewire-git: gstreamer support
provides = pipewire
provides = libpipewire-0.3.so
conflicts = pipewire
- backup = etc/pipewire/client-rt.conf
- backup = etc/pipewire/client.conf
- backup = etc/pipewire/jack.conf
- backup = etc/pipewire/pipewire-pulse.conf
backup = etc/pipewire/pipewire.conf
- backup = etc/pipewire/media-session.d/alsa-monitor.conf
- backup = etc/pipewire/media-session.d/bluez-monitor.conf
- backup = etc/pipewire/media-session.d/media-session.conf
- backup = etc/pipewire/media-session.d/v4l2-monitor.conf
+ backup = etc/pipewire/pipewire-pulse.conf
+ backup = etc/pipewire/client.conf
+ backup = etc/pipewire/client-rt.conf
pkgname = pipewire-docs-git
- pkgdesc = Server and user space API to deal with multimedia pipelines. (documentation) (GIT Version)
+ pkgdesc = Low-latency audio/video router and processor (GIT version) - documentation (GIT Version)
arch = any
provides = pipewire-docs
conflicts = pipewire-docs
pkgname = pipewire-jack-git
- pkgdesc = Server and user space API to deal with multimedia pipelines. (JACK support) (GIT Version)
- depends = pipewire
+ pkgdesc = Low-latency audio/video router and processor (GIT version) - JACK support (GIT version)
+ depends = pipewire-media-session
depends = libpipewire-0.3.so
- depends = libjack.so
provides = pipewire-jack
conflicts = pipewire-jack
+ backup = etc/pipewire/jack.conf
pkgname = pipewire-alsa-git
- pkgdesc = ALSA Configuration for PipeWire (ALSA support) (GIT version)
+ pkgdesc = Low-latency audio/video router and processor (GIT version) - ALSA configuration (GIT version)
arch = any
- depends = pipewire
- depends = libpipewire-0.3.so
+ depends = pipewire-media-session
provides = pipewire-alsa
+ provides = pulseaudio-alsa
conflicts = pipewire-alsa
pkgname = pipewire-pulse-git
- pkgdesc = Server and user space API to deal with multimedia pipelines. (Pulse support) (GIT version)
+ pkgdesc = Low-latency audio/video router and processor (GIT version) - PulseAudio replacement (GIT version)
install = pipewire-pulse.install
arch = any
- depends = pipewire
+ depends = pipewire-media-session
depends = libpulse
provides = pipewire-pulse
provides = pulseaudio
@@ -99,15 +94,27 @@ pkgname = pipewire-pulse-git
conflicts = pulseaudio-bluetooth
pkgname = pipewire-ffmpeg-git
- pkgdesc = Server and user space API to deal with multimedia pipelines. (FFmpeg SPA plugin) (GIT version)
+ pkgdesc = Low-latency audio/video router and processor (GIT version) - FFmpeg SPA plugin (GIT version)
depends = pipewire
depends = libpipewire-0.3.so
depends = ffmpeg
provides = pipewire-ffmpeg
conflicts = pipewire-ffmpeg
+pkgname = pipewire-media-session-git
+ pkgdesc = Low-latency audio/video router and processor (GIT version) - Session managerm (GIT version)
+ install = pipewire-media-session.install
+ depends = pipewire
+ depends = libpipewire-0.3.so
+ provides = pipewire-media-session
+ conflicts = pipewire-media-session
+ backup = etc/pipewire/media-session.d/media-session.conf
+ backup = etc/pipewire/media-session.d/alsa-monitor.conf
+ backup = etc/pipewire/media-session.d/bluez-monitor.conf
+ backup = etc/pipewire/media-session.d/v4l2-monitor.conf
+
pkgname = alsa-card-profiles-git
- pkgdesc = ALSA card profiles shared by PipeWire (GIT version)
+ pkgdesc = Low-latency audio/video router and processor (GIT version) - ALSA card profiles (GIT version)
arch = any
provides = alsa-card-profiles
conflicts = alsa-card-profiles
diff --git a/.gitignore b/.gitignore
index b4b2790238c..9d86a6f2e25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
!PKGBUILD
!pipewire-git.install
!pipewire-pulse.install
+!pipewire-media-session.install
diff --git a/PKGBUILD b/PKGBUILD
index eca8a7e6bee..f009653c780 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,12 @@ pkgname=('pipewire-git'
'pipewire-alsa-git'
'pipewire-pulse-git'
'pipewire-ffmpeg-git'
+ 'pipewire-media-session-git'
'alsa-card-profiles-git'
)
-pkgver=0.3.22.17.g686524ce
+pkgver=0.3.23.7.gb40397d9
pkgrel=1
-pkgdesc='Server and user space API to deal with multimedia pipelines. (GIT version)'
+pkgdesc='Low-latency audio/video router and processor (GIT version)'
arch=('x86_64')
url='https://pipewire.org'
license=('LGPL')
@@ -21,7 +22,6 @@ makedepends=('git'
'valgrind'
'libpulse'
'alsa-lib'
- 'jack2'
'sbc'
'rtkit'
'dbus'
@@ -61,6 +61,7 @@ build() {
arch-meson ../pipewire \
-D udevrulesdir=/usr/lib/udev/rules.d \
-D docs=true \
+ -D jack=false \
-D gstreamer=false \
-D ffmpeg=true \
@@ -83,15 +84,15 @@ _pick() {
package_pipewire-git() {
depends=('alsa-card-profiles-git'
- 'bluez-libs'
'rtkit'
- 'sbc'
'libasound.so'
+ 'libbluetooth.so'
'libdbus-1.so'
'libfdk-aac.so'
'libldacBT_enc.so'
'libncursesw.so'
'libopenaptx.so'
+ 'libsbc.so'
'libsndfile.so'
'libsystemd.so'
'libudev.so'
@@ -101,46 +102,41 @@ package_pipewire-git() {
'pipewire-alsa-git: ALSA support'
'pipewire-pulse-git: PulseAudio support'
'pipewire-ffmpeg-git: ffmpeg support'
+ 'pipewire-media-session-git: Default session manager'
'gst-plugin-pipewire-git: gstreamer support'
)
provides=('pipewire'
"libpipewire-${pkgver:0:3}.so"
)
conflicts=('pipewire')
- backup=('etc/pipewire/client-rt.conf'
- 'etc/pipewire/client.conf'
- 'etc/pipewire/jack.conf'
- 'etc/pipewire/pipewire-pulse.conf'
- 'etc/pipewire/pipewire.conf'
- 'etc/pipewire/media-session.d/alsa-monitor.conf'
- 'etc/pipewire/media-session.d/bluez-monitor.conf'
- 'etc/pipewire/media-session.d/media-session.conf'
- 'etc/pipewire/media-session.d/v4l2-monitor.conf'
- )
+ backup=(etc/pipewire/{pipewire{,-pulse},client{,-rt}}.conf)
install=pipewire-git.install
DESTDIR="${pkgdir}" meson install -C build
cd "${pkgdir}"
+ _pick acp usr/lib/udev
+ _pick acp usr/share/alsa-card-profile
+
_pick docs usr/share/doc
- _pick jack etc/pipewire/media-session.d/with-jack
+ _pick pms etc/pipewire/media-session.d/*.conf
+ _pick pms usr/bin/pipewire-media-session
+ _pick pms usr/lib/systemd/user/pipewire-media-session.service
+
+ _pick jack etc/pipewire/{jack.conf,media-session.d/with-jack}
_pick jack usr/bin/pw-jack usr/lib/pipewire-${pkgver:0:3}/jack
- _pick jack usr/lib/spa-0.2/jack
_pick jack usr/share/man/man1/pw-jack.1
_pick pulse etc/pipewire/media-session.d/with-pulseaudio
_pick ffmpeg usr/lib/spa-0.2/ffmpeg/libspa-ffmpeg.so
- _pick acp usr/lib/udev
- _pick acp usr/share/alsa-card-profile
-
}
package_pipewire-docs-git() {
- pkgdesc='Server and user space API to deal with multimedia pipelines. (documentation) (GIT Version)'
+ pkgdesc+=" - documentation (GIT Version)"
provides=('pipewire-docs')
conflicts=('pipewire-docs')
arch=('any')
@@ -149,11 +145,11 @@ package_pipewire-docs-git() {
}
package_pipewire-jack-git() {
- pkgdesc='Server and user space API to deal with multimedia pipelines. (JACK support) (GIT Version)'
- depends=('pipewire'
+ pkgdesc+=" - JACK support (GIT version)"
+ depends=('pipewire-media-session'
"libpipewire-${pkgver:0:3}.so"
- 'libjack.so'
)
+ backup=('etc/pipewire/jack.conf')
provides=('pipewire-jack')
conflicts=('pipewire-jack')
@@ -161,8 +157,8 @@ package_pipewire-jack-git() {
}
package_pipewire-pulse-git() {
- pkgdesc='Server and user space API to deal with multimedia pipelines. (Pulse support) (GIT version)'
- depends=('pipewire'
+ pkgdesc+=" - PulseAudio replacement (GIT version)"
+ depends=('pipewire-media-session'
'libpulse'
)
provides=('pipewire-pulse'
@@ -180,30 +176,23 @@ package_pipewire-pulse-git() {
}
package_pipewire-alsa-git() {
- pkgdesc="ALSA Configuration for PipeWire (ALSA support) (GIT version)"
- depends=('pipewire'
- "libpipewire-${pkgver:0:3}.so"
- )
- provides=('pipewire-alsa')
+ pkgdesc+=" - ALSA configuration (GIT version)"
+ depends=('pipewire-media-session')
+ provides=('pipewire-alsa'
+ 'pulseaudio-alsa'
+ )
conflicts=('pipewire-alsa')
arch=('any')
- mkdir -p "${pkgdir}"/etc/{alsa/conf.d,pipewire/media-session.d}
- ln -st "${pkgdir}/etc/alsa/conf.d" /usr/share/alsa/alsa.conf.d/{50-pipewire,99-pipewire-default}.conf
- touch "${pkgdir}/etc/pipewire/media-session.d/with-alsa"
-}
+ mkdir -p "${pkgdir}/etc/alsa/conf.d"
+ ln -st "${pkgdir}/etc/alsa/conf.d" \
+ /usr/share/alsa/alsa.conf.d/{50-pipewire,99-pipewire-default}.conf
-package_alsa-card-profiles-git() {
- pkgdesc="ALSA card profiles shared by PipeWire (GIT version)"
- provides=('alsa-card-profiles')
- conflicts=('alsa-card-profiles')
- arch=('any')
-
- mv acp/* "${pkgdir}"
+ install -Dm644 /dev/null "${pkgdir}/etc/pipewire/media-session.d/with-alsa"
}
package_pipewire-ffmpeg-git() {
- pkgdesc='Server and user space API to deal with multimedia pipelines. (FFmpeg SPA plugin) (GIT version)'
+ pkgdesc+=" - FFmpeg SPA plugin (GIT version)"
depends=('pipewire'
"libpipewire-${pkgver:0:3}.so"
'ffmpeg'
@@ -213,3 +202,28 @@ package_pipewire-ffmpeg-git() {
mv ffmpeg/* "${pkgdir}"
}
+
+package_pipewire-media-session-git() {
+ pkgdesc+=" - Session managerm (GIT version)"
+ depends=('pipewire'
+ "libpipewire-${pkgver:0:3}.so"
+ )
+ provides=('pipewire-media-session')
+ conflicts=('pipewire-media-session')
+ backup=('etc/pipewire/media-session.d/media-session.conf'
+ etc/pipewire/media-session.d/{alsa,bluez,v4l2}-monitor.conf
+ )
+ install=pipewire-media-session.install
+
+ mv pms/* "${pkgdir}"
+}
+
+
+package_alsa-card-profiles-git() {
+ pkgdesc+=" - ALSA card profiles (GIT version)"
+ provides=('alsa-card-profiles')
+ conflicts=('alsa-card-profiles')
+ arch=('any')
+
+ mv acp/* "${pkgdir}"
+}
diff --git a/pipewire-media-session.install b/pipewire-media-session.install
new file mode 100644
index 00000000000..fd721ee40f1
--- /dev/null
+++ b/pipewire-media-session.install
@@ -0,0 +1,15 @@
+post_install() {
+ # Enable service by default
+ # WantedBy=pipewire.service, which is itself socket-activated
+ systemctl --global enable pipewire-media-session.service
+}
+
+post_upgrade() {
+ if (( $(vercmp $2 0.3.23-1) < 0)); then
+ systemctl --global enable pipewire-media-session.service
+ fi
+}
+
+pre_remove() {
+ systemctl --global disable pipewire-media-session.service
+}