mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Antony Pavlov <antonynpavlov@gmail.com>
Cc: barebox@lists.infradead.org
Subject: Re: [RFC] inkscape 1.0 issue
Date: Tue, 2 Jun 2020 09:51:28 +0200	[thread overview]
Message-ID: <20200602075128.GI11869@pengutronix.de> (raw)
In-Reply-To: <20200602012035.2b476de768013dc5793cdea0@gmail.com>

Hi Antony,

On Tue, Jun 02, 2020 at 01:20:35AM +0300, Antony Pavlov wrote:
> 
> diff --git a/lib/logo/Makefile b/lib/logo/Makefile
> index eb7aee080e..8c81447df7 100644
> --- a/lib/logo/Makefile
> +++ b/lib/logo/Makefile
> @@ -1,17 +1,17 @@
>  
> -OPTS_barebox-logo-w64.bblogo="-w 64"
> +OPTS_barebox-logo-w64.bblogo = --export-width=64
>  bblogo-$(CONFIG_BAREBOX_LOGO_64) += barebox-logo-w64

according to the man page --export-width=64 is supported by 0.92.4 as
well, so we could change this part unconditionally.

> @@ -41,7 +41,8 @@ cmd_logo_S =							\
>  quiet_cmd_logo = LOGO.S   $@
>  cmd_logo =							\
>  (								\
> -	inkscape -z $(OPTS_$(@F)) -e $@ $< > /dev/null;		\
> +	DISPLAY="" inkscape $(OPTS_$(@F)) --export-type=png $< > /dev/null; \
> +	mv $(patsubst %.svg,%.png,$<) $@; \

Inkscape-1.0 supports "-o -" and pre Inkscape-1.0 supports "-e -", we
could use this to do without the mv in both cases.

DISPLAY="" shouldn't hurt on pre Inkscape-1.0. as well.

This leaves '-z' and -e vs. --export-type=png. Something like this should work:

INKSCAPEOPTS += $(call try-run, inkscape -z,-z,)
INKSCAPEOPTS += $(call try-run, inkscape -e,-e,--export_type=png)

Regards,
 Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2020-06-02  7:51 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-01 22:20 Antony Pavlov
2020-06-02  7:51 ` Sascha Hauer [this message]
2020-06-02 12:48   ` Antony Pavlov
2020-06-03  6:23     ` Sascha Hauer
2020-06-03 10:19       ` Daniel Glöckner

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=20200602075128.GI11869@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=antonynpavlov@gmail.com \
    --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