[v2] mesa: Upgrade to 17.2.1 release

Submitted by Otavio Salvador on Sept. 21, 2017, 2:08 p.m. | Patch ID: 144398

Details

Message ID 20170921140819.21292-1-otavio@ossystems.com.br
State Master Next
Commit f537fea5aeb88eaf7d4f8ab159631e39c179946d
Headers show

Commit Message

Otavio Salvador Sept. 21, 2017, 2:08 p.m.
Upgrade to a new stable release and drop patches applied on upstream.

For a full release notes, please see:
https://mesa3d.org/relnotes/17.2.0.html
https://mesa3d.org/relnotes/17.2.1.html

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

Changes in v2:
 - update to 17.2.1

 ...1-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch | 40 ------------------
 ...allivm-Fix-build-against-LLVM-SVN-r302589.patch | 49 ----------------------
 .../mesa/{mesa-gl_17.1.7.bb => mesa-gl_17.2.1.bb}  |  0
 .../mesa/{mesa_17.1.7.bb => mesa_17.2.1.bb}        |  7 ++--
 4 files changed, 3 insertions(+), 93 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch
 delete mode 100644 meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch
 rename meta/recipes-graphics/mesa/{mesa-gl_17.1.7.bb => mesa-gl_17.2.1.bb} (100%)
 rename meta/recipes-graphics/mesa/{mesa_17.1.7.bb => mesa_17.2.1.bb} (77%)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch b/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch
deleted file mode 100644
index b27a3bc8e4..0000000000
--- a/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch
+++ /dev/null
@@ -1,40 +0,0 @@ 
-From 9861437e58fdd0de01193a102608d34e5952953f Mon Sep 17 00:00:00 2001
-From: Christoph Haag <haagch+mesadev@frickel.club>
-Date: Thu, 20 Apr 2017 10:34:18 +0200
-Subject: [PATCH 1/2] ac: fix build after LLVM 5.0 SVN r300718
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-v2: previously getWithDereferenceableBytes() exists, but addAttr() doesn't take that type
-
-Signed-off-by: Christoph Haag <haagch+mesadev@frickel.club>
-Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
-Tested-and-reviewed-by: Mike Lothian <mike@fireburn.co.uk>
----
-Upstream-Status: Backport
-
- src/amd/common/ac_llvm_helper.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/amd/common/ac_llvm_helper.cpp b/src/amd/common/ac_llvm_helper.cpp
-index d9ea4b1..11fa809 100644
---- a/src/amd/common/ac_llvm_helper.cpp
-+++ b/src/amd/common/ac_llvm_helper.cpp
-@@ -44,9 +44,13 @@ typedef AttributeSet AttributeList;
- void ac_add_attr_dereferenceable(LLVMValueRef val, uint64_t bytes)
- {
-    llvm::Argument *A = llvm::unwrap<llvm::Argument>(val);
-+#if HAVE_LLVM < 0x0500
-    llvm::AttrBuilder B;
-    B.addDereferenceableAttr(bytes);
-    A->addAttr(llvm::AttributeList::get(A->getContext(), A->getArgNo() + 1,  B));
-+#else
-+   A->addAttr(llvm::Attribute::getWithDereferenceableBytes(A->getContext(), bytes));
-+#endif
- }
- 
- bool ac_is_sgpr_param(LLVMValueRef arg)
--- 
-2.13.3
-
diff --git a/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch b/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch
deleted file mode 100644
index ac8caec74d..0000000000
--- a/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch
+++ /dev/null
@@ -1,49 +0,0 @@ 
-From a02a0dfda2712d30ad62b8f0421ec7b8244ba2cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
-Date: Wed, 10 May 2017 17:26:07 +0900
-Subject: [PATCH 2/2] gallivm: Fix build against LLVM SVN >= r302589
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-deregisterEHFrames doesn't take any parameters anymore.
-
-Reviewed-by: Vedran Miletić <vedran@miletic.net>
-Reviewed-by: Marek Olšák <marek.olsak@amd.com>
----
-Upstream-Status: Backport
-
- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 2a388cb..0e4a531 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -342,14 +342,20 @@ class DelegatingJITMemoryManager : public BaseMemoryManager {
-       virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
-          mgr()->registerEHFrames(Addr, LoadAddr, Size);
-       }
--      virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
--         mgr()->deregisterEHFrames(Addr, LoadAddr, Size);
--      }
- #else
-       virtual void registerEHFrames(llvm::StringRef SectionData) {
-          mgr()->registerEHFrames(SectionData);
-       }
- #endif
-+#if HAVE_LLVM >= 0x0500
-+      virtual void deregisterEHFrames() {
-+         mgr()->deregisterEHFrames();
-+      }
-+#elif HAVE_LLVM >= 0x0304
-+      virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
-+         mgr()->deregisterEHFrames(Addr, LoadAddr, Size);
-+      }
-+#endif
-       virtual void *getPointerToNamedFunction(const std::string &Name,
-                                               bool AbortOnFailure=true) {
-          return mgr()->getPointerToNamedFunction(Name, AbortOnFailure);
--- 
-2.13.3
-
diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb b/meta/recipes-graphics/mesa/mesa-gl_17.2.1.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb
rename to meta/recipes-graphics/mesa/mesa-gl_17.2.1.bb
diff --git a/meta/recipes-graphics/mesa/mesa_17.1.7.bb b/meta/recipes-graphics/mesa/mesa_17.2.1.bb
similarity index 77%
rename from meta/recipes-graphics/mesa/mesa_17.1.7.bb
rename to meta/recipes-graphics/mesa/mesa_17.2.1.bb
index a50f32c025..59c40b1371 100644
--- a/meta/recipes-graphics/mesa/mesa_17.1.7.bb
+++ b/meta/recipes-graphics/mesa/mesa_17.2.1.bb
@@ -7,13 +7,12 @@  SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
            file://0002-hardware-gloat.patch \
            file://vulkan-mkdir.patch \
            file://llvm-config-version.patch \
-           file://0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch \
-           file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \
            file://0001-winsys-svga-drm-Include-sys-types.h.patch \
            file://0001-configure.ac-Always-check-for-expat.patch \
            "
-SRC_URI[md5sum] = "e40bb428a263bd28cbf6478dae45b207"
-SRC_URI[sha256sum] = "69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5"
+
+SRC_URI[md5sum] = "f53ed38110237d9df5f9198c09ef0ab0"
+SRC_URI[sha256sum] = "77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e"
 
 #because we cannot rely on the fact that all apps will use pkgconfig,
 #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER

Comments

Richard Purdie Sept. 21, 2017, 10:34 p.m.
On Thu, 2017-09-21 at 11:08 -0300, Otavio Salvador wrote:
> Upgrade to a new stable release and drop patches applied on upstream.
> 
> For a full release notes, please see:
> https://mesa3d.org/relnotes/17.2.0.html
> https://mesa3d.org/relnotes/17.2.1.html
> 
> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
> 
> Changes in v2:
>  - update to 17.2.1

The trouble is this isn't just a "stable release", I didn't check the
patch fully enough initially but now I see this was a 17.1.X -> 17.2.X
change.

When I tried building it locally I get:

| 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... /media/build1/poky/build/tmp/work/core2-64-poky-linux/mesa/2_17.2.1-r0/recipe-sysroot-native/usr/bin/wayland-scanner
| checking for wayland-client >= 1.11 wayland-server >= 1.11... yes
| configure: error: wayland-protocols >= 1.8 is needed to compile the wayland platform
| NOTE: The following config.log files may provide further information.

and basically I just wiped out a round of autobuilder testing of a
larger patchset due to this.

If people want us to be more flexible about taking "point version"
changes later into the release cycle, we really need to start getting
better about how these things get tested and how we refer to them in
the commit messages.

[and yes, the fix is trivial and included below, that isn't really the
point though]

Cheers,

Richard

Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Otavio Salvador Sept. 22, 2017, 12:43 a.m.
Hello Richard,

On Thu, Sep 21, 2017 at 7:34 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Thu, 2017-09-21 at 11:08 -0300, Otavio Salvador wrote:
>> Upgrade to a new stable release and drop patches applied on upstream.
>>
>> For a full release notes, please see:
>> https://mesa3d.org/relnotes/17.2.0.html
>> https://mesa3d.org/relnotes/17.2.1.html
>>
>> Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> ---
>>
>> Changes in v2:
>>  - update to 17.2.1
>
> The trouble is this isn't just a "stable release", I didn't check the
> patch fully enough initially but now I see this was a 17.1.X -> 17.2.X
> change.

The commit log mentions the two release notes. The 17.1 is at 17.1.9
release but should not receive more fixes. It is advised to move to
17.2.1 as it is the current release but it is up to you if we will
take this one or 17.1.9.

> When I tried building it locally I get:
>
> | 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... /media/build1/poky/build/tmp/work/core2-64-poky-linux/mesa/2_17.2.1-r0/recipe-sysroot-native/usr/bin/wayland-scanner
> | checking for wayland-client >= 1.11 wayland-server >= 1.11... yes
> | configure: error: wayland-protocols >= 1.8 is needed to compile the wayland platform
> | NOTE: The following config.log files may provide further information.
>
> and basically I just wiped out a round of autobuilder testing of a
> larger patchset due to this.

That's the reason for autobuilder, right? I do not spawn all
configurations here as I don't own such build monster ...

> If people want us to be more flexible about taking "point version"
> changes later into the release cycle, we really need to start getting
> better about how these things get tested and how we refer to them in
> the commit messages.

See the commit log above. You are frustrated, and I get that, but
commit log mentions BOTH!

> [and yes, the fix is trivial and included below, that isn't really the
> point though]

Do you want a v3? or a 17.1.9? Let me know what I can help.
Richard Purdie Sept. 22, 2017, 6:43 a.m.
On Thu, 2017-09-21 at 21:43 -0300, Otavio Salvador wrote:
> Hello Richard,
> 
> On Thu, Sep 21, 2017 at 7:34 PM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > 
> > On Thu, 2017-09-21 at 11:08 -0300, Otavio Salvador wrote:
> > > 
> > > Upgrade to a new stable release and drop patches applied on
> > > upstream.
> > > 
> > > For a full release notes, please see:
> > > https://mesa3d.org/relnotes/17.2.0.html
> > > https://mesa3d.org/relnotes/17.2.1.html
> > > 
> > > Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
> > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> > > ---
> > > 
> > > Changes in v2:
> > >  - update to 17.2.1
> > The trouble is this isn't just a "stable release", I didn't check
> > the
> > patch fully enough initially but now I see this was a 17.1.X ->
> > 17.2.X
> > change.
> The commit log mentions the two release notes. The 17.1 is at 17.1.9
> release but should not receive more fixes. It is advised to move to
> 17.2.1 as it is the current release but it is up to you if we will
> take this one or 17.1.9.

Its not clear from the commit message that we're on 17.1.7, that 17.1.9
(and maybe .8?) exist and that in going to 17.2.X, we're actually
changing stable series. Release notes for 17.1.X are not mentioned.

Every upstream out there will advise moving to their latest version but
that doesn't mean it will work. In fact here it doesn't.

> > When I tried building it locally I get:
> > 
> > > 
> > > 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...
> > > /media/build1/poky/build/tmp/work/core2-64-poky-
> > > linux/mesa/2_17.2.1-r0/recipe-sysroot-native/usr/bin/wayland-
> > > scanner
> > > checking for wayland-client >= 1.11 wayland-server >= 1.11... yes
> > > configure: error: wayland-protocols >= 1.8 is needed to compile
> > > the wayland platform
> > > NOTE: The following config.log files may provide further
> > > information.
> > and basically I just wiped out a round of autobuilder testing of a
> > larger patchset due to this.
> That's the reason for autobuilder, right? I do not spawn all
> configurations here as I don't own such build monster ...

The autobuilder is a last final sanity check so we can test the
proposed changes, Ross and I are not here just to queue and test and
report back on people's patches.

In this case *any* poky build of mesa is failing. That is likely
because poky has wayland in distro features and your local
configuration does not.

> > If people want us to be more flexible about taking "point version"
> > changes later into the release cycle, we really need to start
> > getting
> > better about how these things get tested and how we refer to them
> > in
> > the commit messages.
> See the commit log above. You are frustrated, and I get that, but
> commit log mentions BOTH!

The commit message implies we're upgrading along a stable release path.
Now, I agree had I thought more carefully I'd have realised that to
mention release notes of a .0, we must not be. You do call it a stable
update though and it really isn't.

> > [and yes, the fix is trivial and included below, that isn't really
> > the
> > point though]
> Do you want a v3? or a 17.1.9? Let me know what I can help.

I left it building locally overnight and the first fix I mentioned
isn't enough, it eventually fails with:

| make[4]: *** No rule to make target '/usr/share/wayland-protocols/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml', needed by 'drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h'.  Stop.

so a v3 would need to figure out and fix that. Who knows what else
might then fail. I suspect we might have more success with 17.1.9 but
it sounds like I'll be the one who you want to test this...

Cheers,

Richard
Otavio Salvador Sept. 22, 2017, 1:30 p.m.
Hello Richard,

On Fri, Sep 22, 2017 at 3:43 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Thu, 2017-09-21 at 21:43 -0300, Otavio Salvador wrote:
>> On Thu, Sep 21, 2017 at 7:34 PM, Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>> >
>> > On Thu, 2017-09-21 at 11:08 -0300, Otavio Salvador wrote:
>> > >
>> > > Upgrade to a new stable release and drop patches applied on
>> > > upstream.
>> > >
>> > > For a full release notes, please see:
>> > > https://mesa3d.org/relnotes/17.2.0.html
>> > > https://mesa3d.org/relnotes/17.2.1.html
>> > >
>> > > Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
>> > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>> > > ---
>> > >
>> > > Changes in v2:
>> > >  - update to 17.2.1
>> > The trouble is this isn't just a "stable release", I didn't check
>> > the
>> > patch fully enough initially but now I see this was a 17.1.X ->
>> > 17.2.X
>> > change.
>> The commit log mentions the two release notes. The 17.1 is at 17.1.9
>> release but should not receive more fixes. It is advised to move to
>> 17.2.1 as it is the current release but it is up to you if we will
>> take this one or 17.1.9.
>
> Its not clear from the commit message that we're on 17.1.7, that 17.1.9
> (and maybe .8?) exist and that in going to 17.2.X, we're actually
> changing stable series. Release notes for 17.1.X are not mentioned.

17.2.0 implies it is a major release, does not?

...
>> That's the reason for autobuilder, right? I do not spawn all
>> configurations here as I don't own such build monster ...
>
> The autobuilder is a last final sanity check so we can test the
> proposed changes, Ross and I are not here just to queue and test and
> report back on people's patches.
>
> In this case *any* poky build of mesa is failing. That is likely
> because poky has wayland in distro features and your local
> configuration does not.

Possibly.

In fact I was testing for an i.MX machine and as it mangles the
PACKAGECONFIG the test was not showing your error, even with wayland
enabled.

>> > If people want us to be more flexible about taking "point version"
>> > changes later into the release cycle, we really need to start
>> > getting
>> > better about how these things get tested and how we refer to them
>> > in
>> > the commit messages.
>> See the commit log above. You are frustrated, and I get that, but
>> commit log mentions BOTH!
>
> The commit message implies we're upgrading along a stable release path.
> Now, I agree had I thought more carefully I'd have realised that to
> mention release notes of a .0, we must not be. You do call it a stable
> update though and it really isn't.
>
>> > [and yes, the fix is trivial and included below, that isn't really
>> > the
>> > point though]
>> Do you want a v3? or a 17.1.9? Let me know what I can help.
>
> I left it building locally overnight and the first fix I mentioned
> isn't enough, it eventually fails with:
>
> | make[4]: *** No rule to make target '/usr/share/wayland-protocols/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml', needed by 'drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h'.  Stop.
>
> so a v3 would need to figure out and fix that. Who knows what else
> might then fail. I suspect we might have more success with 17.1.9 but
> it sounds like I'll be the one who you want to test this...

I am preparing a v3 and testing with wayland and x11 enabled. Once it
works fine I send it out.