diff options
| -rw-r--r-- | meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-graphics/piglit/piglit_git.bb | 3 |
2 files changed, 1 insertions, 26 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch b/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch deleted file mode 100644 index 261d98d8f6..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-render-ops.c-add-missing-format-string.patch +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | From e21e68f6aa0f5249fce613e8fd4ac0edbd5cb7b0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Tue, 22 Dec 2020 13:35:11 +0100 | ||
| 4 | Subject: [PATCH] render-ops.c: add missing format string | ||
| 5 | |||
| 6 | Upstream-Status: Pending | ||
| 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 8 | --- | ||
| 9 | tests/spec/ati_fragment_shader/render-ops.c | 2 +- | ||
| 10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 11 | |||
| 12 | diff --git a/tests/spec/ati_fragment_shader/render-ops.c b/tests/spec/ati_fragment_shader/render-ops.c | ||
| 13 | index 131334ba2..19a353d67 100644 | ||
| 14 | --- a/tests/spec/ati_fragment_shader/render-ops.c | ||
| 15 | +++ b/tests/spec/ati_fragment_shader/render-ops.c | ||
| 16 | @@ -393,7 +393,7 @@ piglit_display(void) | ||
| 17 | bool ok = piglit_probe_rect_halves_equal_rgba(get_test_x(i), get_test_y(i), | ||
| 18 | w * 2, h); | ||
| 19 | enum piglit_result sub_result = ok ? PIGLIT_PASS : PIGLIT_FAIL; | ||
| 20 | - piglit_report_subtest_result(sub_result, test->name); | ||
| 21 | + piglit_report_subtest_result(sub_result, "%s", test->name); | ||
| 22 | piglit_merge_result(&result, sub_result); | ||
| 23 | } | ||
| 24 | |||
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 442c1a3c62..484b59df00 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb | |||
| @@ -13,11 +13,10 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ | |||
| 13 | file://0001-serializer.py-make-.gz-files-reproducible.patch \ | 13 | file://0001-serializer.py-make-.gz-files-reproducible.patch \ |
| 14 | file://0001-framework-profile.py-make-test-lists-reproducible.patch \ | 14 | file://0001-framework-profile.py-make-test-lists-reproducible.patch \ |
| 15 | file://0001-tests-shader.py-sort-the-file-list-before-working-on.patch \ | 15 | file://0001-tests-shader.py-sort-the-file-list-before-working-on.patch \ |
| 16 | file://0001-render-ops.c-add-missing-format-string.patch \ | ||
| 17 | " | 16 | " |
| 18 | UPSTREAM_CHECK_COMMITS = "1" | 17 | UPSTREAM_CHECK_COMMITS = "1" |
| 19 | 18 | ||
| 20 | SRCREV = "603deba4ab66e2a8948693a14d715e536caddcc5" | 19 | SRCREV = "d3a6e1293c43a6d989d4bcd59132317195d420c6" |
| 21 | # (when PV goes above 1.0 remove the trailing r) | 20 | # (when PV goes above 1.0 remove the trailing r) |
| 22 | PV = "1.0+gitr${SRCPV}" | 21 | PV = "1.0+gitr${SRCPV}" |
| 23 | 22 | ||
