forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/postmarketos-base-ui: simplify pulseaudio config (MR 3412)

Browse source 
config scripts in /etc/pulse/default.pa.d are loaded automatically by
default.pa
This commit is contained in:
Clayton Craft 2022-09-07 17:05:26 -07:00 committed by Oliver Smith
parent 566b8de98a
commit 4a7e47013e
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
main/postmarketos-base-ui/APKBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Clayton Craft <clayton@craftyguy.net> # Maintainer: Clayton Craft <clayton@craftyguy.net>
pkgname=postmarketos-base-ui pkgname=postmarketos-base-ui
pkgver=4 pkgver=5
pkgrel=3 pkgrel=0
pkgdesc="Meta package for minimal postmarketOS UI base" pkgdesc="Meta package for minimal postmarketOS UI base"
url="https://postmarketos.org" url="https://postmarketos.org"
arch="noarch" arch="noarch"
@ -41,8 +41,7 @@ _source644="
etc/conf.d/tinydm etc/conf.d/tinydm
etc/conf.d/wpa_supplicant etc/conf.d/wpa_supplicant
etc/elogind/logind.conf etc/elogind/logind.conf
etc/pulse/daemon.conf.d/90-postmarketos.conf etc/pulse/default.pa.d/postmarketos.pa
etc/pulse/postmarketos.pa
etc/skel/.profile etc/skel/.profile
etc/sleep-inhibitor.conf etc/sleep-inhibitor.conf
etc/X11/Xwrapper.config etc/X11/Xwrapper.config
@ -105,8 +104,7 @@ tinydm() {
pulseaudio() { pulseaudio() {
install_if="$pkgname=$pkgver-r$pkgrel pulseaudio" install_if="$pkgname=$pkgver-r$pkgrel pulseaudio"
provides="postmarketos-base-pulseaudio=$pkgver-r$pkgrel" provides="postmarketos-base-pulseaudio=$pkgver-r$pkgrel"
amove etc/pulse/postmarketos.pa amove etc/pulse/default.pa.d/postmarketos.pa
amove etc/pulse/daemon.conf.d/90-postmarketos.conf
} }
_obexd() { _obexd() {
@ -127,8 +125,7 @@ e5d049db1d82c510bab9246208b51b8ec2711d008d67792fc10d4c0b65ed4dece7b5ae3c3dd28a85
44e4283c6f77de83915977dd3bc2d8e2d96b3ed6cc68d3cc156304359ae649b5a8b0bac843e517ec6faa2066dd43ba85e313899b1eda04862f864fb9eb508aa0 rootfs-etc-conf.d-tinydm 44e4283c6f77de83915977dd3bc2d8e2d96b3ed6cc68d3cc156304359ae649b5a8b0bac843e517ec6faa2066dd43ba85e313899b1eda04862f864fb9eb508aa0 rootfs-etc-conf.d-tinydm
fe0651904c1f40ffa67d83daca190af199f63247e53642a59a1e1147cd06776fcf20b7b2fcc5373783d50b8bd6ce8d1354c8e5f4d582d319727b9ceefd1e8e16 rootfs-etc-conf.d-wpa_supplicant fe0651904c1f40ffa67d83daca190af199f63247e53642a59a1e1147cd06776fcf20b7b2fcc5373783d50b8bd6ce8d1354c8e5f4d582d319727b9ceefd1e8e16 rootfs-etc-conf.d-wpa_supplicant
8d2c54fe3ca62c62f8337fb6be28479d0e02ea63f32abae81907f2768631e65c9e17485f8bc0854a013377f729b06dd1873e2b75f86f657ece866d00aecbbdb4 rootfs-etc-elogind-logind.conf 8d2c54fe3ca62c62f8337fb6be28479d0e02ea63f32abae81907f2768631e65c9e17485f8bc0854a013377f729b06dd1873e2b75f86f657ece866d00aecbbdb4 rootfs-etc-elogind-logind.conf
4afe8c5b70f4ca85f9348eb0df12e3152b76203a1a138daa5777f22b751ea431d3ee4113189d8606078f87a99c230b184bc73d53222e6e00581e46224bf5d39f rootfs-etc-pulse-daemon.conf.d-90-postmarketos.conf 6c516635a61fbaa93102f02301a75070a91de837456b07a50e24a9e0ee5dac785087d4a8f78906807719ebf6f0124127383441cccf00475d9a91d3dbaf9d4d81 rootfs-etc-pulse-default.pa.d-postmarketos.pa
315598b67889b1f25f82b8269ed36af4fcee018a4edf2926ba966ab08e0a42e36676896d0a5636001b1eb7f16211dcf518123230049556dec9d03006e003a584 rootfs-etc-pulse-postmarketos.pa
90b30cbea660ef6cd4c0461b6935de0cd63a84a1a40edb24348a83044c97935b974bd8bafda9cd558e92d3eb69e22c5ccf55483b80f839e24f0eb57ae2df6fe3 rootfs-etc-skel-.profile 90b30cbea660ef6cd4c0461b6935de0cd63a84a1a40edb24348a83044c97935b974bd8bafda9cd558e92d3eb69e22c5ccf55483b80f839e24f0eb57ae2df6fe3 rootfs-etc-skel-.profile
6b9c7bb73213187eb9ca8a94109b2b816f50c1158c90fec2e92b373864280d67741589e5bfbab8810945f031d2f4b535aad78a72e46e52ea50be5b85324da381 rootfs-etc-sleep-inhibitor.conf 6b9c7bb73213187eb9ca8a94109b2b816f50c1158c90fec2e92b373864280d67741589e5bfbab8810945f031d2f4b535aad78a72e46e52ea50be5b85324da381 rootfs-etc-sleep-inhibitor.conf
cac604e25c46e695dd30bd5a10cfd2d69595fcc3bc290096ac94b76b10834d591ea6576afb79c46b5da492a1dbf8660cf87b6110cd39937e15237bc74fa7a5c6 rootfs-etc-X11-Xwrapper.config cac604e25c46e695dd30bd5a10cfd2d69595fcc3bc290096ac94b76b10834d591ea6576afb79c46b5da492a1dbf8660cf87b6110cd39937e15237bc74fa7a5c6 rootfs-etc-X11-Xwrapper.config

1
main/postmarketos-base-ui/rootfs-etc-pulse-daemon.conf.d-90-postmarketos.conf
View file

@ -1 +0,0 @@
default-script-file = /etc/pulse/postmarketos.pa

2
main/postmarketos-base-ui/rootfs-etc-pulse-postmarketos.pa → main/postmarketos-base-ui/rootfs-etc-pulse-default.pa.d-postmarketos.pa
View file

@ -1,5 +1,3 @@
.include /etc/pulse/default.pa
# duck volume of audio streams when notification or accessibility sounds are played # duck volume of audio streams when notification or accessibility sounds are played
load-module module-role-ducking trigger_roles=event,a11y ducking_roles=no_role,music,video,game global=true load-module module-role-ducking trigger_roles=event,a11y ducking_roles=no_role,music,video,game global=true