From 9e337cf4a97c7ac8dc82d9af0427f0086cc16db8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 4 Nov 2021 15:08:47 +0100
Subject: [pulseaudio] Use pavucontrol-slx :)

---
 .../pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh    |  2 +-
 core/modules/pulseaudio/module.build                          | 11 ++++++++++-
 core/modules/pulseaudio/module.conf                           |  6 ++++++
 core/modules/pulseaudio/module.conf.ubuntu                    |  6 +++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'core/modules/pulseaudio')

diff --git a/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh b/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh
index 074be46f..886d5fd7 100755
--- a/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh
+++ b/core/modules/pulseaudio/data/opt/openslx/pvs2/launch-pavucontrol.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec /usr/bin/pavucontrol-qt -t 5
+exec /opt/openslx/bin/pavucontrol-slx -t 5
diff --git a/core/modules/pulseaudio/module.build b/core/modules/pulseaudio/module.build
index d2c39da9..cc34980f 100644
--- a/core/modules/pulseaudio/module.build
+++ b/core/modules/pulseaudio/module.build
@@ -1,10 +1,19 @@
 #!/bin/bash
 
 fetch_source() {
-	:
+	autoclone
 }
 
 build() {
+	cde src/pavucontrol-slx
+	mkdir build
+	cde build
+	cmake .. || perror "Cmake fail"
+	make || perror "make fail"
+	mkdir -p "${MODULE_BUILD_DIR}/opt/openslx/bin"
+	cp src/pavucontrol-qt "${MODULE_BUILD_DIR}/opt/openslx/bin/pavucontrol-slx" \
+		|| cp src/pavucontrol-slx "${MODULE_BUILD_DIR}/opt/openslx/bin/pavucontrol-slx" \
+		|| perror "Copying binary failed"
 	declare -a confs
 	local conf link base
 	readarray -d '' confs < <( find /usr/share/alsa/alsa.conf.d/ -type f -name "*pulse*.example" -print0 )
diff --git a/core/modules/pulseaudio/module.conf b/core/modules/pulseaudio/module.conf
index e0f3ef37..92983936 100644
--- a/core/modules/pulseaudio/module.conf
+++ b/core/modules/pulseaudio/module.conf
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+REQUIRED_GIT="https://git.openslx.org/openslx-ng/pavucontrol-slx.git"
+
+REQUIRED_BINARIES="
+	pavucontrol-slx
+"
+
 REQUIRED_DIRECTORIES="
 	/etc/dbus-1
 	/etc/modprobe.d
diff --git a/core/modules/pulseaudio/module.conf.ubuntu b/core/modules/pulseaudio/module.conf.ubuntu
index cdbea999..b035b8d5 100644
--- a/core/modules/pulseaudio/module.conf.ubuntu
+++ b/core/modules/pulseaudio/module.conf.ubuntu
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+REQUIRED_INSTALLED_PACKAGES="
+	lxqt-build-tools
+	libpulse-dev
+"
+
 REQUIRED_CONTENT_PACKAGES="
 	alsa-base
 	alsa-topology-conf
@@ -7,7 +12,6 @@ REQUIRED_CONTENT_PACKAGES="
 	libasound2-data
 	libasound2-plugins
 	libpulse0
-	pavucontrol-qt
 	pulseaudio
 	pulseaudio-utils
 "
-- 
cgit v1.2.3-55-g7522