diff options
| author |   Eric Hameleers <alien@slackware.com> | 2024-01-02 20:48:01 +0100 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2024-01-02 20:48:01 +0100 |
| commit | 8410635eb61083b1e5720bb06326e6afb9f315a9 (patch) | |
| tree | 627f625eb2379cc85b31194411f7b80e029fbe95 | |
| parent | d7284b70ac47292b15cda078b422d300a623ac26 (diff) | |
| download | liveslak-8410635eb61083b1e5720bb06326e6afb9f315a9.tar.gz liveslak-8410635eb61083b1e5720bb06326e6afb9f315a9.tar.xz | |
Replace pulseaudio (and jack2) with pulseaudio if its version is atleast 1
Check pipewire version before enabling it. Also enable it in all variants,
not just the KDE Plasma based ones.
| -rwxr-xr-x | make_slackware_live.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 1dfcf81..b5b20a6 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1898,6 +1898,16 @@ none / tmpfs defaults 1 1 EOT +# Pipewire 1.0.0 is capable of replacing pulseaudio and jack2: +if chroot ${LIVE_ROOTDIR} pkg-config libpipewire-0.3 --atleast-version=1 +then + # Make pipewire the default, kill pulseaudio: + if [ -x ${LIVE_ROOTDIR}/usr/sbin/pipewire-enable.sh ]; then + echo "-- Enabling pipewire" + chroot ${LIVE_ROOTDIR} /usr/sbin/pipewire-enable.sh + fi +fi + # Prevent loop devices (sxz modules) from appearing in filemanagers: mkdir -p ${LIVE_ROOTDIR}/etc/udev/rules.d cat <<EOL > ${LIVE_ROOTDIR}/etc/udev/rules.d/11-local.rules @@ -2781,12 +2791,6 @@ setenv GDK_BACKEND x11 EOT chmod 755 ${LIVE_ROOTDIR}/etc/profile.d/kwayland.* -# Make pipewire the default, kill pulseaudio: -if [ -x ${LIVE_ROOTDIR}/usr/sbin/pipewire-enable.sh ]; then - echo "-- Enabling pipewire" - chroot ${LIVE_ROOTDIR} /usr/sbin/pipewire-enable.sh -fi - # Ensure that color Emojis work in Qt applications: mkdir -p ${LIVE_ROOTDIR}/usr/share/fontconfig/conf.avail cat <<EOT >${LIVE_ROOTDIR}/usr/share/fontconfig/conf.avail/99-noto-mono-color-emoji.conf: |