Merge lp:~unity-team/nux/x-sru1 into lp:nux/xenial

[Marco Trevisan (Treviño)]

Releasing SRU1 for Xenial

[Andrea Azzarone (azzar1)]

+1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-26 12:40:13 +0000
+++ debian/changelog	2016-07-05 10:46:08 +0000
@@ -1,3 +1,10 @@
+nux (4.0.8+16.04.20160209-0ubuntu5) UNRELEASED; urgency=medium
+
+  * unity_support_test: add llvmpipe as software-rendererd (LP:
+    #1598770)
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 05 Jul 2016 12:44:49 +0200
+
 nux (4.0.8+16.04.20160209-0ubuntu4) yakkety; urgency=medium
 
   * (Build-)depend on libpng-dev.
 
=== removed directory 'debian/patches'
=== removed file 'debian/patches/01_blacklist_llvmpipe.patch'
--- debian/patches/01_blacklist_llvmpipe.patch	2012-02-27 10:23:10 +0000
+++ debian/patches/01_blacklist_llvmpipe.patch	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-Index: ubuntu/tools/unity_support_test.c
-===================================================================
---- ubuntu.orig/tools/unity_support_test.c	2012-01-13 09:01:58.714180000 +0100
-+++ ubuntu/tools/unity_support_test.c	2012-02-27 11:16:53.435617058 +0100
-@@ -587,6 +587,7 @@
-   if (results->renderer != NULL &&
-       (strncmp (results->renderer, "Software Rasterizer", 19) == 0 ||
-        strncmp (results->renderer, "Mesa X11", 8) == 0 ||
-+       strstr (results->renderer, "llvmpipe") != NULL ||
-        strstr (results->renderer, "on softpipe") != NULL)) {
-     results->flags |= FLAG_SOFTWARE_RENDERING;
-   }
 
=== removed file 'debian/patches/series'
--- debian/patches/series	2012-08-01 16:09:01 +0000
+++ debian/patches/series	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-01_blacklist_llvmpipe.patch
 
=== modified file 'tools/unity_support_test.c'
--- tools/unity_support_test.c	2013-11-01 13:09:43 +0000
+++ tools/unity_support_test.c	2016-07-05 10:46:08 +0000
@@ -158,6 +158,7 @@
            "    -i, --indirect:     Force an indirect rendering context\n"
            "    -p, --print:        Print detection results on stdout\n"
            "    -c, --compiz:       Only check for Compiz support\n"
+           "    -f  --force-check   Force checking already performed tests\n"
            "    -h, --help:         Show help\n");
 }
 
@@ -587,14 +588,15 @@
   if (results->renderer != NULL &&
       (strncmp (results->renderer, "Software Rasterizer", 19) == 0 ||
        strncmp (results->renderer, "Mesa X11", 8) == 0 ||
-       strstr (results->renderer, "on softpipe") != NULL)) {
+       strstr (results->renderer, "llvmpipe") ||
+       strstr (results->renderer, "on softpipe"))) {
     results->flags |= FLAG_SOFTWARE_RENDERING;
   }
 
   // jaytaoko: Balcklist the Geforce FX cards
   if (results->renderer != NULL) {
-    char* str = strstr (results->renderer, "GeForce FX");
-    if (str != NULL) {
+    if (strstr (results->renderer, "GeForce FX") ||
+        (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1)) {
       results->flags |= FLAG_BLACKLISTED;
     }
   }
@@ -696,7 +698,7 @@
     } else if ((strncmp (argv[i], "-h", 2) == 0) ||
                (strncmp (argv[i], "--help", 6) == 0)) {
       print_help ();
-      return 2;
+      return 0;
     } else {
       fprintf (stderr, "Error: unknown command-line option `%s'\n\n", argv[i]);
       print_help ();