From b132da2c95a7660bc7c6b61a982b5e09fdcd4afc Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 23 Jan 2024 18:20:25 +0000 Subject: weston: update bbappend for weston 13 Update the bbappend to match latest YP versions. Bug-AGL: SPEC-5057 Change-Id: Ia123a68b55f2ba7cc2c7f292fcdb4d670f4509e1 Signed-off-by: Jan-Simon Moeller --- .../wayland/weston_12.0.%.bbappend | 1 - .../wayland/weston_12.0_aglcore.inc | 29 ---------------------- .../wayland/weston_13.0.%.bbappend | 1 + .../wayland/weston_13.0_aglcore.inc | 28 +++++++++++++++++++++ 4 files changed, 29 insertions(+), 30 deletions(-) delete mode 100644 meta-agl-core/recipes-graphics/wayland/weston_12.0.%.bbappend delete mode 100644 meta-agl-core/recipes-graphics/wayland/weston_12.0_aglcore.inc create mode 100644 meta-agl-core/recipes-graphics/wayland/weston_13.0.%.bbappend create mode 100644 meta-agl-core/recipes-graphics/wayland/weston_13.0_aglcore.inc diff --git a/meta-agl-core/recipes-graphics/wayland/weston_12.0.%.bbappend b/meta-agl-core/recipes-graphics/wayland/weston_12.0.%.bbappend deleted file mode 100644 index 8d425b3e6..000000000 --- a/meta-agl-core/recipes-graphics/wayland/weston_12.0.%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'weston_12.0_aglcore.inc', '', d)} diff --git a/meta-agl-core/recipes-graphics/wayland/weston_12.0_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston_12.0_aglcore.inc deleted file mode 100644 index fe13f9ea5..000000000 --- a/meta-agl-core/recipes-graphics/wayland/weston_12.0_aglcore.inc +++ /dev/null @@ -1,29 +0,0 @@ -FILESEXTRAPATHS:append := ":${THISDIR}/weston" - -PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', ' remoting', '', d)}" - -SRC_URI:append = "file://0001-libweston-weston-log-Add-a-iterator-helper-for-debug.patch \ - file://0001-toy-toolkit-Fix-rotations.patch \ - file://0001-clients-Handle-missing-pointer_surface-is-there-s-no.patch \ -" - - -# Split weston-terminal out of the main package to allow installing it -# separately for use with other compositors. The icons, etc. that end -# up in /usr/share/weston are also split out into a separate package -# since they are required for weston-terminal and some of the programs -# packaged in weston-examples in addition to ivi-shell in the main -# package. - -PACKAGE_BEFORE_PN += "${PN}-data ${PN}-terminal" - -FILES:${PN}-data = "${datadir}/weston" - -FILES:${PN}-terminal = "${bindir}/weston-terminal" -RDEPENDS:${PN}-terminal += "weston-data liberation-fonts" - -RDEPENDS:${PN}-examples += "weston-data" - -FILES:${PN}:remove = "weston-terminal" -RDEPENDS:${PN}:remove = "liberation-fonts" -RDEPENDS:${PN} += "weston-data weston-terminal" diff --git a/meta-agl-core/recipes-graphics/wayland/weston_13.0.%.bbappend b/meta-agl-core/recipes-graphics/wayland/weston_13.0.%.bbappend new file mode 100644 index 000000000..87cad12a0 --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston_13.0.%.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('AGL_FEATURES', 'aglcore', 'weston_13.0_aglcore.inc', '', d)} diff --git a/meta-agl-core/recipes-graphics/wayland/weston_13.0_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston_13.0_aglcore.inc new file mode 100644 index 000000000..14387898e --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston_13.0_aglcore.inc @@ -0,0 +1,28 @@ +FILESEXTRAPATHS:append := ":${THISDIR}/weston" + +PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', ' remoting', '', d)}" + +SRC_URI:append = " \ + file://0001-clients-Handle-missing-pointer_surface-is-there-s-no.patch \ +" + + +# Split weston-terminal out of the main package to allow installing it +# separately for use with other compositors. The icons, etc. that end +# up in /usr/share/weston are also split out into a separate package +# since they are required for weston-terminal and some of the programs +# packaged in weston-examples in addition to ivi-shell in the main +# package. + +PACKAGE_BEFORE_PN += "${PN}-data ${PN}-terminal" + +FILES:${PN}-data = "${datadir}/weston" + +FILES:${PN}-terminal = "${bindir}/weston-terminal" +RDEPENDS:${PN}-terminal += "weston-data liberation-fonts" + +RDEPENDS:${PN}-examples += "weston-data" + +FILES:${PN}:remove = "weston-terminal" +RDEPENDS:${PN}:remove = "liberation-fonts" +RDEPENDS:${PN} += "weston-data weston-terminal" -- cgit 1.2.3-korg