From b2d81b58bbc8f03dfca7d8de19ab5c303e8e3097 Mon Sep 17 00:00:00 2001
From: Holger Paradies <retabell@gmx.de>
Date: Tue, 17 Dec 2013 20:22:01 +0100
Subject: Version 0.2.5 check llvmpipe

---
 kanotix-lxde-extra/debian/changelog     |  6 ++++++
 kanotix-lxde-extra/kanotix-start-compiz | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/kanotix-lxde-extra/debian/changelog b/kanotix-lxde-extra/debian/changelog
index de48f65..e187190 100644
--- a/kanotix-lxde-extra/debian/changelog
+++ b/kanotix-lxde-extra/debian/changelog
@@ -1,3 +1,9 @@
+kanotix-lxde-extra (0.2.5) unstable; urgency=low
+
+  * disable compiz if llvmpipe is found
+
+ -- Holger Paradies <retabell@gmx.de>  Sat, 14 Dec 2013 14:09:27 +0100
+
 kanotix-lxde-extra (0.2.4) unstable; urgency=low
 
   * compton icon-cache
diff --git a/kanotix-lxde-extra/kanotix-start-compiz b/kanotix-lxde-extra/kanotix-start-compiz
index 982ea91..f1b35b3 100644
--- a/kanotix-lxde-extra/kanotix-start-compiz
+++ b/kanotix-lxde-extra/kanotix-start-compiz
@@ -27,6 +27,23 @@ active wm = compiz
 _EOF_
 fi
 
+# force nocompiz with llvmpipe
+if glxinfo|grep -q llvmpipe; then
+echo "disable compiz on llvmpipe" >&2
+sed -i s/"active wm = compiz"/"active wm = openbox-lxde"/ ~/.config/compiz/fusion-icon
+#cat <<"_EOF_" > ~/.config/compiz/fusion-icon
+#[compiz options]
+#loose binding = false
+#indirect rendering = false
+
+#[window manager]
+#active wm = openbox-lxde
+
+
+#_EOF_
+
+fi
+
 if [ -e ~/.nocompiz ]; then
  # write openbox-config and start openbox
  # keep care we have this config in case fusion-icon is started from
@@ -50,9 +67,11 @@ fi
 exit 4
 fi
 
+
 # start compiz/openbox choosen from config
 if glxinfo|grep -q GLX_EXT_texture_from_pixmap; then
 if [ -x /usr/bin/fusion-icon ]; then
+ echo "starte fusion-icon"
  fusion-icon >/dev/null 2>&1 &     # start and reload windowmanager
 else
  echo "ERROR fusion-icon not found, starting default" >&2
-- 
cgit v1.0