From fa724345831253a2a2379b9fccc116d32a3d18d3 Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Tue, 27 Feb 2018 17:40:41 +0200 Subject: piglit: upgrade to current git master Upgrade to revision: 4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b remove backported patch: 0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch Signed-off-by: Maxin B. John Signed-off-by: Richard Purdie --- ...gl-context-priority.c-Use-piglit_egl_get_.patch | 41 ---------------------- meta/recipes-graphics/piglit/piglit_git.bb | 5 ++- 2 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch diff --git a/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch deleted file mode 100644 index e2e87cc1ed..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch +++ /dev/null @@ -1,41 +0,0 @@ -From cb562a383229074b44db6998b85572d2abe7c363 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= -Date: Fri, 24 Nov 2017 10:31:55 -0600 -Subject: [PATCH] tests/egl/egl-context-priority.c: Use - piglit_egl_get_default_display -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The entry point is not guaranteed to exist, so use the -piglit_egl_get_default_display() helper which does the correct thing. - -Signed-off-by: Aníbal Limón -Signed-off-by: Daniel Díaz -Reviewed-by: Tapani Pälli -Reviewed-by: Emil Velikov - -Upstream-Status: Backport - -https://cgit.freedesktop.org/piglit/commit/?id=cb562a3832 ---- - tests/egl/egl-context-priority.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tests/egl/egl-context-priority.c b/tests/egl/egl-context-priority.c -index 7f26fc614..9590ccae3 100644 ---- a/tests/egl/egl-context-priority.c -+++ b/tests/egl/egl-context-priority.c -@@ -99,8 +99,7 @@ piglit_init(int argc, char **argv) - if (!strstr(exts, "EGL_MESA_platform_surfaceless")) - piglit_report_result(PIGLIT_SKIP); - -- dpy = eglGetPlatformDisplay(EGL_PLATFORM_SURFACELESS_MESA, -- EGL_DEFAULT_DISPLAY, NULL); -+ dpy = piglit_egl_get_default_display(EGL_PLATFORM_SURFACELESS_MESA); - - ok = eglInitialize(dpy, &major, &minor); - if (!ok) { --- -2.11.0 - diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 2839f1d285..b936ad8a73 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" SRC_URI = "git://anongit.freedesktop.org/piglit \ file://0001-cmake-install-bash-completions-in-the-right-place.patch \ file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \ - file://0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch \ " UPSTREAM_CHECK_COMMITS = "1" -# From 2017-07-03 -SRCREV = "c8f4fd9eeb298a2ef0855927f22634f794ef3eff" +# From 2018-02-26 +SRCREV = "4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" -- cgit 1.2.3-korg