From: bones_was_here <bones_was_here@xa.org.au>
Date: Tue, 24 Aug 2021 01:46:36 +0000 (+1000)
Subject: Workaround for imagemagick regression causing logo inversion
X-Git-Tag: xonotic-v0.8.5~7^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73cfa3da85373772a4400a04a480cd30c327dca9;p=xonotic%2Fmediasource.git

Workaround for imagemagick regression causing logo inversion
---

diff --git a/gfx/luma/render-version.sh b/gfx/luma/render-version.sh
index 3677c18..6709481 100755
--- a/gfx/luma/render-version.sh
+++ b/gfx/luma/render-version.sh
@@ -51,5 +51,6 @@ for svg in $svgs; do
 	tga="$output/${svg%.*}.tga"
 
 	mkdir -p "$output"
-	sed "s/LUMA/$version/g" "$input/$svg" | rsvg-convert -z 2 | convert - -scale "50%" "$tga"
+	# -auto-orient works around an inversion regression present in imagemagick 6.9.11-60
+	sed "s/LUMA/$version/g" "$input/$svg" | rsvg-convert -z 2 | convert - -auto-orient -scale "50%" "$tga"
 done
diff --git a/gfx/menu/luminos_versionbuilder/versionbuilder b/gfx/menu/luminos_versionbuilder/versionbuilder
index 5aac35f..53dae33 100755
--- a/gfx/menu/luminos_versionbuilder/versionbuilder
+++ b/gfx/menu/luminos_versionbuilder/versionbuilder
@@ -25,7 +25,8 @@ sed -e "s/VERSIONPLACEHOLDER/$1/" background_l2.svg > tmp.svg
 # 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"
-convert background_l2.png background_l2.tga
+# -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