[xscreensaver] Roll your own (xscreensaver from source)

4 files changed, 38 insertions, 13 deletions

diff --git a/core/modules/xscreensaver/data/etc/pam.d/xscreensaver b/core/modules/xscreensaver/data/etc/pam.d/xscreensaver
new file mode 100644
index 00000000..d6474fe6
--- /dev/null
+++ b/core/modules/xscreensaver/data/etc/pam.d/xscreensaver
@@ -0,0 +1,6 @@
+#
+# /etc/pam.d/xscreensaver - PAM behavior for xscreensaver
+#
+
+@include common-auth
+@include common-account
diff --git a/core/modules/xscreensaver/module.build b/core/modules/xscreensaver/module.build
index 1d3df364..676def43 100644
--- a/core/modules/xscreensaver/module.build
+++ b/core/modules/xscreensaver/module.build
@@ -1,21 +1,31 @@
 #!/bin/bash
 fetch_source() {
-	git clone "${REQUIRED_GIT}" "${MODULE_WORK_DIR}/src" || perror "Could not clone $REQUIRED_GIT"
+	autoclone
 }
 
 build() {
 	local SRCDIR="${MODULE_WORK_DIR}/src/"
 
-	[ ! -d "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}" ] && mkdir -p "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}"
-	cd "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}"
+	# xscreensaver
+	mkdir -p "${MODULE_BUILD_DIR}/usr/bin"
+	cde "$SRCDIR/xscreensaver"
+	pinfo "Building xscreensaver"
+	./configure --enable-locking --disable-root-passwd \
+			--with-dpms-ext --with-xinput-ext --with-xf86vmode-ext \
+			--with-randr-ext --with-pam --with-login-manager \
+			--prefix=/usr --without-proc-interrupts $REQUIRED_CONFIGURE_OPTIONS \
+			|| perror "'./configure' failed"
+	cde driver
+	make xscreensaver xscreensaver-command || perror "'make' failed"
+	cp xscreensaver xscreensaver-command "${MODULE_BUILD_DIR}/usr/bin/" || perror "cp fail"
 
-	pinfo "Running cmake"
+	mkdir -p "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}"
+	cde "${MODULE_BUILD_DIR}/${REQUIRED_PREFIX}"
 
-	cmake "$SRCDIR" || perror "'cmake $SRCDIR' failed."
+	pinfo "Building bwlp-screensaver"
+
+	cmake "$SRCDIR/bwlp-screensaver" || perror "'cmake $SRCDIR/bwlp-screensaver' failed."
 	make || perror "'make' failed."
-	COPYLIST="list_dpkg_output"
-	list_packet_files > "$COPYLIST"
-	tarcopy "$(cat "${COPYLIST}" | sort -u)" "${MODULE_BUILD_DIR}"
 }
 
 post_copy() {
diff --git a/core/modules/xscreensaver/module.conf b/core/modules/xscreensaver/module.conf
index defefddf..05e30a5a 100644
--- a/core/modules/xscreensaver/module.conf
+++ b/core/modules/xscreensaver/module.conf
@@ -2,7 +2,10 @@
 REQUIRED_MODULES="
 	qt5core
 "
-REQUIRED_GIT="git://git.openslx.org/openslx-ng/bwlp-screensaver.git"
+REQUIRED_GIT="
+	git://git.openslx.org/openslx-ng/xscreensaver.git|openslx
+	git://git.openslx.org/openslx-ng/bwlp-screensaver.git
+"
 REQUIRED_PREFIX="/opt/openslx/bin"
 REQUIRED_BINARIES="
 	xscreensaver
diff --git a/core/modules/xscreensaver/module.conf.ubuntu b/core/modules/xscreensaver/module.conf.ubuntu
index 89e390f4..7b15f108 100644
--- a/core/modules/xscreensaver/module.conf.ubuntu
+++ b/core/modules/xscreensaver/module.conf.ubuntu
@@ -1,7 +1,13 @@
 #!/bin/bash
-REQUIRED_CONTENT_PACKAGES="
-	xscreensaver
-"
 REQUIRED_INSTALLED_PACKAGES="
-	xscreensaver
+	libglade2-dev
+	libgtk2.0-dev
+	libxxf86vm-dev
+	libxtst-dev
+	libxt-dev
+	libxss-dev
+	libxrandr-dev
+	libxext-dev
+	libpam0g-dev
 "
+REQUIRED_CONFIGURE_OPTIONS="--with-hackdir=/usr/lib/xscreensaver/"