| Message ID | 20171128145928.5784-1-limon.anibal@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [PATCHv2] recipes-graphics/piglit: Add patch to fix build in some platforms | expand |
On Tue, Nov 28, 2017 at 8:59 AM, Aníbal Limón <limon.anibal@gmail.com> wrote: > From: Aníbal Limón <anibal.limon@linaro.org> > > 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 <anibal.limon@linaro.org> > Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> > --- > ...gl-context-priority.c-Use-piglit_egl_get_.patch | 41 > ++++++++++++++++++++++ > meta/recipes-graphics/piglit/piglit_git.bb | 1 + > 2 files changed, 42 insertions(+) > create 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 > new file mode 100644 > index 0000000000..13b997c037 > --- /dev/null > +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-egl- > egl-context-priority.c-Use-piglit_egl_get_.patch > @@ -0,0 +1,41 @@ > +From cb562a383229074b44db6998b85572d2abe7c363 Mon Sep 17 00:00:00 2001 > +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org> > +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 <anibal.limon@linaro.org> > +Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> > +Reviewed-by: Tapani Pälli <tapani.palli@intel.com> > +Reviewed-by: Emil Velikov <emil.velikov@collabora.com> > + > +Upstream-status: Backport > + > +https://github.com/Igalia/piglit/commit/cb562a3832 Now is a backport, the piglit people pushed to master the patch. Cheers, Anibal > > +--- > + 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 d274a8fbd5..45fd534dfa 100644 > --- a/meta/recipes-graphics/piglit/piglit_git.bb > +++ b/meta/recipes-graphics/piglit/piglit_git.bb > @@ -5,6 +5,7 @@ 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_VERSION_UNKNOWN = "1" > > -- > 2.11.0 > > <div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Nov 28, 2017 at 8:59 AM, Aníbal Limón <span dir="ltr"><<a href="mailto:limon.anibal@gmail.com" target="_blank">limon.anibal@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Aníbal Limón <<a href="mailto:anibal.limon@linaro.org">anibal.limon@linaro.org</a>><br> <br> The entry point is not guaranteed to exist, so use the<br> piglit_egl_get_default_<wbr>display() helper which does the correct thing.<br> <br> Signed-off-by: Aníbal Limón <<a href="mailto:anibal.limon@linaro.org">anibal.limon@linaro.org</a>><br> Signed-off-by: Daniel Díaz <<a href="mailto:daniel.diaz@linaro.org">daniel.diaz@linaro.org</a>><br> ---<br> ...gl-context-priority.c-Use-<wbr>piglit_egl_get_.patch | 41 ++++++++++++++++++++++<br> meta/recipes-graphics/piglit/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">p<wbr>iglit_git.bb</a> | 1 +<br> 2 files changed, 42 insertions(+)<br> create mode 100644 meta/recipes-graphics/piglit/<wbr>piglit/0001-tests-egl-egl-<wbr>context-priority.c-Use-piglit_<wbr>egl_get_.patch<br> <br> diff --git a/meta/recipes-graphics/<wbr>piglit/piglit/0001-tests-egl-<wbr>egl-context-priority.c-Use-<wbr>piglit_egl_get_.patch b/meta/recipes-graphics/<wbr>piglit/piglit/0001-tests-egl-<wbr>egl-context-priority.c-Use-<wbr>piglit_egl_get_.patch<br> new file mode 100644<br> index 0000000000..13b997c037<br> --- /dev/null<br> +++ b/meta/recipes-graphics/<wbr>piglit/piglit/0001-tests-egl-<wbr>egl-context-priority.c-Use-<wbr>piglit_egl_get_.patch<br> @@ -0,0 +1,41 @@<br> +From cb562a383229074b44db6998b85572<wbr>d2abe7c363 Mon Sep 17 00:00:00 2001<br> +From: =?UTF-8?q?An=C3=ADbal=20Lim=<wbr>C3=B3n?= <<a href="mailto:anibal.limon@linaro.org">anibal.limon@linaro.org</a>><br> +Date: Fri, 24 Nov 2017 10:31:55 -0600<br> +Subject: [PATCH] tests/egl/egl-context-<wbr>priority.c: Use<br> + piglit_egl_get_default_display<br> +MIME-Version: 1.0<br> +Content-Type: text/plain; charset=UTF-8<br> +Content-Transfer-Encoding: 8bit<br> +<br> +The entry point is not guaranteed to exist, so use the<br> +piglit_egl_get_default_<wbr>display() helper which does the correct thing.<br> +<br> +Signed-off-by: Aníbal Limón <<a href="mailto:anibal.limon@linaro.org">anibal.limon@linaro.org</a>><br> +Signed-off-by: Daniel Díaz <<a href="mailto:daniel.diaz@linaro.org">daniel.diaz@linaro.org</a>><br> +Reviewed-by: Tapani Pälli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>><br> +Reviewed-by: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>><br> +<br> +Upstream-status: Backport<br> +<br> +<a href="https://github.com/Igalia/piglit/commit/cb562a3832" rel="noreferrer" target="_blank">https://github.com/Igalia/<wbr>piglit/commit/cb562a3832</a></blockquote><div><br></div><div>Now is a backport, the piglit people pushed to master the patch.</div><div><br></div><div>Cheers,</div><div>Anibal</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><br> +---<br> + tests/egl/egl-context-<wbr>priority.c | 3 +--<br> + 1 file changed, 1 insertion(+), 2 deletions(-)<br> +<br> +diff --git a/tests/egl/egl-context-<wbr>priority.c b/tests/egl/egl-context-<wbr>priority.c<br> +index 7f26fc614..9590ccae3 100644<br> +--- a/tests/egl/egl-context-<wbr>priority.c<br> ++++ b/tests/egl/egl-context-<wbr>priority.c<br> +@@ -99,8 +99,7 @@ piglit_init(int argc, char **argv)<br> + if (!strstr(exts, "EGL_MESA_platform_<wbr>surfaceless"))<br> + piglit_report_result(PIGLIT_<wbr>SKIP);<br> +<br> +- dpy = eglGetPlatformDisplay(EGL_<wbr>PLATFORM_SURFACELESS_MESA,<br> +- EGL_DEFAULT_DISPLAY, NULL);<br> ++ dpy = piglit_egl_get_default_<wbr>display(EGL_PLATFORM_<wbr>SURFACELESS_MESA);<br> +<br> + ok = eglInitialize(dpy, &major, &minor);<br> + if (!ok) {<br> +--<br> +2.11.0<br> +<br> diff --git a/meta/recipes-graphics/<wbr>piglit/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">piglit_git.bb</a> b/meta/recipes-graphics/<wbr>piglit/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">piglit_git.bb</a><br> index d274a8fbd5..45fd534dfa 100644<br> --- a/meta/recipes-graphics/<wbr>piglit/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">piglit_git.bb</a><br> +++ b/meta/recipes-graphics/<wbr>piglit/<a href="http://piglit_git.bb" rel="noreferrer" target="_blank">piglit_git.bb</a><br> @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=<wbr>b2beded7103a3d8a442a2a0391d607<wbr>b0"<br> SRC_URI = "git://<a href="http://anongit.freedesktop.org/piglit" rel="noreferrer" target="_blank">anongit.freedesktop.<wbr>org/piglit</a> \<br> file://0001-cmake-install-<wbr>bash-completions-in-the-right-<wbr>place.patch \<br> file://0001-tests-Use-FE_<wbr>UPWARD-only-if-its-defined-in-<wbr>fenv.h.patch \<br> + file://0001-tests-egl-egl-<wbr>context-priority.c-Use-piglit_<wbr>egl_get_.patch \<br> "<br> UPSTREAM_VERSION_UNKNOWN = "1"<br> <span class="HOEnZb"><font color="#888888"><br> --<br> 2.11.0<br> <br> </font></span></blockquote></div><br></div></div> -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
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 new file mode 100644 index 0000000000..13b997c037 --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/0001-tests-egl-egl-context-priority.c-Use-piglit_egl_get_.patch @@ -0,0 +1,41 @@ +From cb562a383229074b44db6998b85572d2abe7c363 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org> +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 <anibal.limon@linaro.org> +Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> +Reviewed-by: Tapani Pälli <tapani.palli@intel.com> +Reviewed-by: Emil Velikov <emil.velikov@collabora.com> + +Upstream-status: Backport + +https://github.com/Igalia/piglit/commit/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 d274a8fbd5..45fd534dfa 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -5,6 +5,7 @@ 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_VERSION_UNKNOWN = "1"