Merge branch 'LegendaryGuard/decompile_weapons' into 'master'

[xonotic/mediasource.git] / gfx / menu / luminos_versionbuilder / versionbuilder

diff --git a/gfx/menu/luminos_versionbuilder/versionbuilder b/gfx/menu/luminos_versionbuilder/versionbuilder
index 41f5f06ad63670850b39701814017ba64fc12ba6..53dae335f61594e16db66eea8647eb17d3c98ca7 100755 (executable)
--- a/gfx/menu/luminos_versionbuilder/versionbuilder
+++ b/gfx/menu/luminos_versionbuilder/versionbuilder
@@ -22,8 +22,11 @@ fi
 sed -e "s/VERSIONPLACEHOLDER/$1/" background_l2.svg > tmp.svg
 
 #Create tga files
-inkscape -f "tmp.svg" -d 90 -e "background_l2.png"
-convert background_l2.png background_l2.tga
+# TODO: remove old inkscape support (second case).
+inkscape --export-dpi=90 --export-filename="background_l2.png" "tmp.svg" ||\
+       inkscape -f "tmp.svg" -d 90 -e "background_l2.png"
+# -auto-orient works around an inversion regression present in imagemagick 6.9.11-60
+convert -auto-orient background_l2.png background_l2.tga
 # gimp -d -f -i -b '(all2tga "background_l2.png" 1)' -b '(gimp-quit 0)'
 cp background_l2.tga background_ingame_l2.tga
 rm tmp.svg