New snapshot release

3 files changed, 36 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 811ea5dd80d0..61d27222d53b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = eruption-git
 	pkgdesc = Realtime RGB LED Driver for Linux
-	pkgver = 0.2.0.r137.gcbb50be0
+	pkgver = 0.3.0
 	pkgrel = 1
 	url = https://eruption-project.org/
 	install = eruption.install
@@ -30,6 +30,7 @@ pkgbase = eruption-git
 	replaces = eruption-roccat-vulcan-git
 	backup = etc/eruption/eruption.conf
 	backup = etc/eruption/process-monitor.conf
+	backup = etc/eruption/fx-proxy.conf
 	backup = etc/eruption/audio-proxy.conf
 	backup = usr/share/eruption/scripts/lib/keymaps/default.keymap
 	source = eruption::git+https://github.com/X3n0m0rph59/eruption.git
diff --git a/PKGBUILD b/PKGBUILD
index cbab1cf0ade0..87820b8b33ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 pkgname='eruption-git'
 _pkgname='eruption'
 pkgdesc='Realtime RGB LED Driver for Linux'
-pkgver=0.2.0.r137.gcbb50be0
-pkgrel=1
+pkgver='0.3.0'
+pkgrel='1'
 arch=('i686' 'x86_64')
 url='https://eruption-project.org/'
 license=('GPL3+')
@@ -13,7 +13,7 @@ makedepends=('git' 'rust' 'pkgconf' 'cmake' 'protobuf' 'xorg-server-devel' 'libx
 provides=('eruption')
 conflicts=('eruption' 'eruption-roccat-vulcan')
 replaces=('eruption-roccat-vulcan-git')
-backup=(etc/eruption/eruption.conf etc/eruption/process-monitor.conf etc/eruption/audio-proxy.conf usr/share/eruption/scripts/lib/keymaps/default.keymap)
+backup=(etc/eruption/eruption.conf etc/eruption/process-monitor.conf etc/eruption/fx-proxy.conf etc/eruption/audio-proxy.conf usr/share/eruption/scripts/lib/keymaps/default.keymap)
 install='eruption.install'
 source=('eruption::git+https://github.com/X3n0m0rph59/eruption.git')
 sha512sums=('SKIP')
@@ -45,7 +45,7 @@ package() {
 
     mkdir -p "$pkgdir/usr/share/applications"
     mkdir -p "$pkgdir/usr/share/icons/hicolor/64x64/apps"
-    mkdir -p "$pkgdir/usr/share/eruption-gui/schemas"
+    mkdir -p "$pkgdir/usr/share/eruption-gui-gtk3/schemas"
 
     mkdir -p "$pkgdir/var/lib/eruption/profiles"
 
@@ -84,23 +84,30 @@ package() {
     install -m 755 "target/release/eruption-util" "$pkgdir/usr/bin/"
     install -m 755 "target/release/eruption-debug-tool" "$pkgdir/usr/bin/"
     install -m 755 "target/release/eruption-hotplug-helper" "$pkgdir/usr/bin/"
+    install -m 755 "target/release/eruption-fx-proxy" "$pkgdir/usr/bin/"
     install -m 755 "target/release/eruption-audio-proxy" "$pkgdir/usr/bin/"
     install -m 755 "target/release/eruption-process-monitor" "$pkgdir/usr/bin/"
-    install -m 755 "target/release/eruption-gui" "$pkgdir/usr/bin/"
+    install -m 755 "target/release/eruption-gui-gtk3" "$pkgdir/usr/bin/"
 
-    install -m 644 "support/assets/eruption-gui/eruption-gui.desktop" "$pkgdir/usr/share/applications/"
-    install -m 644 "support/assets/eruption-gui/eruption-gui.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/"
-    install -m 644 "eruption-gui/schemas/gschemas.compiled" "$pkgdir/usr/share/eruption-gui/schemas/"
+    install -m 644 "support/assets/eruption-gui-gtk3/eruption-gui.desktop" "$pkgdir/usr/share/applications/"
+    install -m 644 "support/assets/eruption-gui-gtk3/eruption-gui.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/"
+    install -m 644 "eruption-gui-gtk3/schemas/gschemas.compiled" "$pkgdir/usr/share/eruption-gui-gtk3/schemas/"
 
     install -m 755 "support/systemd/eruption-suspend.sh" "$pkgdir/usr/lib/systemd/system-sleep/eruption"
 
     install -m 644 "support/config/eruption.conf" "$pkgdir/etc/eruption/"
+    install -m 644 "support/config/fx-proxy.conf" "$pkgdir/etc/eruption/"
     install -m 644 "support/config/audio-proxy.conf" "$pkgdir/etc/eruption/"
     install -m 644 "support/config/process-monitor.conf" "$pkgdir/etc/eruption/"
+    
+    install -m 644 "support/profile.d/eruption.sh" "$pkgdir/etc/profile.d/"
 
     install -m 644 "support/systemd/eruption.service" "$pkgdir/usr/lib/systemd/system/"
     install -m 644 "support/systemd/eruption.preset" "$pkgdir/usr/lib/systemd/system-preset/50-eruption.preset"
 
+    install -m 644 "support/systemd/eruption-fx-proxy.service" "$pkgdir/usr/lib/systemd/user/"
+    install -m 644 "support/systemd/eruption-fx-proxy.preset" "$pkgdir/usr/lib/systemd/user-preset/50-eruption-fx-proxy.preset"
+
     install -m 644 "support/systemd/eruption-audio-proxy.service" "$pkgdir/usr/lib/systemd/user/"
     install -m 644 "support/systemd/eruption-audio-proxy.preset" "$pkgdir/usr/lib/systemd/user-preset/50-eruption-audio-proxy.preset"
 
@@ -114,6 +121,7 @@ package() {
 
     install -m 644 "support/dbus/org.eruption.control.conf" "$pkgdir/usr/share/dbus-1/system.d/"
     install -m 644 "support/dbus/org.eruption.process_monitor.conf" "$pkgdir/usr/share/dbus-1/session.d/"
+    install -m 644 "support/dbus/org.eruption.fx_proxy.conf" "$pkgdir/usr/share/dbus-1/session.d/"
 
     install -m 644 "support/policykit/org.eruption.policy" "$pkgdir/usr/share/polkit-1/actions/"
 
@@ -126,6 +134,7 @@ package() {
     install -m 644 "support/man/eruption-macro.1" "$pkgdir/usr/share/man/man1/"
     install -m 644 "support/man/eruption-keymap.1" "$pkgdir/usr/share/man/man1/"
     install -m 644 "support/man/eruption-netfx.1" "$pkgdir/usr/share/man/man1/"
+    install -m 644 "support/man/eruption-fx-proxy.1" "$pkgdir/usr/share/man/man1/"
     install -m 644 "support/man/eruption-audio-proxy.1" "$pkgdir/usr/share/man/man1/"
     install -m 644 "support/man/eruption-process-monitor.1" "$pkgdir/usr/share/man/man1/"
 
@@ -135,6 +144,7 @@ package() {
     install -m 644 -T "support/shell/completions/en_US/eruption-macro.bash-completion" "$pkgdir/usr/share/bash-completion/completions/eruption-macro"
     install -m 644 -T "support/shell/completions/en_US/eruption-keymap.bash-completion" "$pkgdir/usr/share/bash-completion/completions/eruption-keymap"
     install -m 644 -T "support/shell/completions/en_US/eruption-netfx.bash-completion" "$pkgdir/usr/share/bash-completion/completions/eruption-netfx"
+    install -m 644 -T "support/shell/completions/en_US/eruption-fx-proxy.bash-completion" "$pkgdir/usr/share/bash-completion/completions/eruption-fx-proxy"
     install -m 644 -T "support/shell/completions/en_US/eruption-audio-proxy.bash-completion" "$pkgdir/usr/share/bash-completion/completions/eruption-audio-proxy"
     install -m 644 -T "support/shell/completions/en_US/eruption-process-monitor.bash-completion" "$pkgdir/usr/share/bash-completion/completions/eruption-process-monitor"
     install -m 644 -T "support/shell/completions/en_US/eruptionctl.bash-completion" "$pkgdir/usr/share/bash-completion/completions/eruptionctl"
@@ -145,7 +155,7 @@ package() {
     install -m 644 -T "support/shell/completions/en_US/eruption-macro.fish-completion" "$pkgdir/usr/share/fish/completions/eruption-macro.fish"
     install -m 644 -T "support/shell/completions/en_US/eruption-keymap.fish-completion" "$pkgdir/usr/share/fish/completions/eruption-keymap.fish"
     install -m 644 -T "support/shell/completions/en_US/eruption-netfx.fish-completion" "$pkgdir/usr/share/fish/completions/eruption-netfx.fish"
-    install -m 644 -T "support/shell/completions/en_US/eruption-audio-proxy.fish-completion" "$pkgdir/usr/share/fish/completions/eruption-audio-proxy.fish"
+    install -m 644 -T "support/shell/completions/en_US/eruption-fx-proxy.fish-completion" "$pkgdir/usr/share/fish/completions/eruption-fx-proxy.fish"
     install -m 644 -T "support/shell/completions/en_US/eruption-process-monitor.fish-completion" "$pkgdir/usr/share/fish/completions/eruption-process-monitor.fish"
     install -m 644 -T "support/shell/completions/en_US/eruptionctl.fish-completion" "$pkgdir/usr/share/fish/completions/eruptionctl.fish"
 
@@ -155,6 +165,7 @@ package() {
     install -m 644 -T "support/shell/completions/en_US/eruption-macro.zsh-completion" "$pkgdir/usr/share/zsh/site-functions/_eruption-macro"
     install -m 644 -T "support/shell/completions/en_US/eruption-keymap.zsh-completion" "$pkgdir/usr/share/zsh/site-functions/_eruption-keymap"
     install -m 644 -T "support/shell/completions/en_US/eruption-netfx.zsh-completion" "$pkgdir/usr/share/zsh/site-functions/_eruption-netfx"
+    install -m 644 -T "support/shell/completions/en_US/eruption-fx-proxy.zsh-completion" "$pkgdir/usr/share/zsh/site-functions/_eruption-fx-proxy"
     install -m 644 -T "support/shell/completions/en_US/eruption-audio-proxy.zsh-completion" "$pkgdir/usr/share/zsh/site-functions/_eruption-audio-proxy"
     install -m 644 -T "support/shell/completions/en_US/eruption-process-monitor.zsh-completion" "$pkgdir/usr/share/zsh/site-functions/_eruption-process-monitor"
     install -m 644 -T "support/shell/completions/en_US/eruptionctl.zsh-completion" "$pkgdir/usr/share/zsh/site-functions/_eruptionctl"
@@ -241,6 +252,8 @@ package() {
     install -m 644 "eruption/src/scripts/shockwave.lua.manifest" "$pkgdir/usr/share/eruption/scripts/"
     install -m 644 "eruption/src/scripts/solid.lua" "$pkgdir/usr/share/eruption/scripts/"
     install -m 644 "eruption/src/scripts/solid.lua.manifest" "$pkgdir/usr/share/eruption/scripts/"
+    install -m 644 "eruption/src/scripts/stock-gradient.lua" "$pkgdir/usr/share/eruption/scripts/"
+    install -m 644 "eruption/src/scripts/stock-gradient.lua.manifest" "$pkgdir/usr/share/eruption/scripts/"
     install -m 644 "eruption/src/scripts/stripes.lua" "$pkgdir/usr/share/eruption/scripts/"
     install -m 644 "eruption/src/scripts/stripes.lua.manifest" "$pkgdir/usr/share/eruption/scripts/"
     install -m 644 "eruption/src/scripts/sysmon.lua" "$pkgdir/usr/share/eruption/scripts/"
@@ -353,6 +366,7 @@ package() {
     install -m 644 "support/profiles/psychedelic.profile" "$pkgdir/var/lib/eruption/profiles/"
     install -m 644 "support/profiles/twinkle.profile" "$pkgdir/var/lib/eruption/profiles/"
     install -m 644 "support/profiles/rainbow.profile" "$pkgdir/var/lib/eruption/profiles/"
+    install -m 644 "support/profiles/rainbow-vertical.profile" "$pkgdir/var/lib/eruption/profiles/"
     install -m 644 "support/profiles/red-fx.profile" "$pkgdir/var/lib/eruption/profiles/"
     install -m 644 "support/profiles/red-wave.profile" "$pkgdir/var/lib/eruption/profiles/"
     install -m 644 "support/profiles/preset-red-yellow.profile" "$pkgdir/var/lib/eruption/profiles/"
diff --git a/eruption.install b/eruption.install
index 488569b88283..c78f34619e6e 100644
--- a/eruption.install
+++ b/eruption.install
@@ -6,12 +6,19 @@ post_install() {
     # systemctl --user daemon-reload
 
     systemctl preset eruption
+    systemctl preset eruption-fx-proxy
     systemctl preset eruption-audio-proxy
     systemctl preset eruption-process-monitor
+    systemctl --global preset eruption-fx-proxy
+    systemctl --global preset eruption-audio-proxy
+    systemctl --global preset eruption-process-monitor
 
     systemctl enable --now eruption.service
+
+    systemctl --global import-environment WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP DISPLAY XAUTHORITY
+    systemctl --global enable --now eruption-fx-proxy.service
     systemctl --global enable --now eruption-audio-proxy.service
-    # systemctl --global enable --now eruption-process-monitor.service
+    systemctl --global enable --now eruption-process-monitor.service
 
     systemctl reload dbus.service
     udevadm control --reload-rules
@@ -25,6 +32,7 @@ post_upgrade() {
     # systemctl --user daemon-reload
 
     systemctl try-restart eruption.service
+    systemctl --global try-restart eruption-fx-proxy.service
     systemctl --global try-restart eruption-audio-proxy.service
     systemctl --global try-restart eruption-process-monitor.service
 
@@ -33,8 +41,9 @@ post_upgrade() {
 }
 
 pre_remove() {
-    systemctl --global stop eruption-process-monitor.service
+    systemctl --global stop eruption-fx-proxy.service
     systemctl --global stop eruption-audio-proxy.service
+    systemctl --global stop eruption-process-monitor.service
     systemctl stop eruption.service
 }