From a85919c532c63447f89249b7276ac58120b57cee Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Thu, 3 Dec 2020 15:38:41 +0800
Subject: [PATCH] feat(image_effect): run `dde-pixmix` under xvfb-run
Use `xvfb-run` to make `dde-pixmix` runnable without a real X server
Log: run `dde-pixmix` under xvfb-run
Signed-off-by: Robin Lee <cheeselee@fedoraproject.org>
---
image_effect/image_effect.go | 4 ++--
rpm/dde-daemon.spec | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/image_effect/image_effect.go b/image_effect/image_effect.go
index ef0406ff..514da505 100644
--- a/image_effect/image_effect.go
+++ b/image_effect/image_effect.go
@@ -135,7 +135,7 @@ func newImageEffect() *ImageEffect {
func ddePixmix(userName, inputFile, outputFile string, envVars []string) error {
- return runCmdRedirectStdOut(userName, outputFile, []string{"dde-pixmix", "-o=-", inputFile}, envVars)
+ return runCmdRedirectStdOut(userName, outputFile, []string{"xvfb-run", "dde-pixmix", "-o=-", inputFile}, envVars)
}
func (ie *ImageEffect) Get(sender dbus.Sender, effect, filename string) (outputFile string, busErr *dbus.Error) {
@@ -180,7 +180,7 @@ func (ie *ImageEffect) Get(sender dbus.Sender, effect, filename string) (outputF
return
}
- var envVarNames = []string{"DISPLAY", "XDG_RUNTIME_DIR"}
+ var envVarNames = []string{"XDG_RUNTIME_DIR"}
var envVars = make([]string, len(envVarNames))
for idx, envVarName := range envVarNames {
envVarVal := processEnv.Get(envVarName)
diff --git a/rpm/dde-daemon.spec b/rpm/dde-daemon.spec
index 7045a998..bf2b3bb2 100644
--- a/rpm/dde-daemon.spec
+++ b/rpm/dde-daemon.spec
@@ -59,6 +59,7 @@ Requires: dde-polkit-agent
Requires: rfkill
Requires: gvfs
Requires: iw
+Requires: %{_bindir}/xvfb-run
Recommends: iso-codes
Recommends: imwheel
--
2.31.1