[RFC] inkscape 1.0 issue

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi All!

I can't build barebox with inkscape-1.0 anymore.
Some command line options were changed, e.g.

make V=1
...
  ( inkscape -z "-w 64" -e lib/logo/barebox-logo-w64.bblogo /home/builduser/barebox/Documentation/barebox.svg > /dev/null; )
Unable to init server: Could not connect: Connection refused
Unknown option -z

make V=1
...
  ( DISPLAY="" inkscape "-w 64" -e lib/logo/barebox-logo-w64.bblogo /home/builduser/barebox/Documentation/barebox.svg > /dev/null; )
Unable to init server: Could not connect: Connection refused
Cannot parse integer value ?-e? for -w

make V=1
...
  ( DISPLAY="" inkscape --export-width=64 -e lib/logo/barebox-logo-w64.bblogo /home/builduser/barebox/Documentation/barebox.svg > /dev/null; )
Unable to init server: Could not connect: Connection refused
Unknown option -e

I have succeded with compiling barebox with inkscape-1.0, see patch below.
Alas! My patch makes it impossible to use pre-1.0 inkscape (e.g. Inkscape 0.92.4
I used before).

Any suggestion?


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
 
-OPTS_barebox-logo-w240.bblogo="-w 240"
+OPTS_barebox-logo-w240.bblogo = --export-width=240
 bblogo-$(CONFIG_BAREBOX_LOGO_240) += barebox-logo-w240
 
-OPTS_barebox-logo-w320.bblogo="-w 320"
+OPTS_barebox-logo-w320.bblogo = --export-width=320
 bblogo-$(CONFIG_BAREBOX_LOGO_320) += barebox-logo-w320
 
-OPTS_barebox-logo-w400.bblogo="-w 400"
+OPTS_barebox-logo-w400.bblogo = --export-width=400
 bblogo-$(CONFIG_BAREBOX_LOGO_400) += barebox-logo-w400
 
-OPTS_barebox-logo-w640.bblogo="-w 640"
+OPTS_barebox-logo-w640.bblogo = --export-width=640
 bblogo-$(CONFIG_BAREBOX_LOGO_640) += barebox-logo-w640
 
 obj-y += $(patsubst %,%.bblogo.o,$(bblogo-y))
@@ -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,$<) $@; \
 )
 
 %.bblogo: $(srctree)/Documentation/barebox.svg FORCE


-- 
Best regards,
  Antony Pavlov

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




[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux