Nux

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

  1. x-sru1
  2. Merge into xenial
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Andrea Azzarone
Approved revision: 878
Merged at revision: 878
Proposed branch: lp:~unity-team/nux/x-sru1
Merge into: lp:nux/xenial
Diff against target: 78 lines (+13/-17)
4 files modified
debian/changelog (+7/-0)
debian/patches/01_blacklist_llvmpipe.patch (+0/-12)
debian/patches/series (+0/-1)
tools/unity_support_test.c (+6/-4)
To merge this branch: bzr merge lp:~unity-team/nux/x-sru1
Reviewer Review Type Date Requested Status
Andrea Azzarone (community) Approve
Review via email: mp+299131@code.launchpad.net

Commit message

Releasing SRU1 for Xenial

To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-04-26 12:40:13 +0000
3+++ debian/changelog 2016-07-05 10:46:08 +0000
4@@ -1,3 +1,10 @@
5+nux (4.0.8+16.04.20160209-0ubuntu5) UNRELEASED; urgency=medium
6+
7+ * unity_support_test: add llvmpipe as software-rendererd (LP:
8+ #1598770)
9+
10+ -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 05 Jul 2016 12:44:49 +0200
11+
12 nux (4.0.8+16.04.20160209-0ubuntu4) yakkety; urgency=medium
13
14 * (Build-)depend on libpng-dev.
15
16=== removed directory 'debian/patches'
17=== removed file 'debian/patches/01_blacklist_llvmpipe.patch'
18--- debian/patches/01_blacklist_llvmpipe.patch 2012-02-27 10:23:10 +0000
19+++ debian/patches/01_blacklist_llvmpipe.patch 1970-01-01 00:00:00 +0000
20@@ -1,12 +0,0 @@
21-Index: ubuntu/tools/unity_support_test.c
22-===================================================================
23---- ubuntu.orig/tools/unity_support_test.c 2012-01-13 09:01:58.714180000 +0100
24-+++ ubuntu/tools/unity_support_test.c 2012-02-27 11:16:53.435617058 +0100
25-@@ -587,6 +587,7 @@
26- if (results->renderer != NULL &&
27- (strncmp (results->renderer, "Software Rasterizer", 19) == 0 ||
28- strncmp (results->renderer, "Mesa X11", 8) == 0 ||
29-+ strstr (results->renderer, "llvmpipe") != NULL ||
30- strstr (results->renderer, "on softpipe") != NULL)) {
31- results->flags |= FLAG_SOFTWARE_RENDERING;
32- }
33
34=== removed file 'debian/patches/series'
35--- debian/patches/series 2012-08-01 16:09:01 +0000
36+++ debian/patches/series 1970-01-01 00:00:00 +0000
37@@ -1,1 +0,0 @@
38-01_blacklist_llvmpipe.patch
39
40=== modified file 'tools/unity_support_test.c'
41--- tools/unity_support_test.c 2013-11-01 13:09:43 +0000
42+++ tools/unity_support_test.c 2016-07-05 10:46:08 +0000
43@@ -158,6 +158,7 @@
44 " -i, --indirect: Force an indirect rendering context\n"
45 " -p, --print: Print detection results on stdout\n"
46 " -c, --compiz: Only check for Compiz support\n"
47+ " -f --force-check Force checking already performed tests\n"
48 " -h, --help: Show help\n");
49 }
50
51@@ -587,14 +588,15 @@
52 if (results->renderer != NULL &&
53 (strncmp (results->renderer, "Software Rasterizer", 19) == 0 ||
54 strncmp (results->renderer, "Mesa X11", 8) == 0 ||
55- strstr (results->renderer, "on softpipe") != NULL)) {
56+ strstr (results->renderer, "llvmpipe") ||
57+ strstr (results->renderer, "on softpipe"))) {
58 results->flags |= FLAG_SOFTWARE_RENDERING;
59 }
60
61 // jaytaoko: Balcklist the Geforce FX cards
62 if (results->renderer != NULL) {
63- char* str = strstr (results->renderer, "GeForce FX");
64- if (str != NULL) {
65+ if (strstr (results->renderer, "GeForce FX") ||
66+ (getenv("UNITY_LOW_GFX_MODE") != NULL && atoi(getenv("UNITY_LOW_GFX_MODE")) == 1)) {
67 results->flags |= FLAG_BLACKLISTED;
68 }
69 }
70@@ -696,7 +698,7 @@
71 } else if ((strncmp (argv[i], "-h", 2) == 0) ||
72 (strncmp (argv[i], "--help", 6) == 0)) {
73 print_help ();
74- return 2;
75+ return 0;
76 } else {
77 fprintf (stderr, "Error: unknown command-line option `%s'\n\n", argv[i]);
78 print_help ();

Subscribers

People subscribed via source and target branches

to all changes: