[PATCH v2 1/2] mesa: Avoid platform probing when building without EGL

[PATCH v2 1/2] mesa: Avoid platform probing when building without EGL

[Otavio Salvador]

The 17.1.2 release has changed the platform setting and when not
explicitly disabled it assumes x11 support.

Fixes:

| checking for x11-xcb xcb xcb-dri2 >= 1.8 xcb-xfixes... no
| configure: error: Package requirements (x11-xcb xcb xcb-dri2 >= 1.8 xcb-xfixes) were not met:
|
| No package 'x11-xcb' found
| No package 'xcb' found
| No package 'xcb-dri2' found
| No package 'xcb-xfixes' found
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
|
| Alternatively, you may set the environment variables XCB_DRI2_CFLAGS
| and XCB_DRI2_LIBS to avoid the need to call pkg-config.
| See the pkg-config man page for more details.

The issue has been exposed by meta-freescale BSP. Fix tested with
imx6qsabresd machine.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v2:
- new patch

 meta/recipes-graphics/mesa/mesa.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 41747cffc8..a12ab7ab5b 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -49,7 +49,7 @@ PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-
 EGL_PLATFORMS  = "drm"
 EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}"
 EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}"
-PACKAGECONFIG[egl] = "--enable-egl --with-platforms=${EGL_PLATFORMS}, --disable-egl"
+PACKAGECONFIG[egl] = "--enable-egl --with-platforms=${EGL_PLATFORMS}, --disable-egl --with-platforms=''"
 
 PACKAGECONFIG[etnaviv] = ""
 PACKAGECONFIG[imx] = ""
-- 
2.13.2

[PATCH v2 2/2] mesa: Upgrade to 17.1.4 release

[Otavio Salvador]

This includes following upstream bug fixes:

Bug 77240 - khrplatform.h not installed if EGL is disabled
Bug 95530 - Stellaris - colored overlay of sectors doesn't render on i965
Bug 96958 - [SKL] Improper rendering in Europa Universalis IV
Bug 99467 - [radv] DOOM 2016 + wine. Green screen everywhere (but can be started)
Bug 101071 - compiling glsl fails with undefined reference to `pthread_create'
Bug 101252 - eglGetDisplay() is not thread safe
Bug 101294 - radeonsi minecraft forge splash freeze since 17.1
Bug 101451 - [G33] ES2-CTS.functional.clipping.polygon regression

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v2: None

 meta/recipes-graphics/mesa/{mesa-gl_17.1.3.bb => mesa-gl_17.1.4.bb} | 0
 meta/recipes-graphics/mesa/{mesa_17.1.3.bb => mesa_17.1.4.bb}       | 4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_17.1.3.bb => mesa-gl_17.1.4.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_17.1.3.bb => mesa_17.1.4.bb} (84%)

diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb b/meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb
rename to meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb
diff --git a/meta/recipes-graphics/mesa/mesa_17.1.3.bb b/meta/recipes-graphics/mesa/mesa_17.1.4.bb
similarity index 84%
rename from meta/recipes-graphics/mesa/mesa_17.1.3.bb
rename to meta/recipes-graphics/mesa/mesa_17.1.4.bb
index d9860213f2..2a1ecd3124 100644
--- a/meta/recipes-graphics/mesa/mesa_17.1.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.1.4.bb
@@ -7,8 +7,8 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0002-hardware-gloat.patch \
 "
 
-SRC_URI[md5sum] = "1946a93d543bc219427e2bebe2ac4752"
-SRC_URI[sha256sum] = "5f1ee9a8aea2880f887884df2dea0c16dd1b13eb42fd2e52265db0dc1b380e8c"
+SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5"
+SRC_URI[sha256sum] = "06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad"
 
 #because we cannot rely on the fact that all apps will use pkgconfig,
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
-- 
2.13.2

Re: [PATCH v2 1/2] mesa: Avoid platform probing when building without EGL

[Nicolas Dechesne]

On Mon, Jul 3, 2017 at 10:02 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> The issue has been exposed by meta-freescale BSP. Fix tested with
> imx6qsabresd machine.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

this looks correct to me, and this is due to this upstream commit:
1d89787a19 configure: loosen --with-platforms heuristics

Reviewed-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>

Re: [PATCH v2 1/2] mesa: Avoid platform probing when building without EGL

[Andrea Galbusera]

[-- Attachment #1: Type: text/plain, Size: 3285 bytes --]

Hi!

On Mon, Jul 3, 2017 at 10:02 PM, Otavio Salvador <otavio@ossystems.com.br>
wrote:

> The 17.1.2 release has changed the platform setting and when not
> explicitly disabled it assumes x11 support.
>
> Fixes:
>
> | checking for x11-xcb xcb xcb-dri2 >= 1.8 xcb-xfixes... no
> | configure: error: Package requirements (x11-xcb xcb xcb-dri2 >= 1.8
> xcb-xfixes) were not met:
> |
> | No package 'x11-xcb' found
> | No package 'xcb' found
> | No package 'xcb-dri2' found
> | No package 'xcb-xfixes' found
> |
> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
> | installed software in a non-standard prefix.
> |
> | Alternatively, you may set the environment variables XCB_DRI2_CFLAGS
> | and XCB_DRI2_LIBS to avoid the need to call pkg-config.
> | See the pkg-config man page for more details.
>
> The issue has been exposed by meta-freescale BSP. Fix tested with
> imx6qsabresd machine.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>
> Changes in v2:
> - new patch
>
>  meta/recipes-graphics/mesa/mesa.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa.inc
> b/meta/recipes-graphics/mesa/mesa.inc
> index 41747cffc8..a12ab7ab5b 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -49,7 +49,7 @@ PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2,
> --disable-gles1 --disable-
>  EGL_PLATFORMS  = "drm"
>  EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11',
> '', d)}"
>  EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland',
> ',wayland', '', d)}"
> -PACKAGECONFIG[egl] = "--enable-egl --with-platforms=${EGL_PLATFORMS},
> --disable-egl"
> +PACKAGECONFIG[egl] = "--enable-egl --with-platforms=${EGL_PLATFORMS},
> --disable-egl --with-platforms=''"
>
>  PACKAGECONFIG[etnaviv] = ""
>  PACKAGECONFIG[imx] = ""
> --
> 2.13.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>


After merging this patch (as per current poky master), builds for
MACHINE=raspberrypi3 with meta-raspberrypi fail complaining like this:

| checking for x11 xext xdamage >= 1.1 xfixes x11-xcb xcb xcb-glx >= 1.8.1
xcb-dri2 >= 1.8 xxf86vm... yes
| checking for wayland-scanner... no
| configure: error: Building without the x11 platform as GLX is enabled, is
not supported
| NOTE: The following config.log files may provide further information.
| NOTE:
/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/mesa-gl/2_17.1.4-r0/build/config.log
| ERROR: configure failed
| WARNING: exit code 1 from a shell command.
| ERROR: Function failed: do_configure (log file is located at
/home/gizero/work/smartliving/distro/repo-master/build-poky/tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/mesa-gl/2_17.
1.4-r0/temp/log.do_configure.11176)

I know very little about graphical stacks since I use these systems mostly
headless. Can anyone have a look into it? BTW, without this only commit,
the build runs to the end with no other errors.

[-- Attachment #2: Type: text/html, Size: 4745 bytes --]

Re: [PATCH v2 1/2] mesa: Avoid platform probing when building without EGL

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 4128 bytes --]

On 8 July 2017 at 18:34, Andrea Galbusera <gizero@gmail.com> wrote:

> Hi!
>
> On Mon, Jul 3, 2017 at 10:02 PM, Otavio Salvador <otavio@ossystems.com.br>
> wrote:
>
>> The 17.1.2 release has changed the platform setting and when not
>> explicitly disabled it assumes x11 support.
>>
>> Fixes:
>>
>> | checking for x11-xcb xcb xcb-dri2 >= 1.8 xcb-xfixes... no
>> | configure: error: Package requirements (x11-xcb xcb xcb-dri2 >= 1.8
>> xcb-xfixes) were not met:
>> |
>> | No package 'x11-xcb' found
>> | No package 'xcb' found
>> | No package 'xcb-dri2' found
>> | No package 'xcb-xfixes' found
>> |
>> | Consider adjusting the PKG_CONFIG_PATH environment variable if you
>> | installed software in a non-standard prefix.
>> |
>> | Alternatively, you may set the environment variables XCB_DRI2_CFLAGS
>> | and XCB_DRI2_LIBS to avoid the need to call pkg-config.
>> | See the pkg-config man page for more details.
>>
>> The issue has been exposed by meta-freescale BSP. Fix tested with
>> imx6qsabresd machine.
>>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>
>> Changes in v2:
>> - new patch
>>
>>  meta/recipes-graphics/mesa/mesa.inc | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-graphics/mesa/mesa.inc
>> b/meta/recipes-graphics/mesa/mesa.inc
>> index 41747cffc8..a12ab7ab5b 100644
>> --- a/meta/recipes-graphics/mesa/mesa.inc
>> +++ b/meta/recipes-graphics/mesa/mesa.inc
>> @@ -49,7 +49,7 @@ PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2,
>> --disable-gles1 --disable-
>>  EGL_PLATFORMS  = "drm"
>>  EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11',
>> '', d)}"
>>  EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland',
>> ',wayland', '', d)}"
>> -PACKAGECONFIG[egl] = "--enable-egl --with-platforms=${EGL_PLATFORMS},
>> --disable-egl"
>> +PACKAGECONFIG[egl] = "--enable-egl --with-platforms=${EGL_PLATFORMS},
>> --disable-egl --with-platforms=''"
>>
>>  PACKAGECONFIG[etnaviv] = ""
>>  PACKAGECONFIG[imx] = ""
>> --
>> 2.13.2
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>
>
> After merging this patch (as per current poky master), builds for
> MACHINE=raspberrypi3 with meta-raspberrypi fail complaining like this:
>
> | checking for x11 xext xdamage >= 1.1 xfixes x11-xcb xcb xcb-glx >= 1.8.1
> xcb-dri2 >= 1.8 xxf86vm... yes
> | checking for wayland-scanner... no
> | configure: error: Building without the x11 platform as GLX is enabled,
> is not supported
> | NOTE: The following config.log files may provide further information.
> | NOTE: /home/gizero/work/smartliving/distro/repo-master/build-poky/
> tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/mesa-
> gl/2_17.1.4-r0/build/config.log
> | ERROR: configure failed
> | WARNING: exit code 1 from a shell command.
> | ERROR: Function failed: do_configure (log file is located at
> /home/gizero/work/smartliving/distro/repo-master/build-poky/
> tmp/work/cortexa7hf-neon-vfpv4-poky-linux-gnueabi/mesa-gl/2_17.
> 1.4-r0/temp/log.do_configure.11176)
>
> I know very little about graphical stacks since I use these systems mostly
> headless. Can anyone have a look into it? BTW, without this only commit,
> the build runs to the end with no other errors.
>

I think --enable-egl and --with-platforms should not be behind a single
packageconfig. Like the upstream commit says "Platform selection does not
depend on EGL".

Possibly something like

---
PLATFORMS ?= "surfaceless \
                            ${@bb.utils.contains('PACKAGECONFIG', 'gbm',
',drm', '', d)} \
                            ${@bb.utils.filter('PACKAGECONFIG', 'x11
wayland', d)} \
"
EXTRA_OECONF = "--with-platforms=${PLATFORMS} ..."
---

This should end up with a reasonable set by default and would allow e.g.
meta-raspberrypi to override the variable if needed (I don't think they
would need to but they could).

[-- Attachment #2: Type: text/html, Size: 6232 bytes --]

Re: [PATCH v2 2/2] mesa: Upgrade to 17.1.4 release

[Jussi Kukkonen]

[-- Attachment #1: Type: text/plain, Size: 2896 bytes --]

On 3 July 2017 at 23:02, Otavio Salvador <otavio@ossystems.com.br> wrote:

> This includes following upstream bug fixes:
>
> Bug 77240 - khrplatform.h not installed if EGL is disabled
>

Saying this here as well for visibility:

This conflicts with userland from meta-raspberrypi  because both mesa-gl
and userland now have khrplatform.h

Since mesa-gl provides no GLES or EGL, it shouldn't really need to ship
khrplatform.h.

Jussi


> Bug 95530 - Stellaris - colored overlay of sectors doesn't render on i965
> Bug 96958 - [SKL] Improper rendering in Europa Universalis IV
> Bug 99467 - [radv] DOOM 2016 + wine. Green screen everywhere (but can be
> started)
> Bug 101071 - compiling glsl fails with undefined reference to
> `pthread_create'
> Bug 101252 - eglGetDisplay() is not thread safe
> Bug 101294 - radeonsi minecraft forge splash freeze since 17.1
> Bug 101451 - [G33] ES2-CTS.functional.clipping.polygon regression
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>
> Changes in v2: None
>
>  meta/recipes-graphics/mesa/{mesa-gl_17.1.3.bb => mesa-gl_17.1.4.bb} | 0
>  meta/recipes-graphics/mesa/{mesa_17.1.3.bb => mesa_17.1.4.bb}       | 4
> ++--
>  2 files changed, 2 insertions(+), 2 deletions(-)
>  rename meta/recipes-graphics/mesa/{mesa-gl_17.1.3.bb => mesa-gl_17.1.4.bb}
> (100%)
>  rename meta/recipes-graphics/mesa/{mesa_17.1.3.bb => mesa_17.1.4.bb}
> (84%)
>
> diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb
> b/meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa-gl_17.1.3.bb
> rename to meta/recipes-graphics/mesa/mesa-gl_17.1.4.bb
> diff --git a/meta/recipes-graphics/mesa/mesa_17.1.3.bb
> b/meta/recipes-graphics/mesa/mesa_17.1.4.bb
> similarity index 84%
> rename from meta/recipes-graphics/mesa/mesa_17.1.3.bb
> rename to meta/recipes-graphics/mesa/mesa_17.1.4.bb
> index d9860213f2..2a1ecd3124 100644
> --- a/meta/recipes-graphics/mesa/mesa_17.1.3.bb
> +++ b/meta/recipes-graphics/mesa/mesa_17.1.4.bb
> @@ -7,8 +7,8 @@ SRC_URI = "https://mesa.freedesktop.org/
> archive/mesa-${PV}.tar.xz \
>             file://0002-hardware-gloat.patch \
>  "
>
> -SRC_URI[md5sum] = "1946a93d543bc219427e2bebe2ac4752"
> -SRC_URI[sha256sum] = "5f1ee9a8aea2880f887884df2dea0c
> 16dd1b13eb42fd2e52265db0dc1b380e8c"
> +SRC_URI[md5sum] = "be2ef7c9edec23b07f74f6512a6a6fa5"
> +SRC_URI[sha256sum] = "06f3b0e6a28f0d20b7f3391cf67fe8
> 9ae98ecd0a686cd545da76557b6cec9cad"
>
>  #because we cannot rely on the fact that all apps will use pkgconfig,
>  #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
> --
> 2.13.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 5379 bytes --]

Re: [PATCH v2 2/2] mesa: Upgrade to 17.1.4 release

[Otavio Salvador]

On Tue, Jul 11, 2017 at 6:00 AM, Jussi Kukkonen
<jussi.kukkonen@intel.com> wrote:
> On 3 July 2017 at 23:02, Otavio Salvador <otavio@ossystems.com.br> wrote:
>>
>> This includes following upstream bug fixes:
>>
>> Bug 77240 - khrplatform.h not installed if EGL is disabled
>
>
> Saying this here as well for visibility:
>
> This conflicts with userland from meta-raspberrypi  because both mesa-gl and
> userland now have khrplatform.h
>
> Since mesa-gl provides no GLES or EGL, it shouldn't really need to ship
> khrplatform.h.

I am not sure I follow you, could you explain it more? or if possible,
send a patch and add me on Cc so we can discuss it.


-- 
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