Update package

applications/display-server/blight-client

@@ -0,0 +1,2 @@
+#!/bin/bash
+LD_PRELOAD=/opt/lib/libblight_client.so:$LD_PRELOAD RM2FB_SHIM=1 RM2FB_DISABLE=1 exec -a "$1" "$@"

applications/display-server/display-server.pro

@@ -33,6 +33,14 @@ configFile.files = ../../assets/etc/dbus-1/system.d/codes.eeems.blight.conf
 configFile.path = /etc/dbus-1/system.d/
 INSTALLS += configFile
 
+service.files = ../../assets/etc/systemd/system/blight.service
+service.path = /etc/systemd/system/
+INSTALLS += service
+
+client.files = blight-client
+client.path = /opt/bin/
+INSTALLS += client
+
 TARGET = blight
 include(../../qmake/common.pri)
 target.path = /opt/bin
@@ -59,4 +67,6 @@ RESOURCES += \
 
 DISTFILES += \
     ../../assets/etc/dbus-1/system.d/codes.eeems.blight.conf \
-    generate_xml.sh
+    ../../assets/etc/systemd/system/blight.service \
+    generate_xml.sh \
+    blight-client

applications/system-service/system-service.pro

@@ -93,7 +93,11 @@ LIBS += -lz
 DISTFILES += \
     fi.w1.wpa_supplicant1.xml \
     generate_xml.sh \
-    org.freedesktop.login1.xml
+    org.freedesktop.login1.xml \
+    ../../assets/etc/dbus-1/system.d/codes.eeems.oxide.conf \
+    ../../assets/etc/systemd/system/tarnish.service \
+    ../../assets/opt/usr/share/applications/xochitl.oxide \
+    ../../assets/opt/etc/keyd/oxide.conf
 
 INCLUDEPATH += ../../shared/mxcfb
 

assets/etc/systemd/system/blight.service

@@ -0,0 +1,19 @@
+[Unit]
+Description=Oxide display server
+After=home.mount
+StartLimitInterval=30
+StartLimitBurst=5
+OnFailure=remarkable-fail.service
+Before=remarkable-reboot.service remarkable-shutdown.service
+Conflicts=xochitl.service
+Conflicts=sync.service
+
+[Service]
+Type=dbus
+BusName=codes.eeems.blight1
+ExecStart=/opt/bin/blight --break-lock
+Restart=on-failure
+RestartSec=5
+
+[Install]
+WantedBy=multi-user.target

assets/etc/systemd/system/tarnish.service

@@ -1,12 +1,13 @@
 [Unit]
-Description=oxide system service
+Description=Oxide system service
 After=home.mount
 StartLimitInterval=30
 StartLimitBurst=5
 OnFailure=remarkable-fail.service
 Before=remarkable-reboot.service remarkable-shutdown.service
 Conflicts=xochitl.service
 Conflicts=sync.service
+Wants=blight.service
 
 [Service]
 Type=dbus

package

@@ -2,7 +2,17 @@
 # Copyright (c) 2020 The Toltec Contributors
 # SPDX-License-Identifier: MIT
 
-pkgnames=(oxide oxide-extra oxide-utils inject_evdev liboxide liboxide-dev libsentry)
+pkgnames=(
+    fbinfo
+    inject_evdev
+    liboxide
+    liboxide-dev
+    libsentry
+    oxide
+    oxide-display
+    oxide-extra
+    oxide-utils
+)
 _oxidever=$(grep 'VERSION =' qmake/common.pri | awk '{print $3}')
 pkgver="$_oxidever~VERSION~"
 _sentryver=0.7.0
@@ -24,7 +34,7 @@ build() {
 oxide() {
     pkgdesc="Launcher application"
     section="launchers"
-    installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" "reboot-guard")
+    installdepends=("oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver" "oxide-display=$pkgver" reboot-guard)
     replaces=(erode tarnish decay corrupt)
     conflicts=(erode tarnish decay corrupt)
 
@@ -49,6 +59,8 @@ oxide() {
         # Task switcher
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/corrupt
         install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide
+        # Keyd configuration
+        install -D -m 644 -t "$pkgdir"/opt/etc/keyd "$srcdir"/release/opt/etc/keyd/oxide.conf
     }
 
     configure(){
@@ -80,6 +92,23 @@ oxide() {
     }
 }
 
+oxide-display() {
+    pkgdesc="Oxide display server"
+    section="devel"
+    installdepends=("liboxide=$pkgver" "libsentry=$_sentryver")
+
+    package(){
+        # Display server
+        install -D -m 644 -t "$pkgdir"/etc/dbus-1/system.d "$srcdir"/release/etc/dbus-1/system.d/codes.eeems.blight.conf
+        install -D -m 644 -t "$pkgdir"/lib/systemd/system "$srcdir"/release/etc/systemd/system/blight.service
+        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/blight
+        # Client
+        install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libblight_client.so*
+        # QPA
+        install -D -m 755 -t "$pkgdir"/opt/usr/lib/plugins/platforms "$srcdir"/release/opt/usr/lib/plugins/platforms/liboxide.so*
+    }
+}
+
 oxide-extra() {
     pkgdesc="Extra applications for oxide"
     section="utils"
@@ -113,15 +142,16 @@ oxide-utils() {
     conflicts=(rot notify-send update-desktop-database desktop-file-validate)
 
     package() {
-        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/rot
+        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/desktop-file-validate
+        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/gio
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/notify-send
+        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/rot
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/update-desktop-database
-        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/desktop-file-validate
-        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-menu
+        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xclip
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-icon
+        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-menu
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-open
         install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-settings
-        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/gio
     }
 }
 
@@ -135,13 +165,23 @@ inject_evdev() {
     }
 }
 
+fbinfo() {
+    pkgdesc="Print out framebuffer info"
+    section="utils"
+
+    package() {
+        install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/fbinfo
+    }
+}
+
 liboxide() {
     pkgdesc="Shared library for oxide applications"
     section="devel"
 
     package() {
         install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/liboxide.so*
         install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libqsgepaper.so*
+        install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libblight.so*
     }
 }