weston: upgrade 5.0.0 -> 6.0.0

Message ID 1553904350-30074-1-git-send-email-denis@denix.org
State New
Headers show
Series
  • weston: upgrade 5.0.0 -> 6.0.0
Related show

Commit Message

Denys Dmytriyenko March 30, 2019, 12:05 a.m.
From: Denys Dmytriyenko <denys@ti.com>


Note:
6.0.0 is the last one to support autotools (needs explicit configure option),
newer versions will only support meson.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

---
 meta/recipes-graphics/wayland/{weston_5.0.0.bb => weston_6.0.0.bb} | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/wayland/{weston_5.0.0.bb => weston_6.0.0.bb} (96%)

-- 
2.7.4

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

Comments

Alexander Kanavin March 30, 2019, 11:26 a.m. | #1
On Sat, 30 Mar 2019 at 01:06, Denys Dmytriyenko <denis@denix.org> wrote:
> 6.0.0 is the last one to support autotools (needs explicit configure option),

> newer versions will only support meson.


Thanks, would you be able to prepare the meson conversion patch just
after Warrior is out?

Alex
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton April 1, 2019, 11:13 a.m. | #2
WARNING: weston-6.0.0-r0 do_patch:
Some of the context lines in patches were ignored. This can lead to
incorrectly applied patches.
The context lines in the patches can be updated with devtool:

    devtool modify <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
Applying patch 0001-make-error-portable.patch
patching file configure.ac
Hunk #1 succeeded at 126 with fuzz 2 (offset 17 lines).
patching file libweston/weston-error.h
patching file libweston/weston-launch.c

Now at patch 0001-make-error-portable.patch

Ross

On Sat, 30 Mar 2019 at 00:06, Denys Dmytriyenko <denis@denix.org> wrote:
>

> From: Denys Dmytriyenko <denys@ti.com>

>

> Note:

> 6.0.0 is the last one to support autotools (needs explicit configure option),

> newer versions will only support meson.

>

> Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> ---

>  meta/recipes-graphics/wayland/{weston_5.0.0.bb => weston_6.0.0.bb} | 5 +++--

>  1 file changed, 3 insertions(+), 2 deletions(-)

>  rename meta/recipes-graphics/wayland/{weston_5.0.0.bb => weston_6.0.0.bb} (96%)

>

> diff --git a/meta/recipes-graphics/wayland/weston_5.0.0.bb b/meta/recipes-graphics/wayland/weston_6.0.0.bb

> similarity index 96%

> rename from meta/recipes-graphics/wayland/weston_5.0.0.bb

> rename to meta/recipes-graphics/wayland/weston_6.0.0.bb

> index e517109..fa08dac 100644

> --- a/meta/recipes-graphics/wayland/weston_5.0.0.bb

> +++ b/meta/recipes-graphics/wayland/weston_6.0.0.bb

> @@ -12,8 +12,8 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \

>             file://xwayland.weston-start \

>             file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \

>  "

> -SRC_URI[md5sum] = "752a04ce3c65af4884cfac4e57231bdb"

> -SRC_URI[sha256sum] = "15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf"

> +SRC_URI[md5sum] = "7c634e262f8a464a076c97fd50ad36b3"

> +SRC_URI[sha256sum] = "546323a90607b3bd7f48809ea9d76e64cd09718102f2deca6d95aa59a882e612"

>

>  UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"

>

> @@ -28,6 +28,7 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"

>

>  EXTRA_OECONF = "--enable-setuid-install \

>                  --disable-rdp-compositor \

> +                --enable-autotools \

>                  "

>  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \

>                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \

> --

> 2.7.4

>

> --

> _______________________________________________

> Openembedded-core mailing list

> Openembedded-core@lists.openembedded.org

> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Denys Dmytriyenko April 1, 2019, 7:50 p.m. | #3
Ah, right, v2 is out.

On Mon, Apr 01, 2019 at 11:13:27AM +0000, Burton, Ross wrote:
> WARNING: weston-6.0.0-r0 do_patch:

> Some of the context lines in patches were ignored. This can lead to

> incorrectly applied patches.

> The context lines in the patches can be updated with devtool:

> 

>     devtool modify <recipe>

>     devtool finish --force-patch-refresh <recipe> <layer_path>

> 

> Then the updated patches and the source tree (in devtool's workspace)

> should be reviewed to make sure the patches apply in the correct place

> and don't introduce duplicate lines (which can, and does happen

> when some of the context is ignored). Further information:

> http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html

> https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450

> Details:

> Applying patch 0001-make-error-portable.patch

> patching file configure.ac

> Hunk #1 succeeded at 126 with fuzz 2 (offset 17 lines).

> patching file libweston/weston-error.h

> patching file libweston/weston-launch.c

> 

> Now at patch 0001-make-error-portable.patch

> 

> Ross

> 

> On Sat, 30 Mar 2019 at 00:06, Denys Dmytriyenko <denis@denix.org> wrote:

> >

> > From: Denys Dmytriyenko <denys@ti.com>

> >

> > Note:

> > 6.0.0 is the last one to support autotools (needs explicit configure option),

> > newer versions will only support meson.

> >

> > Signed-off-by: Denys Dmytriyenko <denys@ti.com>

> > ---

> >  meta/recipes-graphics/wayland/{weston_5.0.0.bb => weston_6.0.0.bb} | 5 +++--

> >  1 file changed, 3 insertions(+), 2 deletions(-)

> >  rename meta/recipes-graphics/wayland/{weston_5.0.0.bb => weston_6.0.0.bb} (96%)

> >

> > diff --git a/meta/recipes-graphics/wayland/weston_5.0.0.bb b/meta/recipes-graphics/wayland/weston_6.0.0.bb

> > similarity index 96%

> > rename from meta/recipes-graphics/wayland/weston_5.0.0.bb

> > rename to meta/recipes-graphics/wayland/weston_6.0.0.bb

> > index e517109..fa08dac 100644

> > --- a/meta/recipes-graphics/wayland/weston_5.0.0.bb

> > +++ b/meta/recipes-graphics/wayland/weston_6.0.0.bb

> > @@ -12,8 +12,8 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \

> >             file://xwayland.weston-start \

> >             file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \

> >  "

> > -SRC_URI[md5sum] = "752a04ce3c65af4884cfac4e57231bdb"

> > -SRC_URI[sha256sum] = "15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf"

> > +SRC_URI[md5sum] = "7c634e262f8a464a076c97fd50ad36b3"

> > +SRC_URI[sha256sum] = "546323a90607b3bd7f48809ea9d76e64cd09718102f2deca6d95aa59a882e612"

> >

> >  UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"

> >

> > @@ -28,6 +28,7 @@ WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"

> >

> >  EXTRA_OECONF = "--enable-setuid-install \

> >                  --disable-rdp-compositor \

> > +                --enable-autotools \

> >                  "

> >  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \

> >                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \

> > --

> > 2.7.4

> >

> > --

> > _______________________________________________

> > Openembedded-core mailing list

> > Openembedded-core@lists.openembedded.org

> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

> 

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

Patch

diff --git a/meta/recipes-graphics/wayland/weston_5.0.0.bb b/meta/recipes-graphics/wayland/weston_6.0.0.bb
similarity index 96%
rename from meta/recipes-graphics/wayland/weston_5.0.0.bb
rename to meta/recipes-graphics/wayland/weston_6.0.0.bb
index e517109..fa08dac 100644
--- a/meta/recipes-graphics/wayland/weston_5.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_6.0.0.bb
@@ -12,8 +12,8 @@  SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
            file://xwayland.weston-start \
            file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \
 "
-SRC_URI[md5sum] = "752a04ce3c65af4884cfac4e57231bdb"
-SRC_URI[sha256sum] = "15a23423bcfa45e31e1dedc0cd524ba71e2930df174fde9c99b71a537c4e4caf"
+SRC_URI[md5sum] = "7c634e262f8a464a076c97fd50ad36b3"
+SRC_URI[sha256sum] = "546323a90607b3bd7f48809ea9d76e64cd09718102f2deca6d95aa59a882e612"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
 
@@ -28,6 +28,7 @@  WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
 
 EXTRA_OECONF = "--enable-setuid-install \
                 --disable-rdp-compositor \
+                --enable-autotools \
                 "
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \