temp/pulseaudio: Refresh from upstream (MR 4480)
Refresh the package with latest changes from Alpine Signed-off-by: Alistair Francis <alistair@alistair23.me>
This commit is contained in:
parent
a0a14ce58d
commit
32b9b64c98
@ -3,13 +3,12 @@
|
|||||||
pkgname=pulseaudio
|
pkgname=pulseaudio
|
||||||
pkgver=9999_git20220621
|
pkgver=9999_git20220621
|
||||||
_pkgver=16.1
|
_pkgver=16.1
|
||||||
pkgrel=0
|
pkgrel=1
|
||||||
pkgdesc="featureful, general-purpose sound server"
|
pkgdesc="featureful, general-purpose sound server"
|
||||||
provider_priority=10
|
provider_priority=10
|
||||||
url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
|
url="https://www.freedesktop.org/wiki/Software/PulseAudio/"
|
||||||
arch="all"
|
arch="all"
|
||||||
license="LGPL-2.1-or-later"
|
license="LGPL-2.1-or-later"
|
||||||
options="!check"
|
|
||||||
makedepends="
|
makedepends="
|
||||||
meson
|
meson
|
||||||
tdb-dev
|
tdb-dev
|
||||||
@ -31,7 +30,7 @@ makedepends="
|
|||||||
sbc-dev
|
sbc-dev
|
||||||
fftw-dev
|
fftw-dev
|
||||||
jack-dev
|
jack-dev
|
||||||
openssl1.1-compat-dev
|
openssl-dev>3
|
||||||
speexdsp-dev
|
speexdsp-dev
|
||||||
eudev-dev
|
eudev-dev
|
||||||
libcap-dev
|
libcap-dev
|
||||||
@ -92,19 +91,11 @@ source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$_pkgver
|
|||||||
0025-bluetooth-support-ATD-number.patch
|
0025-bluetooth-support-ATD-number.patch
|
||||||
0026-bluetooth-strip-additional-out-of-spec-r-n-chars.patch
|
0026-bluetooth-strip-additional-out-of-spec-r-n-chars.patch
|
||||||
link-libintl.patch
|
link-libintl.patch
|
||||||
|
remove-once-test.patch
|
||||||
$pkgname.initd
|
$pkgname.initd
|
||||||
$pkgname.confd
|
$pkgname.confd
|
||||||
"
|
"
|
||||||
|
|
||||||
case "$CARCH" in
|
|
||||||
aarch64|armv7|armhf|x86|ppc64le)
|
|
||||||
options="$options !check" # once-test fails, all others pass
|
|
||||||
;;
|
|
||||||
s390x)
|
|
||||||
options="$options !check" # mix-test fails, all others pass
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
case "$CARCH" in
|
case "$CARCH" in
|
||||||
x86|x86_64|aarch64)
|
x86|x86_64|aarch64)
|
||||||
makedepends="$makedepends webrtc-audio-processing-dev"
|
makedepends="$makedepends webrtc-audio-processing-dev"
|
||||||
@ -124,9 +115,10 @@ prepare() {
|
|||||||
|
|
||||||
build() {
|
build() {
|
||||||
abuild-meson \
|
abuild-meson \
|
||||||
|
-Db_lto=true \
|
||||||
-Dgcov=false \
|
-Dgcov=false \
|
||||||
-Dman=true \
|
-Dman=true \
|
||||||
-Dtests=true \
|
-Dtests="$(want_check && echo true || echo false)" \
|
||||||
-Dsystem_user=pulse \
|
-Dsystem_user=pulse \
|
||||||
-Dsystem_group=pulse \
|
-Dsystem_group=pulse \
|
||||||
-Ddatabase=tdb \
|
-Ddatabase=tdb \
|
||||||
@ -157,11 +149,12 @@ build() {
|
|||||||
-Ddoxygen=false \
|
-Ddoxygen=false \
|
||||||
-Dstream-restore-clear-old-devices=true \
|
-Dstream-restore-clear-old-devices=true \
|
||||||
. output
|
. output
|
||||||
meson compile ${JOBS:+-j ${JOBS}} -C output
|
meson compile -C output
|
||||||
}
|
}
|
||||||
|
|
||||||
check() {
|
check() {
|
||||||
meson test --no-rebuild -v -C output
|
XDG_RUNTIME_DIR="$(mktemp -d)" \
|
||||||
|
meson test --no-rebuild --print-errorlogs -C output
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
@ -220,7 +213,6 @@ bluez() {
|
|||||||
alsa() {
|
alsa() {
|
||||||
pkgdesc="Pulseaudio ALSA support"
|
pkgdesc="Pulseaudio ALSA support"
|
||||||
install_if="$pkgname=$pkgver-r$pkgrel alsa-lib"
|
install_if="$pkgname=$pkgver-r$pkgrel alsa-lib"
|
||||||
provider_priority=10 # highest (other provider is pipewire-pulse)
|
|
||||||
|
|
||||||
amove usr/lib/pulseaudio/modules/*alsa*.so
|
amove usr/lib/pulseaudio/modules/*alsa*.so
|
||||||
}
|
}
|
||||||
@ -229,6 +221,7 @@ utils() {
|
|||||||
pkgdesc="Pulseaudio utilities"
|
pkgdesc="Pulseaudio utilities"
|
||||||
|
|
||||||
amove usr/bin/pa*
|
amove usr/bin/pa*
|
||||||
|
amove usr/bin/start-pulseaudio-x11
|
||||||
}
|
}
|
||||||
|
|
||||||
jack() {
|
jack() {
|
||||||
@ -283,6 +276,7 @@ a39cbab500be77e88a7b8dd615ce7e1a2f8d678b19fe823552bb5d1279e2ae06aac3c353e03e10d6
|
|||||||
3eec77a1b39dbab93a4284de433946b70d6b9f972e62b02f076cb4a45b1f288e32ae05d8d557ed13ef21eded407951f9c0f48c78bdac9d47f318d2c7b288e10c 0025-bluetooth-support-ATD-number.patch
|
3eec77a1b39dbab93a4284de433946b70d6b9f972e62b02f076cb4a45b1f288e32ae05d8d557ed13ef21eded407951f9c0f48c78bdac9d47f318d2c7b288e10c 0025-bluetooth-support-ATD-number.patch
|
||||||
76b486095b1f2bb5d23837ed8f08d5ac7533e7c9621b2534c85b39a932663ffcf86b7fefaba1f2abc6aa7a95660c658cbcdeef20427b8ebb6e05cf532ee48731 0026-bluetooth-strip-additional-out-of-spec-r-n-chars.patch
|
76b486095b1f2bb5d23837ed8f08d5ac7533e7c9621b2534c85b39a932663ffcf86b7fefaba1f2abc6aa7a95660c658cbcdeef20427b8ebb6e05cf532ee48731 0026-bluetooth-strip-additional-out-of-spec-r-n-chars.patch
|
||||||
2c31c5bc592e748248215f8f62f85687cfec230b05f65441e6dafa5fa77d4967e97636209b2011a4501ed1337ecd880b264baa175586fc85183a980846cb8146 link-libintl.patch
|
2c31c5bc592e748248215f8f62f85687cfec230b05f65441e6dafa5fa77d4967e97636209b2011a4501ed1337ecd880b264baa175586fc85183a980846cb8146 link-libintl.patch
|
||||||
34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd
|
c1223cf42538d91f31dbcb1a167537a1d3b6e8a3bf1b454cdebf95c25ca6f3b444848e9d546f092988851f71fe2c9dd9c4a781a58795e2f57d98563963a4630a remove-once-test.patch
|
||||||
|
d3a95453361d4b12e2d4df73a72bbdc9343e2a46e8f5f3aac07b3cb1f9e016fd89816745f485468d144911900a2b38741a371f91cf08285c4b4988e4403d91a0 pulseaudio.initd
|
||||||
75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd
|
75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd
|
||||||
"
|
"
|
||||||
|
@ -24,32 +24,32 @@ depend() {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if egrep -q '^[[:space:]]*load-module[[:space:]]+module-console-kit' "$script"; then
|
if grep -E -q '^[[:space:]]*load-module[[:space:]]+module-console-kit' "$script"; then
|
||||||
needs="${needs} consolekit"
|
needs="${needs} consolekit"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#ifdef UDEV
|
#ifdef UDEV
|
||||||
if egrep -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then
|
if grep -E -q '^[[:space:]]*load-module[[:space:]]+module-udev-detect' "$script"; then
|
||||||
needs="${needs} udev"
|
needs="${needs} udev"
|
||||||
fi
|
fi
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef AVAHI
|
#ifdef AVAHI
|
||||||
if egrep -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then
|
if grep -E -q '^[[:space:]]*load-module[[:space:]]+module-zeroconf-publish' "$script"; then
|
||||||
needs="${needs} avahi-daemon"
|
needs="${needs} avahi-daemon"
|
||||||
fi
|
fi
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef BLUETOOTH
|
#ifdef BLUETOOTH
|
||||||
if egrep -q '^[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then
|
if grep -E -q '^[[:space:]]*load-module[[:space:]]+module-bt-proximity' "$script"; then
|
||||||
needs="${needs} bluetooth"
|
needs="${needs} bluetooth"
|
||||||
fi
|
fi
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ALSA
|
#ifdef ALSA
|
||||||
if egrep -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" ||
|
if grep -E -q '^[[:space:]]*load-module[[:space:]]+module-alsa-(sink|source)' "$script" ||
|
||||||
egrep -q '^[[:space:]]*load-module[[:space:]]+module-(udev-)?detect' "$script" ||
|
grep -E -q '^[[:space:]]*load-module[[:space:]]+module-(udev-)?detect' "$script" ||
|
||||||
egrep -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then
|
grep -E -q '^[[:space:]]*add-autoload-source[[:space:]]+(input|output)[[:space:]]+module-alsa-(sink|source)' "$script"; then
|
||||||
needs="${needs} alsa" # in Alpine install alsa-utils to provide /etc/init.d/alsa (not alsasound as in Gentoo).
|
needs="${needs} alsa" # in Alpine install alsa-utils to provide /etc/init.d/alsa (not alsasound as in Gentoo).
|
||||||
fi
|
fi
|
||||||
#endif
|
#endif
|
||||||
|
16
temp/pulseaudio/remove-once-test.patch
Normal file
16
temp/pulseaudio/remove-once-test.patch
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
--- a/src/tests/meson.build
|
||||||
|
+++ b/src/tests/meson.build
|
||||||
|
@@ -111,13 +111,6 @@
|
||||||
|
]
|
||||||
|
endif
|
||||||
|
|
||||||
|
- if host_machine.system() != 'darwin'
|
||||||
|
- default_tests += [
|
||||||
|
- [ 'once-test', 'once-test.c',
|
||||||
|
- [ check_dep, thread_dep, libpulse_dep, libpulsecommon_dep, libpulsecore_dep, libatomic_ops_dep ] ],
|
||||||
|
- ]
|
||||||
|
- endif
|
||||||
|
-
|
||||||
|
if alsa_dep.found()
|
||||||
|
default_tests += [
|
||||||
|
[ 'alsa-mixer-path-test', 'alsa-mixer-path-test.c',
|
Loading…
x
Reference in New Issue
Block a user