From: bones_was_here <bones_was_here@xa.org.au>
Date: Sat, 19 Feb 2022 11:02:12 +0000 (+1000)
Subject: Work around imagemagick regression that puts everything upside down
X-Git-Tag: xonotic-v0.8.5~195^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9245f239c1c795ee38c07db71437776b03664ba;p=xonotic%2Fxonotic-data.pk3dir.git

Work around imagemagick regression that puts everything upside down
---

diff --git a/models/sprites/make-sprites.sh b/models/sprites/make-sprites.sh
index 27971f9a0..28223944d 100644
--- a/models/sprites/make-sprites.sh
+++ b/models/sprites/make-sprites.sh
@@ -130,7 +130,7 @@ sprite()
 		shift
 		shift
 		pngsprite "${name}_frame$frame" "$color" "$bgcolor" "$text"
-		convert "${name}_frame$frame.png" "${name}_frame$frame.tga"
+		convert "${name}_frame$frame.png" -auto-orient "${name}_frame$frame.tga"
 		rm -f "${name}_frame$frame.png"
 		args="$args -sprite ${name}_frame$frame.tga $(($sprwidth / 2)) $(($sprheight - 1)) $interval"
 		frame=$(($frame + 1))
diff --git a/models/weapons/make-sprites.sh b/models/weapons/make-sprites.sh
index 50f3fc672..3b8c43721 100755
--- a/models/weapons/make-sprites.sh
+++ b/models/weapons/make-sprites.sh
@@ -12,6 +12,7 @@ sprite()
 
 	# Text
 	exec {FD}< <(convert \
+	-auto-orient \
 	-size 185x120 \
 	-background transparent \
 	-fill "#$color" \
@@ -38,6 +39,7 @@ sprite()
 	yb2=$((yb1+15-1))
 
 	exec {FD}< <(convert \
+	-auto-orient \
 	-size 256x256 \
 	-background transparent \
 	-fill "#$color" \