* [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability
@ 2016-08-08 15:45 Tom Hochstein
2016-08-09 10:09 ` Burton, Ross
2016-08-15 20:56 ` akuster808
0 siblings, 2 replies; 6+ messages in thread
From: Tom Hochstein @ 2016-08-08 15:45 UTC (permalink / raw)
To: openembedded-core
The most recent patch 0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch
incorrectly removed the configuration constructs that allowed the
package to be configured without OpenGL ES support.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
.../mesa-demos/0012-Fix-gles-configurability.patch | 39 ++++++++++++++++++++++
meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb | 1 +
2 files changed, 40 insertions(+)
create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch b/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch
new file mode 100644
index 0000000..0b437a4
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch
@@ -0,0 +1,39 @@
+Index: mesa-demos-8.2.0/src/egl/opengles1/Makefile.am
+===================================================================
+--- mesa-demos-8.2.0.orig/src/egl/opengles1/Makefile.am 2016-07-29 10:52:50.131729547 -0500
++++ mesa-demos-8.2.0/src/egl/opengles1/Makefile.am 2016-07-29 10:59:26.000000000 -0500
+@@ -36,6 +36,8 @@
+ $(EGL_LIBS) \
+ -lm
+
++if HAVE_EGL
++if HAVE_GLESV1
+ bin_PROGRAMS =
+
+ if HAVE_X11
+@@ -76,3 +78,5 @@
+ torus_x11_LDADD = ../eglut/libeglut_x11.la
+ tri_x11_LDADD = ../eglut/libeglut_x11.la
+ endif
++endif
++endif
+Index: mesa-demos-8.2.0/src/egl/opengles2/Makefile.am
+===================================================================
+--- mesa-demos-8.2.0.orig/src/egl/opengles2/Makefile.am 2016-07-29 10:52:50.131729547 -0500
++++ mesa-demos-8.2.0/src/egl/opengles2/Makefile.am 2016-07-29 10:59:03.000000000 -0500
+@@ -33,6 +33,8 @@
+ $(EGL_LIBS) \
+ -lm
+
++if HAVE_EGL
++if HAVE_GLESV2
+ bin_PROGRAMS =
+
+ if HAVE_WAYLAND
+@@ -53,4 +55,5 @@
+ es2gears_x11_LDADD = ../eglut/libeglut_x11.la
+ es2tri_LDADD = $(X11_LIBS)
+ endif
+-
++endif
++endif
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
index 2df9bba..8e12d82 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
@@ -21,6 +21,7 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \
file://0010-sharedtex_mt-fix-rendering-thread-hang.patch \
file://0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch \
+ file://0012-Fix-gles-configurability.patch \
"
SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061"
SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92"
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability
2016-08-08 15:45 [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability Tom Hochstein
@ 2016-08-09 10:09 ` Burton, Ross
2016-08-09 11:43 ` Tom Hochstein
2016-08-15 20:56 ` akuster808
1 sibling, 1 reply; 6+ messages in thread
From: Burton, Ross @ 2016-08-09 10:09 UTC (permalink / raw)
To: Tom Hochstein; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
On 8 August 2016 at 16:45, Tom Hochstein <tom.hochstein@nxp.com> wrote:
> The most recent patch 0011-drop-demos-dependant-on-
> obsolete-MESA_screen_surface.patch
> incorrectly removed the configuration constructs that allowed the
> package to be configured without OpenGL ES support.
>
Does this also need to be applied to master?
Ross
[-- Attachment #2: Type: text/html, Size: 765 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability
2016-08-09 10:09 ` Burton, Ross
@ 2016-08-09 11:43 ` Tom Hochstein
2016-08-09 13:01 ` Otavio Salvador
2016-08-09 16:06 ` Burton, Ross
0 siblings, 2 replies; 6+ messages in thread
From: Tom Hochstein @ 2016-08-09 11:43 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 883 bytes --]
No, master does not need this fix. The problematic patch 0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch does not exist on master because the underlying issue was addressed upstream (without introducing this bug).
Tom
From: Burton, Ross [mailto:ross.burton@intel.com]
Sent: Tuesday, August 09, 2016 5:10 AM
To: Tom Hochstein <tom.hochstein@nxp.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [OE-core] [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability
On 8 August 2016 at 16:45, Tom Hochstein <tom.hochstein@nxp.com<mailto:tom.hochstein@nxp.com>> wrote:
The most recent patch 0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch
incorrectly removed the configuration constructs that allowed the
package to be configured without OpenGL ES support.
Does this also need to be applied to master?
Ross
[-- Attachment #2: Type: text/html, Size: 3808 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability
2016-08-09 11:43 ` Tom Hochstein
@ 2016-08-09 13:01 ` Otavio Salvador
2016-08-09 16:06 ` Burton, Ross
1 sibling, 0 replies; 6+ messages in thread
From: Otavio Salvador @ 2016-08-09 13:01 UTC (permalink / raw)
To: Tom Hochstein; +Cc: OE-core
On Tue, Aug 9, 2016 at 8:43 AM, Tom Hochstein <tom.hochstein@nxp.com> wrote:
> No, master does not need this fix. The problematic patch
> 0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch does not
> exist on master because the underlying issue was addressed upstream (without
> introducing this bug).
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability
2016-08-09 11:43 ` Tom Hochstein
2016-08-09 13:01 ` Otavio Salvador
@ 2016-08-09 16:06 ` Burton, Ross
1 sibling, 0 replies; 6+ messages in thread
From: Burton, Ross @ 2016-08-09 16:06 UTC (permalink / raw)
To: Tom Hochstein; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 366 bytes --]
On 9 August 2016 at 12:43, Tom Hochstein <tom.hochstein@nxp.com> wrote:
> No, master does not need this fix. The problematic patch
> 0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch does not
> exist on master because the underlying issue was addressed upstream
> (without introducing this bug).
>
>
Thanks for the clarification Tom.
Ross
[-- Attachment #2: Type: text/html, Size: 876 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability
2016-08-08 15:45 [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability Tom Hochstein
2016-08-09 10:09 ` Burton, Ross
@ 2016-08-15 20:56 ` akuster808
1 sibling, 0 replies; 6+ messages in thread
From: akuster808 @ 2016-08-15 20:56 UTC (permalink / raw)
To: openembedded-core
On 08/08/2016 08:45 AM, Tom Hochstein wrote:
> The most recent patch 0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch
> incorrectly removed the configuration constructs that allowed the
> package to be configured without OpenGL ES support.
>
> Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
> ---
> .../mesa-demos/0012-Fix-gles-configurability.patch | 39 ++++++++++++++++++++++
> meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb | 1 +
> 2 files changed, 40 insertions(+)
> create mode 100644 meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch
merged to staging.
Thanks,
Armin
>
> diff --git a/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch b/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch
> new file mode 100644
> index 0000000..0b437a4
> --- /dev/null
> +++ b/meta/recipes-graphics/mesa/mesa-demos/0012-Fix-gles-configurability.patch
> @@ -0,0 +1,39 @@
> +Index: mesa-demos-8.2.0/src/egl/opengles1/Makefile.am
> +===================================================================
> +--- mesa-demos-8.2.0.orig/src/egl/opengles1/Makefile.am 2016-07-29 10:52:50.131729547 -0500
> ++++ mesa-demos-8.2.0/src/egl/opengles1/Makefile.am 2016-07-29 10:59:26.000000000 -0500
> +@@ -36,6 +36,8 @@
> + $(EGL_LIBS) \
> + -lm
> +
> ++if HAVE_EGL
> ++if HAVE_GLESV1
> + bin_PROGRAMS =
> +
> + if HAVE_X11
> +@@ -76,3 +78,5 @@
> + torus_x11_LDADD = ../eglut/libeglut_x11.la
> + tri_x11_LDADD = ../eglut/libeglut_x11.la
> + endif
> ++endif
> ++endif
> +Index: mesa-demos-8.2.0/src/egl/opengles2/Makefile.am
> +===================================================================
> +--- mesa-demos-8.2.0.orig/src/egl/opengles2/Makefile.am 2016-07-29 10:52:50.131729547 -0500
> ++++ mesa-demos-8.2.0/src/egl/opengles2/Makefile.am 2016-07-29 10:59:03.000000000 -0500
> +@@ -33,6 +33,8 @@
> + $(EGL_LIBS) \
> + -lm
> +
> ++if HAVE_EGL
> ++if HAVE_GLESV2
> + bin_PROGRAMS =
> +
> + if HAVE_WAYLAND
> +@@ -53,4 +55,5 @@
> + es2gears_x11_LDADD = ../eglut/libeglut_x11.la
> + es2tri_LDADD = $(X11_LIBS)
> + endif
> +-
> ++endif
> ++endif
> diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
> index 2df9bba..8e12d82 100644
> --- a/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
> +++ b/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb
> @@ -21,6 +21,7 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \
> file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \
> file://0010-sharedtex_mt-fix-rendering-thread-hang.patch \
> file://0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch \
> + file://0012-Fix-gles-configurability.patch \
> "
> SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061"
> SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92"
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-08-15 20:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-08 15:45 [krogoth][PATCH] mesa-demos: Fix OpenGL ES configurability Tom Hochstein
2016-08-09 10:09 ` Burton, Ross
2016-08-09 11:43 ` Tom Hochstein
2016-08-09 13:01 ` Otavio Salvador
2016-08-09 16:06 ` Burton, Ross
2016-08-15 20:56 ` akuster808
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox