Merge lp:~didrocks/nux/disable-blacklist into lp:nux

[Didier Roche-Tolomelli]

add cards to the blacklist and enabling user to bypass the check with an
environment variable (LP: #728745, #764379)

=== modified file 'tools/unity_support_test.c'
--- tools/unity_support_test.c	2011-04-14 13:45:58 +0000
+++ tools/unity_support_test.c	2011-04-20 10:33:34 +0000
@@ -72,7 +72,10 @@
 struct PciDevice gpu_blacklist[] = {
   { 0x8086, 0x3577 },  // Intel : 82830M/MG
   { 0x8086, 0x2562 },  // Intel : 82845G aka Poulsbo
-  { 0x1002, 0x4c57 }   // ATI : Radeon Mobility 7500
+  { 0x1002, 0x4c57 },  // ATI : Radeon Mobility 7500
+  { 0x10de, 0x0240 },  // nVidia: GeForce 6150
+  { 0x10de, 0x01d7 },  // nVidia: GeForce Go 7300 / Quadro NVS 110M
+  { 0x10de, 0x01d8 }   // nVidia: GeForce Go 7400
 };
 
 // Checks whether an extension is supported by the GLX/OpenGL implementation
@@ -185,6 +188,12 @@
   char *vendor, *renderer, *version;
   int result, major, minor;
 
+  if (getenv ("UNITY_FORCE_START")) {
+    fprintf (stdout, "Warning: UNITY_FORCE_START enabled, no check for unity or compiz support.\n");
+    return 0;
+  }
+
+
   // Basic command-line parsing.
   for (int i = 1; i < argc; i++) {
     if (((strncmp (argv[i], "-d", 2) == 0) ||