From: Rudolf Polzer <divVerent@alientrap.org>
Date: Thu, 5 Aug 2010 08:59:22 +0000 (+0200)
Subject: start X11 as compressonator needs it
X-Git-Tag: xonotic-v0.1.0preview~329^2~21
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=3501f1c4f3a19a7fef42535371895afa033a8fb2;hp=d8d1cd7183a8cd18961fd4f36b38429e0a31327d

start X11 as compressonator needs it
---

diff --git a/all b/all
index 7179a3bf..afc203f1 100755
--- a/all
+++ b/all
@@ -1056,6 +1056,16 @@ case "$cmd" in
 		"$SELF" release-buildpk3s data/xonotic-music.pk3dir      normal '' raw '-raw' low '-low'
 		"$SELF" release-buildpk3s data/xonotic-nexcompat.pk3dir                       low ''
 		;;
+	release-pack-needsx11)
+		case "$DISPLAY" in
+			'')
+				startx "$SELF" release-pack -- :7
+				;;
+			*)
+				"$SELF" release-pack
+				;;
+		esac
+		;;
 	release)
 		"$SELF" release-prepare
 		"$SELF" release-maps &
@@ -1063,7 +1073,7 @@ case "$cmd" in
 		"$SELF" release-finish &
 		"$SELF" release-qc &
 		wait
-		"$SELF" release-pack
+		"$SELF" release-pack-needsx11
 		;;
 
 	*)
diff --git a/misc/tools/compress-texture b/misc/tools/compress-texture
index 0cafa5a2..9e8d662b 100755
--- a/misc/tools/compress-texture
+++ b/misc/tools/compress-texture
@@ -25,7 +25,7 @@ case "$tool" in
 		dir_dos="C:/${dir##*/}"
 		ext=${src##*.}
 		cp "$src" "$dir/src.$ext"
-		DISPLAY= wine "$HOME/.wine/drive_c/Program Files/AMD/The Compressonator 1.50/TheCompressonator.exe" -convert -mipmaps "$dir_dos/src.$ext" "$dir_dos/dst.dds" $c $f "$@" -mipper BoxFilter.dll
+		wine "$HOME/.wine/drive_c/Program Files/AMD/The Compressonator 1.50/TheCompressonator.exe" -convert -mipmaps "$dir_dos/src.$ext" "$dir_dos/dst.dds" $c $f "$@" -mipper BoxFilter.dll
 		mv "$dir/dst.dds" "$dst"
 		rm -rf "$dir"
 		;;