Merge lp:~3v1n0/compiz/safer-profile-for-lowgfx into lp:compiz

[Marco Trevisan (Treviño)]

migration scripts: remove unsupported plugins for all the unity profiles

[lp:~3v1n0/compiz/safer-profile-for-lowgfx]

4070. By Marco Trevisan (Treviño) on 2016-07-14

GnomeCompat: remove unityshell support

We don't use it anymore

4071. By Marco Trevisan (Treviño) on 2016-07-14

migration scripts: remove unsupported plugins for all the unity profiles

4072. By Marco Trevisan (Treviño) on 2016-07-14

compiz-gnome.migrations: just add a script for removing plugins from unityshell

[Andrea Azzarone (azzar1)]

Grazie

review: Approve

=== removed file 'debian/00_remove_decor_in_unity_session.py'
--- debian/00_remove_decor_in_unity_session.py	2015-04-06 13:42:54 +0000
+++ debian/00_remove_decor_in_unity_session.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014-2015 Canonical
-#
-# Authors:
-#  Marco Trevisan <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUTa
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-from gi.repository import Gio
-import os,sys
-
-COMPIZ_SCHEMA = "org.compiz"
-COMPIZ_CORE_PATH = "/org/compiz/profiles/unity/plugins/core/"
-
-if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
-    print("No compiz schemas found, no migration needed")
-    sys.exit(0)
-
-core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=COMPIZ_CORE_PATH)
-active_plugins = core_settings.get_strv("active-plugins")
-
-if not "decor" in active_plugins:
-    print("No decor plugin active, no migration needed")
-    sys.exit(0)
-
-try:
-    active_plugins.remove("decor")
-except ValueError:
-    pass
-
-# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
-# gsettings.set_strv("active-plugins", active_plugins)
-from subprocess import Popen, PIPE, STDOUT
-p = Popen(("dconf load "+COMPIZ_CORE_PATH).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
-p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins),'utf-8'))

=== removed file 'debian/00_remove_gnomecompat_in_unity_session.py'
--- debian/00_remove_gnomecompat_in_unity_session.py	2015-04-06 13:42:54 +0000
+++ debian/00_remove_gnomecompat_in_unity_session.py	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014-2015 Canonical
-#
-# Authors:
-#  Marco Trevisan <[e-mail]>
-#  William Hua <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUTa
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-from gi.repository import Gio
-import os,sys
-
-COMPIZ_SCHEMA = "org.compiz"
-COMPIZ_CORE_PATH = "/org/compiz/profiles/unity/plugins/core/"
-
-if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
-    print("No compiz schemas found, no migration needed")
-    sys.exit(0)
-
-core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=COMPIZ_CORE_PATH)
-active_plugins = core_settings.get_strv("active-plugins")
-
-if not "gnomecompat" in active_plugins:
-    print("No gnomecompat plugin active, no migration needed")
-    sys.exit(0)
-
-try:
-    active_plugins.remove("gnomecompat")
-except ValueError:
-    pass
-
-# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
-# gsettings.set_strv("active-plugins", active_plugins)
-from subprocess import Popen, PIPE, STDOUT
-p = Popen(("dconf load "+COMPIZ_CORE_PATH).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
-p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))

=== added file 'debian/00_remove_obsolete_plugins_in_unity_session_v1.py'
--- debian/00_remove_obsolete_plugins_in_unity_session_v1.py	1970-01-01 00:00:00 +0000
+++ debian/00_remove_obsolete_plugins_in_unity_session_v1.py	2016-07-14 15:49:11 +0000
@@ -0,0 +1,52 @@
+#!/usr/bin/python3
+# -*- coding: utf-8 -*-
+# Copyright (C) 2016 Canonical
+#
+# Authors:
+#  Marco Trevisan <[e-mail]>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUTa
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from gi.repository import Gio
+import os,sys
+
+COMPIZ_SCHEMA = "org.compiz"
+COMPIZ_CORE_PATH = "/org/compiz/profiles/{}/plugins/core/"
+UNITY_PROFILES = ["unity", "unity-lowgfx"]
+OBSOLETE_PLUGINS = ["decor", "gnomecompat", "scalefilter"]
+
+if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
+    print("No compiz schemas found, no migration needed")
+    sys.exit(0)
+
+for profile in UNITY_PROFILES:
+    core_profile_path = COMPIZ_CORE_PATH.format(profile)
+    core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=core_profile_path)
+    active_plugins = core_settings.get_strv("active-plugins")
+
+    for plugin in OBSOLETE_PLUGINS:
+        if not plugin in active_plugins:
+            print("No '{}' plugin active in '{}' profile, no migration needed".format(plugin, profile))
+            continue
+
+        try:
+            active_plugins.remove(plugin)
+        except ValueError:
+            pass
+
+        # gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
+        # gsettings.set_strv("active-plugins", active_plugins)
+        from subprocess import Popen, PIPE, STDOUT
+        p = Popen(("dconf load "+core_profile_path).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
+        p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))

=== removed file 'debian/00_remove_scalefilter_in_unity_session.py'
--- debian/00_remove_scalefilter_in_unity_session.py	2015-04-06 13:42:54 +0000
+++ debian/00_remove_scalefilter_in_unity_session.py	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#!/usr/bin/python3
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014-2015 Canonical
-#
-# Authors:
-#  Marco Trevisan <[e-mail]>
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUTa
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-from gi.repository import Gio
-import os,sys
-
-COMPIZ_SCHEMA = "org.compiz"
-COMPIZ_CORE_PATH = "/org/compiz/profiles/unity/plugins/core/"
-
-if COMPIZ_SCHEMA not in Gio.Settings.list_schemas():
-    print("No compiz schemas found, no migration needed")
-    sys.exit(0)
-
-core_settings = Gio.Settings(schema=COMPIZ_SCHEMA+".core", path=COMPIZ_CORE_PATH)
-active_plugins = core_settings.get_strv("active-plugins")
-
-if not "scalefilter" in active_plugins:
-    print("No decor scalefilter active, no migration needed")
-    sys.exit(0)
-
-try:
-    active_plugins.remove("scalefilter")
-except ValueError:
-    pass
-
-# gsettings doesn't work directly, the key is somewhat reverted. Work one level under then: dconf!
-# gsettings.set_strv("active-plugins", active_plugins)
-from subprocess import Popen, PIPE, STDOUT
-p = Popen(("dconf load "+COMPIZ_CORE_PATH).split(), stdout=PIPE, stdin=PIPE, stderr=STDOUT)
-p.communicate(input=bytes("[/]\nactive-plugins={}".format(active_plugins), 'utf-8'))

=== removed file 'debian/compiz-gnome.gconf-defaults'
--- debian/compiz-gnome.gconf-defaults	2014-03-11 14:04:52 +0000
+++ debian/compiz-gnome.gconf-defaults	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-/apps/compiz-1/plugins/move/screen0/options/constrain_y                true
-/apps/compiz-1/general/screen0/options/hsize				2
-/apps/compiz-1/general/screen0/options/vsize				2
-/apps/gwd/blur_type							all
-/apps/gwd/metacity_theme_opacity					1.0
-/apps/gwd/metacity_theme_shade_opacity					true
-/apps/compizconfig-1/profiles/unity/general/screen0/options/active_plugins [core,composite,opengl,compiztoolbox,vpswitch,snap,mousepoll,resize,place,move,wall,grid,regex,imgpng,session,gnomecompat,animation,fade,unitymtgrabhandles,workarounds,scale,expo,ezoom,unityshell]
-/apps/compizconfig-1/profiles/unity/plugins/gnomecompat/screen0/options/main_menu_key ""
-/apps/compizconfig-1/profiles/unity/plugins/gnomecompat/screen0/options/run_key ""
-/apps/compizconfig-1/profiles/Default/general/screen0/options/active_plugins [core,composite,opengl,compiztoolbox,decor,vpswitch,snap,mousepoll,resize,place,move,wall,grid,regex,imgpng,session,gnomecompat,animation,fade,workarounds,scale,expo,ezoom]

=== modified file 'debian/compiz-gnome.gsettings-override'
--- debian/compiz-gnome.gsettings-override	2015-07-25 18:35:50 +0000
+++ debian/compiz-gnome.gsettings-override	2016-07-14 15:49:11 +0000
@@ -10,4 +10,3 @@
 
 [org.compiz.animation]
 unminimize-effects=['animation:Glide 2']
-

=== modified file 'debian/compiz-gnome.migrations'
--- debian/compiz-gnome.migrations	2015-02-19 15:57:24 +0000
+++ debian/compiz-gnome.migrations	2016-07-14 15:49:11 +0000
@@ -1,3 +1,1 @@
-debian/00_remove_decor_in_unity_session.py
-debian/00_remove_scalefilter_in_unity_session.py
-debian/00_remove_gnomecompat_in_unity_session.py
+debian/00_remove_obsolete_plugins_in_unity_session_v1.py

=== modified file 'plugins/gnomecompat/gnomecompat.xml.in'
--- plugins/gnomecompat/gnomecompat.xml.in	2015-10-26 17:15:43 +0000
+++ plugins/gnomecompat/gnomecompat.xml.in	2016-07-14 15:49:11 +0000
@@ -11,6 +11,9 @@
 		<plugin>opengl</plugin>
 		<plugin>decor</plugin>
 	    </relation>
+	    <conflict>
+		<plugin>unityshell</plugin>
+	    </conflict>
 	</deps>
 	<options>
 	    <option name="main_menu_key" type="key">

=== modified file 'src/plugin.cpp'
--- src/plugin.cpp	2015-10-26 17:15:43 +0000
+++ src/plugin.cpp	2016-07-14 15:49:11 +0000
@@ -132,60 +132,6 @@
 }
 
 static bool
-setOpenGLPluginEnvironment ()
-{
-    /*
-     * Check if the hardware is adequate for Unity and if not, use LLVMpipe.
-     * Unfortunately the design of Mesa requires that this be done before
-     * libGL is loaded, which means before the opengl plugin is loaded.
-     */
-    bool toggledLLVM = false;
-
-    if (!getenv ("LIBGL_ALWAYS_SOFTWARE"))
-    {
-	const char *profile = getenv ("COMPIZ_CONFIG_PROFILE");
-	if (profile && strcmp (profile, "ubuntu") == 0)
-	{
-	    int result = system ("/usr/lib/nux/unity_support_test");
-	    int status = WEXITSTATUS (result);
-	    compLogMessage ("core", CompLogLevelInfo,
-		"Unity is %s",
-		status == 0 ?   "fully supported by your hardware." :
-		status == 127 ? "undetectable" :
-		                "not supported by your hardware. "
-		                "Enabling software rendering instead (slow).");
-	    if (status > 0 && status < 127)
-	    {
-		setenv ("LIBGL_ALWAYS_SOFTWARE", "1", 1);
-		toggledLLVM = true;
-	    }
-	}
-    }
-
-    return toggledLLVM;
-}
-
-static void
-unsetUnityshellPluginEnvironment ()
-{
-    unsetenv ("LIBGL_ALWAYS_SOFTWARE");
-}
-
-static void
-setPluginEnvironment (const char *name)
-{
-    if (strcmp (name, "opengl") == 0)
-	setOpenGLPluginEnvironment ();
-}
-
-static void
-unsetPluginEnvironment (const char *name)
-{
-    if (strcmp (name, "unityshell") == 0)
-	unsetUnityshellPluginEnvironment ();
-}
-
-static bool
 dlloaderLoadPlugin (CompPlugin *p,
 		    const char *path,
 		    const char *name)
@@ -197,8 +143,6 @@
     if (cloaderLoadPlugin (p, path, name))
 	return true;
 
-    setPluginEnvironment (name);
-
     if (path)
     {
 	file  = path;
@@ -269,8 +213,6 @@
     if (!loaded && dlhand)
 	dlclose (dlhand);
 
-    unsetPluginEnvironment (name);
-
     return loaded;
 }