[testing] -> [extra] 'pulseaudio-15.0-1' move

master
Nathan Owens 1 year ago
parent 0b521ce429
commit d9340ef646
  1. 37
      x86_64/extra/PKGBUILD
  2. 22
      x86_64/extra/gstreamer.patch
  3. 42
      x86_64/extra/meson-elogind-support.patch
  4. 189
      x86_64/testing/PKGBUILD

@ -3,22 +3,18 @@
pkgbase=pulseaudio
pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp})
pkgdesc="A featureful, general-purpose sound server"
pkgver=14.2
pkgrel=3.1
pkgver=15.0
pkgrel=1
arch=(x86_64)
url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
license=(GPL)
makedepends=(libasyncns libcap attr libxtst libsm libsndfile rtkit libsoxr
speexdsp tdb elogind dbus avahi bluez bluez-libs jack2 sbc
lirc openssl fftw orc gtk3 webrtc-audio-processing check git meson
xmltoman doxygen)
_commit=6a487c5244563f49a025088de3510c80824fc99e # tags/v14.2^0
source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit"
"meson-elogind-support.patch"
"gstreamer.patch")
sha256sums=('SKIP'
'fea0e09a9f026bc3c9160b53018b8e1dd1f3493c60f68405a758de7d3cb592cf'
'e23ce0ddf5a63dee8d91fc1d3bb9323f1e3bfc76d58420bf89f19d23d27f5929')
xmltoman valgrind doxygen)
_commit=6329a2498eb038f8a9537888280a62b00a93f68e # tags/v15.0^0
source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit")
sha256sums=('SKIP')
pkgver() {
cd pulseaudio
@ -29,19 +25,22 @@ prepare() {
cd pulseaudio
# Freeze version before patching
patch -Np 1 -i ../meson-elogind-support.patch
patch -Np 1 -i ../gstreamer.patch
./git-version-gen doesnt-exist >.tarball-version
}
build() {
arch-meson pulseaudio build \
-D pulsedsp-location='/usr/\$LIB/pulseaudio' \
-D stream-restore-clear-old-devices=true \
-D udevrulesdir=/usr/lib/udev/rules.d \
-D systemd=disabled \
local meson_options=(
-D stream-restore-clear-old-devices=true
-D pulsedsp-location='/usr/\$LIB/pulseaudio'
-D udevrulesdir=/usr/lib/udev/rules.d
-D bluez5-gstreamer=disabled
-D tcpwrap=disabled
-D systemd=disabled
-D elogind=enabled
meson compile -C build
)
artix-meson pulseaudio build "${meson_options[@]}"
meson compile -C build
}
check() {
@ -78,7 +77,7 @@ package_pulseaudio() {
done
pulsever=${pulsever%%-*}
DESTDIR="$pkgdir" meson install -C build
meson install -C build --destdir "$pkgdir"
cd "$pkgdir"

@ -1,22 +0,0 @@
diff -Naur pulseaudio-14.2.orig/src/modules/meson.build pulseaudio-14.2/src/modules/meson.build
--- pulseaudio-14.2.orig/src/modules/meson.build 2021-01-16 18:26:36.000000000 +0100
+++ pulseaudio-14.2/src/modules/meson.build 2021-05-08 20:23:23.605579000 +0200
@@ -268,6 +268,8 @@
# FIXME: meson doesn't support multiple RPATH arguments currently
rpath_dirs = join_paths(privlibdir) + ':' + join_paths(modlibexecdir)
+common_args = '-I@0@'.format(meson.current_build_dir())
+
foreach m : all_modules
name = m[0]
sources = m[1]
@@ -280,7 +282,8 @@
sources,
headers,
include_directories : [configinc, topinc],
- c_args : [pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
+ cpp_args : common_args,
+ c_args : [common_args, pa_c_args, server_c_args, '-DPA_MODULE_NAME=' + name.underscorify()] + extra_flags,
install : true,
install_rpath : rpath_dirs,
install_dir : modlibexecdir,

@ -1,42 +0,0 @@
meson.build | 6 ++++++
meson_options.txt | 3 +++
2 files changed, 9 insertions(+)
diff --git a/meson.build b/meson.build
index 842d5f5b5..1daa3b067 100644
--- a/meson.build
+++ b/meson.build
@@ -484,6 +484,11 @@ if systemd_dep.found() and systemduserunitdir == ''
systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir')
endif
+libelogind_dep = dependency('libelogind', required : get_option('elogind'))
+if libelogind_dep.found()
+ cdata.set('HAVE_SYSTEMD_LOGIN', 1)
+endif
+
x11_dep = dependency('x11-xcb', required : get_option('x11'))
if x11_dep.found()
xcb_dep = dependency('xcb', required : true, version : '>= 1.6')
@@ -701,6 +706,7 @@ summary = [
'Enable udev: @0@'.format(udev_dep.found()),
' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')),
'Enable systemd: @0@'.format(libsystemd_dep.found()),
+ 'Enable elogind: @0@'.format(libelogind_dep.found()),
# 'Enable TCP Wrappers: @0@'.format(${ENABLE_TCPWRAP}),
'Enable libsamplerate: @0@'.format(samplerate_dep.found()),
'Enable IPv6: @0@'.format(get_option('ipv6')),
diff --git a/meson_options.txt b/meson_options.txt
index e54caf5cf..5fbb513c0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -126,6 +126,9 @@ option('udev',
option('x11',
type : 'feature', value : 'auto',
description : 'Optional X11 support')
+option('elogind',
+ type : 'feature', value : 'auto',
+ description : 'Optional elogind support')
# Echo cancellation

@ -1,189 +0,0 @@
# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=pulseaudio
pkgname=(pulseaudio libpulse pulseaudio-{zeroconf,lirc,jack,bluetooth,equalizer,rtp})
pkgdesc="A featureful, general-purpose sound server"
pkgver=15.0
pkgrel=1
arch=(x86_64)
url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
license=(GPL)
makedepends=(libasyncns libcap attr libxtst libsm libsndfile rtkit libsoxr
speexdsp tdb elogind dbus avahi bluez bluez-libs jack2 sbc
lirc openssl fftw orc gtk3 webrtc-audio-processing check git meson
xmltoman valgrind doxygen)
_commit=6329a2498eb038f8a9537888280a62b00a93f68e # tags/v15.0^0
source=("git+https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git#commit=$_commit")
sha256sums=('SKIP')
pkgver() {
cd pulseaudio
git describe --tags | sed 's/^v//;s/-/+/g'
}
prepare() {
cd pulseaudio
# Freeze version before patching
./git-version-gen doesnt-exist >.tarball-version
}
build() {
local meson_options=(
-D stream-restore-clear-old-devices=true
-D pulsedsp-location='/usr/\$LIB/pulseaudio'
-D udevrulesdir=/usr/lib/udev/rules.d
-D bluez5-gstreamer=disabled
-D tcpwrap=disabled
-D systemd=disabled
-D elogind=enabled
)
artix-meson pulseaudio build "${meson_options[@]}"
meson compile -C build
}
check() {
meson test -C build --print-errorlogs
ninja -C build test-daemon
}
_pick() {
local p="$1" f d; shift
for f; do
d="$srcdir/$p/${f#$pkgdir/}"
mkdir -p "$(dirname "$d")"
mv "$f" "$d"
rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
done
}
package_pulseaudio() {
depends=("libpulse=$pkgver-$pkgrel" rtkit libltdl speexdsp tdb orc libsoxr
webrtc-audio-processing libxtst)
optdepends=('pulseaudio-alsa: ALSA configuration (recommended)'
'pulseaudio-zeroconf: Zeroconf support'
'pulseaudio-lirc: IR (lirc) support'
'pulseaudio-jack: Jack support'
'pulseaudio-bluetooth: Bluetooth support'
'pulseaudio-equalizer: Graphical equalizer'
'pulseaudio-rtp: RTP and RAOP support')
backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
replaces=('pulseaudio-xen<=9.0' 'pulseaudio-gconf<=11.1')
local pulsever=$(cd pulseaudio; ./git-version-gen .tarball-version)
while [[ $pulsever = *.*.* ]]; do
pulsever=${pulsever%.*}
done
pulsever=${pulsever%%-*}
meson install -C build --destdir "$pkgdir"
cd "$pkgdir"
# Superseded by socket activation
sed -e '/autospawn/iautospawn = yes' \
-i etc/pulse/client.conf
# Disable cork-request module, can result in e.g. media players unpausing
# when there's a Skype call incoming
sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
-i usr/bin/start-pulseaudio-x11
# Required by qpaeq
sed -e '/Load several protocols/aload-module module-dbus-protocol' \
-i etc/pulse/default.pa
rm -r etc/dbus-1
# Split packages
_pick libpulse etc/pulse/client.conf
_pick libpulse usr/bin/pa{cat,ctl,dsp,mon,play,rec,record}
_pick libpulse usr/lib/libpulse{,-simple,-mainloop-glib}.so*
_pick libpulse usr/lib/{cmake,pkgconfig}
_pick libpulse usr/lib/pulseaudio/libpulse{dsp,common-*}.so
_pick libpulse usr/include
_pick libpulse usr/share/man/man1/pa{cat,ctl,dsp,mon,play,rec,record}.1
_pick libpulse usr/share/man/man5/pulse-client.conf.5
_pick libpulse usr/share/bash-completion/completions/pa{cat,ctl,dsp,play,rec,record}
_pick libpulse usr/share/bash-completion/completions/pulseaudio
_pick libpulse usr/share/vala
_pick libpulse usr/share/zsh
local moddir=usr/lib/pulse-$pulsever/modules
_pick zeroconf $moddir/libavahi-wrap.so
_pick zeroconf $moddir/module-zeroconf-{publish,discover}.so
_pick zeroconf $moddir/module-raop-discover.so
_pick lirc $moddir/module-lirc.so
_pick jack $moddir/module-jack-{sink,source}.so
_pick jack $moddir/module-jackdbus-detect.so
_pick bluetooth $moddir/libbluez5-util.so
_pick bluetooth $moddir/module-bluetooth-{discover,policy}.so
_pick bluetooth $moddir/module-bluez5-{discover,device}.so
_pick equalizer $moddir/module-equalizer-sink.so
_pick equalizer usr/bin/qpaeq
_pick rtp $moddir/lib{rtp,raop}.so
_pick rtp $moddir/module-rtp-{send,recv}.so
_pick rtp $moddir/module-raop-sink.so
}
package_libpulse() {
pkgdesc="$pkgdesc (client library)"
depends=(dbus libasyncns libcap libxcb libsm libsndfile libelogind)
optdepends=('glib2: mainloop integration')
provides=(libpulse{,-simple,-mainloop-glib}.so)
license=(LGPL)
backup=(etc/pulse/client.conf)
mv libpulse/* "$pkgdir"
}
package_pulseaudio-zeroconf() {
pkgdesc="Zeroconf support for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel" avahi openssl)
mv zeroconf/* "$pkgdir"
}
package_pulseaudio-lirc() {
pkgdesc="IR (lirc) support for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel" lirc)
mv lirc/* "$pkgdir"
}
package_pulseaudio-jack() {
pkgdesc="Jack support for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel" jack)
mv jack/* "$pkgdir"
}
package_pulseaudio-bluetooth() {
pkgdesc="Bluetooth support for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel" bluez bluez-libs sbc)
mv bluetooth/* "$pkgdir"
}
package_pulseaudio-equalizer() {
pkgdesc="Graphical equalizer for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel" python-{pyqt5,dbus} fftw)
mv equalizer/* "$pkgdir"
}
package_pulseaudio-rtp() {
pkgdesc="RTP and RAOP support for PulseAudio"
depends=("pulseaudio=$pkgver-$pkgrel")
mv rtp/* "$pkgdir"
}
# vim:set sw=2 et:
Loading…
Cancel
Save