Workaround for imagemagick regression causing logo inversion

diff --git a/gfx/luma/render-version.sh b/gfx/luma/render-version.sh
index 3677c1847c7ed9358f3dbd765e77a7eadf9003ca..6709481b625c270777683f0ad5e29121e369aeb0 100755 (executable)
--- 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"
        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
 done

diff --git a/gfx/menu/luminos_versionbuilder/versionbuilder b/gfx/menu/luminos_versionbuilder/versionbuilder
index 5aac35fe2c2f79f8f1065e168e41d94190537f10..53dae335f61594e16db66eea8647eb17d3c98ca7 100755 (executable)
--- 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"
 # 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
 # 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