[PATCH v2] mesa: upgrade 10.6.3 -> 11.1.1

[PATCH v2] mesa: upgrade 10.6.3 -> 11.1.1

[Nicolas Dechesne]

* update SRC_URI and checksum.
* add PACKAGECONFIG to offer choice of crypto implementation (for sha1 functions)
* use libcrypto by default. In upstream commit a24bdce4, support for
  SHA-1 was copied from xserver repo, so let's use the same default for
  --with-sha1 option that we use in xserver recipe in OE core.

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

Changes in v2:
 * added PACKAGECONFIG to offer choice of crypto implementation
 * Tested openssl on Dragonboard 410c, but build tested other options 
   (and inspected build and configure logs)

 .../mesa/{mesa-gl_10.6.3.bb => mesa-gl_11.1.1.bb}                 | 0
 meta/recipes-graphics/mesa/mesa.inc                               | 8 +++++++-
 meta/recipes-graphics/mesa/{mesa_10.6.3.bb => mesa_11.1.1.bb}     | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/mesa/{mesa-gl_10.6.3.bb => mesa-gl_11.1.1.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_10.6.3.bb => mesa_11.1.1.bb} (66%)

diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb b/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
rename to meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 9b316e1..5ce96dd 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 
 EXTRA_OECONF = "--enable-shared-glapi"
 
-PACKAGECONFIG ??= "egl gles dri \
+PACKAGECONFIG ??= "egl gles dri ${MESA_CRYPTO} \
 		${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
 		${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
 		"
@@ -62,6 +62,12 @@ PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs,
 export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}"
 PACKAGECONFIG[xa]  = "--enable-xa, --disable-xa"
 
+# Mesa requires one of the following crypto implementation, pick one of them
+MESA_CRYPTO ??= "openssl"
+PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl"
+PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle"
+PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt"
+
 # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2)
 FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer"
 
diff --git a/meta/recipes-graphics/mesa/mesa_10.6.3.bb b/meta/recipes-graphics/mesa/mesa_11.1.1.bb
similarity index 66%
rename from meta/recipes-graphics/mesa/mesa_10.6.3.bb
rename to meta/recipes-graphics/mesa/mesa_11.1.1.bb
index 5da56ad..5d73feb 100644
--- a/meta/recipes-graphics/mesa/mesa_10.6.3.bb
+++ b/meta/recipes-graphics/mesa/mesa_11.1.1.bb
@@ -1,9 +1,9 @@
 require ${BPN}.inc
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/10.x/${PV}/mesa-${PV}.tar.xz"
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "553e525d2f20ed48fca8f1ec3176fd83"
-SRC_URI[sha256sum] = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d"
+SRC_URI[md5sum] = "1043dfb907beecb2a761272455960427"
+SRC_URI[sha256sum] = "64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20"
 
 #because we cannot rely on the fact that all apps will use pkgconfig,
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
-- 
2.7.0

Re: [PATCH v2] mesa: upgrade 10.6.3 -> 11.1.1

[Burton, Ross]

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

On 8 February 2016 at 14:59, Nicolas Dechesne <nicolas.dechesne@linaro.org>
wrote:

> * update SRC_URI and checksum.
> * add PACKAGECONFIG to offer choice of crypto implementation (for sha1
> functions)
> * use libcrypto by default. In upstream commit a24bdce4, support for
>   SHA-1 was copied from xserver repo, so let's use the same default for
>   --with-sha1 option that we use in xserver recipe in OE core.
>

Forgot to ask - what real hardware was this tested on, and was anything
like Piglit used to verify it is working properly?

Ross

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

Re: [PATCH v2] mesa: upgrade 10.6.3 -> 11.1.1

[Nicolas Dechesne]

On Tue, Feb 9, 2016 at 11:26 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 8 February 2016 at 14:59, Nicolas Dechesne <nicolas.dechesne@linaro.org>
> wrote:
>>
>> * update SRC_URI and checksum.
>> * add PACKAGECONFIG to offer choice of crypto implementation (for sha1
>> functions)
>> * use libcrypto by default. In upstream commit a24bdce4, support for
>>   SHA-1 was copied from xserver repo, so let's use the same default for
>>   --with-sha1 option that we use in xserver recipe in OE core.
>
>
> Forgot to ask - what real hardware was this tested on, and was anything like
> Piglit used to verify it is working properly?


a couple of dragonboard with QCOM SoC , using freedreno driver. I
tested a few graphics app. I can try piglit if needed, I never did it,
but that's probably the time to get to it..

Re: [PATCH v2] mesa: upgrade 10.6.3 -> 11.1.1

[Martin Jansa]

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

On Tue, Feb 09, 2016 at 10:26:43PM +0000, Burton, Ross wrote:
> On 8 February 2016 at 14:59, Nicolas Dechesne <nicolas.dechesne@linaro.org>
> wrote:
> 
> > * update SRC_URI and checksum.
> > * add PACKAGECONFIG to offer choice of crypto implementation (for sha1
> > functions)
> > * use libcrypto by default. In upstream commit a24bdce4, support for
> >   SHA-1 was copied from xserver repo, so let's use the same default for
> >   --with-sha1 option that we use in xserver recipe in OE core.
> >
> 
> Forgot to ask - what real hardware was this tested on, and was anything
> like Piglit used to verify it is working properly?

It looks like non-x11 builds gained X11 dependency and mesa fails to
build in DISTROs without x11 in DISTRO_FEATURES:

mesa-11.1.1/src/loader/loader_dri3_helper.c:28:27: fatal error:
X11/xshmfence.h: No such file or directory


> 
> Ross

> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH v2] mesa: upgrade 10.6.3 -> 11.1.1

[Richard Purdie]

On Sun, 2016-02-14 at 12:52 +0100, Martin Jansa wrote:
> On Tue, Feb 09, 2016 at 10:26:43PM +0000, Burton, Ross wrote:
> > On 8 February 2016 at 14:59, Nicolas Dechesne <
> > nicolas.dechesne@linaro.org>
> > wrote:
> > 
> > > * update SRC_URI and checksum.
> > > * add PACKAGECONFIG to offer choice of crypto implementation (for
> > > sha1
> > > functions)
> > > * use libcrypto by default. In upstream commit a24bdce4, support
> > > for
> > >   SHA-1 was copied from xserver repo, so let's use the same
> > > default for
> > >   --with-sha1 option that we use in xserver recipe in OE core.
> > > 
> > 
> > Forgot to ask - what real hardware was this tested on, and was
> > anything
> > like Piglit used to verify it is working properly?
> 
> It looks like non-x11 builds gained X11 dependency and mesa fails to
> build in DISTROs without x11 in DISTRO_FEATURES:
> 
> mesa-11.1.1/src/loader/loader_dri3_helper.c:28:27: fatal error:
> X11/xshmfence.h: No such file or directory

I did test this recently:

https://autobuilder.yoctoproject.org/main/builders/nightly-no-x11/build
s/23/steps/BuildImages/logs/stdio

which uses mesa 11.1.1 and didn't see an issue. I therefore suspect
there is a bit more to the exact configuration needed to reproduce
this.

Cheers,

Richard

Re: [PATCH v2] mesa: upgrade 10.6.3 -> 11.1.1

[Burton, Ross]

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

On 14 February 2016 at 11:52, Martin Jansa <martin.jansa@gmail.com> wrote:

> It looks like non-x11 builds gained X11 dependency and mesa fails to
> build in DISTROs without x11 in DISTRO_FEATURES:
>
> mesa-11.1.1/src/loader/loader_dri3_helper.c:28:27: fatal error:
> X11/xshmfence.h: No such file or directory
>

Just had a look at this.  The dri3 packageconfig explicitly depends on
xshmfence and if disabled then --disable-dri3 is passed.  Can you replicate
this, and if so can you share the configure log?

Ross

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

Re: [PATCH v2] mesa: upgrade 10.6.3 -> 11.1.1

[Martin Jansa]

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

I'm sorry it looks like it was caused by bbappend in one of our layers.

We were using this bbappend with older mesa version and it set
PACKAGECONFIG[dri3] to empty, because of unrecognized mesa options in that
version.

On Mon, Feb 15, 2016 at 10:45 PM, Burton, Ross <ross.burton@intel.com>
wrote:

>
> On 14 February 2016 at 11:52, Martin Jansa <martin.jansa@gmail.com> wrote:
>
>> It looks like non-x11 builds gained X11 dependency and mesa fails to
>> build in DISTROs without x11 in DISTRO_FEATURES:
>>
>> mesa-11.1.1/src/loader/loader_dri3_helper.c:28:27: fatal error:
>> X11/xshmfence.h: No such file or directory
>>
>
> Just had a look at this.  The dri3 packageconfig explicitly depends on
> xshmfence and if disabled then --disable-dri3 is passed.  Can you replicate
> this, and if so can you share the configure log?
>
> Ross
>

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

Re: [PATCH v2] mesa: upgrade 10.6.3 -> 11.1.1

[Burton, Ross]

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

On 15 February 2016 at 23:15, Martin Jansa <martin.jansa@gmail.com> wrote:

> I'm sorry it looks like it was caused by bbappend in one of our layers.
>
> We were using this bbappend with older mesa version and it set
> PACKAGECONFIG[dri3] to empty, because of unrecognized mesa options in that
> version.
>

Great, thanks for the update.

Ross

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