From: Jules Maselbas <jmaselbas@kalray.eu>
To: barebox@lists.infradead.org
Cc: Jules Maselbas <jmaselbas@kalray.eu>,
Ian Abbott <abbotti@mev.co.uk>,
Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [RFC PATCH] logo: Makefile: Replace inkscape with convert
Date: Thu, 7 Oct 2021 13:52:54 +0200 [thread overview]
Message-ID: <20211007115254.32270-1-jmaselbas@kalray.eu> (raw)
In-Reply-To: <20211006135844.7361b72436286f5accbde0ad@gmail.com>
The uses of inkscape to convert svg to png hasn't been very stable from
one version to another, and required quirks from one version to another.
I hope that convert from imagemagick will be a more stable solution.
Signed-off-by: Jules Maselbas <jmaselbas@kalray.eu>
---
lib/logo/Makefile | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/lib/logo/Makefile b/lib/logo/Makefile
index 4149d4ff6c..f08beef76b 100644
--- a/lib/logo/Makefile
+++ b/lib/logo/Makefile
@@ -1,17 +1,17 @@
-OPTS_barebox-logo-w64.bblogo = --export-width=64
+OPTS_barebox-logo-w64.bblogo = -resize 64
bblogo-$(CONFIG_BAREBOX_LOGO_64) += barebox-logo-w64
-OPTS_barebox-logo-w240.bblogo = --export-width=240
+OPTS_barebox-logo-w240.bblogo = -resize 240
bblogo-$(CONFIG_BAREBOX_LOGO_240) += barebox-logo-w240
-OPTS_barebox-logo-w320.bblogo = --export-width=320
+OPTS_barebox-logo-w320.bblogo = -resize 320
bblogo-$(CONFIG_BAREBOX_LOGO_320) += barebox-logo-w320
-OPTS_barebox-logo-w400.bblogo = --export-width=400
+OPTS_barebox-logo-w400.bblogo = -resize 400
bblogo-$(CONFIG_BAREBOX_LOGO_400) += barebox-logo-w400
-OPTS_barebox-logo-w640.bblogo = --export-width=640
+OPTS_barebox-logo-w640.bblogo = -resize 640
bblogo-$(CONFIG_BAREBOX_LOGO_640) += barebox-logo-w640
obj-y += $(patsubst %,%.bblogo.o,$(bblogo-y))
@@ -38,15 +38,12 @@ cmd_logo_S = \
%.bblogo.S: %.bblogo FORCE
$(call if_changed,logo_S)
-# 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 -,)
+CONVERTOPTS += -background none
-quiet_cmd_logo = LOGO.S $@
+quiet_cmd_logo = PNG $@
cmd_logo = \
( \
- inkscape $(OPTS_$(@F)) $(INKSCAPEOPTS) $< > $@; \
+ convert $(OPTS_$(@F)) $(CONVERTOPTS) $< png:$@; \
)
%.bblogo: $(srctree)/Documentation/barebox.svg FORCE
--
2.17.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-10-07 11:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 10:58 inkscape 1.1.1 issue Antony Pavlov
2021-10-06 11:19 ` Ahmad Fatoum
2021-10-07 9:24 ` Ian Abbott
2021-10-07 9:49 ` Jules Maselbas
2021-10-07 10:03 ` Ahmad Fatoum
2021-10-07 11:52 ` Jules Maselbas [this message]
2021-10-11 9:45 ` [RFC PATCH] logo: Makefile: Replace inkscape with convert Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211007115254.32270-1-jmaselbas@kalray.eu \
--to=jmaselbas@kalray.eu \
--cc=a.fatoum@pengutronix.de \
--cc=abbotti@mev.co.uk \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox