[krogoth] mesa-demos: Fix OpenGL ES configurability

Submitted by Tom Hochstein on Aug. 8, 2016, 3:45 p.m. | Patch ID: 128755

Details

Message ID 1470671116-1997-1-git-send-email-tom.hochstein@nxp.com
State New
Headers show

Commit Message

Tom Hochstein Aug. 8, 2016, 3:45 p.m.
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

Patch hide | download patch | download mbox

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"

Comments

Ross Burton Aug. 9, 2016, 10:09 a.m.
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
Tom Hochstein Aug. 9, 2016, 11:43 a.m.
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
Otavio Salvador Aug. 9, 2016, 1:01 p.m.
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>
Ross Burton Aug. 9, 2016, 4:06 p.m.
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
Armin Kuster Aug. 15, 2016, 8:56 p.m.
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"
>