diff options
| author | Ahmad Fatoum <ahmad@a3f.at> | 2020-10-11 11:44:03 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-10-12 14:12:52 +0200 |
| commit | d86618614213955e7b8b0bf4cd208b49020b23fe (patch) | |
| tree | 4e5abec9b4c63d0bb0571d8d8e43ee0f82fb7a53 | |
| parent | 93f7dcf631edfcda19e7757b28d66017ea274b81 (diff) | |
| download | barebox-d86618614213955e7b8b0bf4cd208b49020b23fe.tar.gz barebox-d86618614213955e7b8b0bf4cd208b49020b23fe.tar.xz | |
logo: Makefile: fix Inkscape >= v1.0 Wayland GUI opening on LOGO.S
DISPLAY="" only affects X11 windows. Building sandbox_defconfig under
Wayland will still result in annoying Inkscape windows being opened.
This happens due to $(call try-run, inkscape -z,-z). Inkscape v1.0
deprecates -z and it's without an effect, so Inkscape will try
to create a window, which failed under x11, but succeeded under Wayland.
Fix this by always testing -z and -e together. We don't need one or
the other anyway, because Inkscape v1.0, which supports neither,
already uses no GUI for --export-type=png.
This makes DISPLAY="" unnecessary. So just drop it.
Tested working on Inkscape 1.0.1 and 0.92.4.
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | lib/logo/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/logo/Makefile b/lib/logo/Makefile index bf700da89b..3d0f1c24c6 100644 --- a/lib/logo/Makefile +++ b/lib/logo/Makefile @@ -38,17 +38,15 @@ cmd_logo_S = \ %.bblogo.S: %.bblogo FORCE $(call if_changed,logo_S) -# Inkscape 0.92.4 supports -z but Inkscape 1.0 doesn't -INKSCAPEOPTS += $(call try-run, inkscape -z,-z,) -# Inkscape 0.92.4 uses -e but Inkscape 1.0 uses --export-type=png -INKSCAPEOPTS += $(call try-run, inkscape -e -,-e -,--export-type=png) +# Inkscape 0.92.4 supports -z -e but Inkscape 1.0 uses --export-type=png +INKSCAPEOPTS += $(call try-run, inkscape -z -e -,-z -e -,--export-type=png) # Inkscape 1.0 supports -o - INKSCAPEOPTS += $(call try-run, inkscape -o -,-o -,) quiet_cmd_logo = LOGO.S $@ cmd_logo = \ ( \ - DISPLAY="" inkscape $(OPTS_$(@F)) $(INKSCAPEOPTS) $< > $@; \ + inkscape $(OPTS_$(@F)) $(INKSCAPEOPTS) $< > $@; \ ) %.bblogo: $(srctree)/Documentation/barebox.svg FORCE |