[beamergui] Update to 2.0, move parse-edid to own module

8 files changed, 44 insertions, 16 deletions

diff --git a/core/modules/beamergui/data/etc/X11/Xsession.d/98-modesetter-wrapper b/core/modules/beamergui/data/etc/X11/Xsession.d/98-modesetter-wrapper
deleted file mode 100755
index 59c1c8ed..00000000
--- a/core/modules/beamergui/data/etc/X11/Xsession.d/98-modesetter-wrapper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Beamergui detection and setup
-
-# Explicitely call bash for the modesetter
-/bin/bash /opt/openslx/scripts/beamergui-mode_setter >/dev/null 2>&1
-
diff --git a/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script b/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script
index 18717dd6..981e87ba 100755
--- a/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script
+++ b/core/modules/beamergui/data/etc/X11/Xsession.d/99-beamergui-starter_script
@@ -1,2 +1,13 @@
 #!/bin/ash
-/opt/openslx/bin/beamergui &
+
+/opt/openslx/bin/beamergui -a
+# Detach
+/bin/bash <<HERE
+{
+	ulimit -c unlimited
+	cd /tmp/
+	/opt/openslx/bin/beamergui -b &
+} &
+HERE
+true
+
diff --git a/core/modules/beamergui/data/etc/X11/Xsetup.d/99-set-centered-clone b/core/modules/beamergui/data/etc/X11/Xsetup.d/99-set-centered-clone
new file mode 100755
index 00000000..dae7ed55
--- /dev/null
+++ b/core/modules/beamergui/data/etc/X11/Xsetup.d/99-set-centered-clone
@@ -0,0 +1,11 @@
+#!/bin/ash -- being sourced
+
+# Detach
+/bin/bash <<HERE
+{
+	sleep 1
+	/opt/openslx/bin/beamergui -c
+} &
+HERE
+true
+
diff --git a/core/modules/beamergui/data/etc/dbus-1/system.d/de.bwlehrpool.beamergui.conf b/core/modules/beamergui/data/etc/dbus-1/system.d/de.bwlehrpool.beamergui.conf
new file mode 100644
index 00000000..d3adf9bc
--- /dev/null
+++ b/core/modules/beamergui/data/etc/dbus-1/system.d/de.bwlehrpool.beamergui.conf
@@ -0,0 +1,14 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+	<policy user="root">
+		<allow own="de.bwlehrpool.beamergui"/>
+		<allow send_destination="de.bwlehrpool.beamergui"/>
+	</policy>
+	<policy context="default">
+		<deny own="de.bwlehrpool.beamergui"/>
+		<deny send_destination="de.bwlehrpool.beamergui"/>
+	</policy>
+</busconfig>
+
diff --git a/core/modules/beamergui/data/etc/udev/rules.d/99-beamergui.rules b/core/modules/beamergui/data/etc/udev/rules.d/99-beamergui.rules
new file mode 100644
index 00000000..06364e20
--- /dev/null
+++ b/core/modules/beamergui/data/etc/udev/rules.d/99-beamergui.rules
@@ -0,0 +1,3 @@
+# Tell beamergui to show up
+#
+SUBSYSTEM=="drm", ACTION=="change", RUN+="/opt/openslx/bin/beamergui -w"
diff --git a/core/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui b/core/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
deleted file mode 100755
index 1b4e61c8..00000000
--- a/core/modules/beamergui/data/opt/openslx/vmchooser/sessionstart.d/99-kill_beamergui
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/ash
-killall beamergui
-exit 0
diff --git a/core/modules/beamergui/module.build b/core/modules/beamergui/module.build
index a4735e85..316b9757 100644
--- a/core/modules/beamergui/module.build
+++ b/core/modules/beamergui/module.build
@@ -1,11 +1,11 @@
 #!/bin/bash
 
 fetch_source() {
-	git clone "${REQUIRED_GIT}" src
+	autoclone
 }
 
 build() {
-	local SRCDIR="${MODULE_WORK_DIR}/src/"
+	local SRCDIR="${MODULE_WORK_DIR}/src/beamergui"
 
 	mkdir -p "$MODULE_BUILD_DIR/opt/openslx/bin"
 	cd "${MODULE_BUILD_DIR}/opt/openslx/bin" || perror "Could not cd!"
@@ -13,9 +13,6 @@ build() {
 	cmake "$SRCDIR" || perror "'cmake $SRCDIR' failed."
 	pinfo "Running make"
 	make || perror "'make' failed."
-
-	# Make read-edid
-	gcc -o "${MODULE_BUILD_DIR}/opt/openslx/bin/parse-edid" "${MODULE_DIR}/source/parse-edid/parse-edid.c" || perror "Compiling parse-edid failed."
 }
 post_copy() {
 	:
diff --git a/core/modules/beamergui/module.conf b/core/modules/beamergui/module.conf
index 65cc1dce..baf892c2 100644
--- a/core/modules/beamergui/module.conf
+++ b/core/modules/beamergui/module.conf
@@ -1,10 +1,10 @@
 #!/bin/bash
 REQUIRED_MODULES="
+	parse-edid
 	qt5core
 "
-REQUIRED_GIT="git://git.openslx.org/openslx-ng/beamergui.git"
+REQUIRED_GIT="git://git.openslx.org/openslx-ng/beamergui.git|2.0"
 REQUIRED_BINARIES="
 	beamergui
-	parse-edid
 "