diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-graphics/wayland | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/wayland')
-rw-r--r-- | meta/recipes-graphics/wayland/libinput_1.18.0.bb | 10 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/wayland-protocols_1.21.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/wayland_1.19.0.bb | 12 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston-init.bb | 24 | ||||
-rw-r--r-- | meta/recipes-graphics/wayland/weston_9.0.0.bb | 26 |
5 files changed, 37 insertions, 37 deletions
diff --git a/meta/recipes-graphics/wayland/libinput_1.18.0.bb b/meta/recipes-graphics/wayland/libinput_1.18.0.bb index e46071c67b..9d1ac811aa 100644 --- a/meta/recipes-graphics/wayland/libinput_1.18.0.bb +++ b/meta/recipes-graphics/wayland/libinput_1.18.0.bb | |||
@@ -23,7 +23,7 @@ UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | |||
23 | inherit meson pkgconfig lib_package ptest | 23 | inherit meson pkgconfig lib_package ptest |
24 | 24 | ||
25 | # Patch out build directory, otherwise it leaks into ptest binary | 25 | # Patch out build directory, otherwise it leaks into ptest binary |
26 | do_configure_append() { | 26 | do_configure:append() { |
27 | sed -i -e "s,${WORKDIR},,g" config.h | 27 | sed -i -e "s,${WORKDIR},,g" config.h |
28 | if [ -e "litest-config.h" ]; then | 28 | if [ -e "litest-config.h" ]; then |
29 | sed -i -e "s,${WORKDIR},,g" litest-config.h | 29 | sed -i -e "s,${WORKDIR},,g" litest-config.h |
@@ -42,8 +42,8 @@ EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ | |||
42 | -Dzshcompletiondir=no" | 42 | -Dzshcompletiondir=no" |
43 | 43 | ||
44 | # package name changed in 1.8.1 upgrade: make sure package upgrades work | 44 | # package name changed in 1.8.1 upgrade: make sure package upgrades work |
45 | RPROVIDES_${PN} = "libinput" | 45 | RPROVIDES:${PN} = "libinput" |
46 | RREPLACES_${PN} = "libinput" | 46 | RREPLACES:${PN} = "libinput" |
47 | RCONFLICTS_${PN} = "libinput" | 47 | RCONFLICTS:${PN} = "libinput" |
48 | 48 | ||
49 | FILES_${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite" | 49 | FILES:${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite" |
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.21.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.21.bb index 16452f86e6..4a5a295fc8 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.21.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.21.bb | |||
@@ -18,4 +18,4 @@ UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" | |||
18 | inherit allarch autotools pkgconfig | 18 | inherit allarch autotools pkgconfig |
19 | 19 | ||
20 | PACKAGES = "${PN}" | 20 | PACKAGES = "${PN}" |
21 | FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" | 21 | FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" |
diff --git a/meta/recipes-graphics/wayland/wayland_1.19.0.bb b/meta/recipes-graphics/wayland/wayland_1.19.0.bb index 0fda80ccae..d6e468497d 100644 --- a/meta/recipes-graphics/wayland/wayland_1.19.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.19.0.bb | |||
@@ -28,11 +28,11 @@ PACKAGECONFIG ??= "dtd-validation" | |||
28 | PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," | 28 | PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," |
29 | 29 | ||
30 | EXTRA_OEMESON = "-Ddocumentation=false" | 30 | EXTRA_OEMESON = "-Ddocumentation=false" |
31 | EXTRA_OEMESON_class-native = "-Ddocumentation=false -Dlibraries=false" | 31 | EXTRA_OEMESON:class-native = "-Ddocumentation=false -Dlibraries=false" |
32 | 32 | ||
33 | # Wayland installs a M4 macro for other projects to use, which uses the target | 33 | # Wayland installs a M4 macro for other projects to use, which uses the target |
34 | # pkg-config to find files. Replace pkg-config with pkg-config-native. | 34 | # pkg-config to find files. Replace pkg-config with pkg-config-native. |
35 | do_install_append_class-native() { | 35 | do_install:append:class-native() { |
36 | sed -e 's,PKG_CHECK_MODULES(.*),,g' \ | 36 | sed -e 's,PKG_CHECK_MODULES(.*),,g' \ |
37 | -e 's,$PKG_CONFIG,pkg-config-native,g' \ | 37 | -e 's,$PKG_CONFIG,pkg-config-native,g' \ |
38 | -i ${D}/${datadir}/aclocal/wayland-scanner.m4 | 38 | -i ${D}/${datadir}/aclocal/wayland-scanner.m4 |
@@ -47,16 +47,16 @@ do_install_ptest() { | |||
47 | cp -rf ${S}/egl/wayland-egl-symbols-check ${D}${PTEST_PATH}/tests/ | 47 | cp -rf ${S}/egl/wayland-egl-symbols-check ${D}${PTEST_PATH}/tests/ |
48 | } | 48 | } |
49 | 49 | ||
50 | sysroot_stage_all_append_class-target () { | 50 | sysroot_stage_all:append:class-target () { |
51 | rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 | 51 | rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 |
52 | cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ | 52 | cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ |
53 | } | 53 | } |
54 | 54 | ||
55 | PACKAGES += "${PN}-tools" | 55 | PACKAGES += "${PN}-tools" |
56 | 56 | ||
57 | FILES_${PN} = "${libdir}/*${SOLIBS}" | 57 | FILES:${PN} = "${libdir}/*${SOLIBS}" |
58 | FILES_${PN}-tools += "${bindir} ${datadir}/wayland" | 58 | FILES:${PN}-tools += "${bindir} ${datadir}/wayland" |
59 | 59 | ||
60 | BBCLASSEXTEND = "native nativesdk" | 60 | BBCLASSEXTEND = "native nativesdk" |
61 | 61 | ||
62 | RDEPENDS_${PN}-ptest += "binutils sed ${PN}-tools" | 62 | RDEPENDS:${PN}-ptest += "binutils sed ${PN}-tools" |
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index 6b78e6722f..fecf926fb3 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb | |||
@@ -19,13 +19,13 @@ PACKAGECONFIG ??= "" | |||
19 | PACKAGECONFIG[no-idle-timeout] = ",," | 19 | PACKAGECONFIG[no-idle-timeout] = ",," |
20 | 20 | ||
21 | DEFAULTBACKEND ??= "" | 21 | DEFAULTBACKEND ??= "" |
22 | DEFAULTBACKEND_qemuall ?= "fbdev" | 22 | DEFAULTBACKEND:qemuall ?= "fbdev" |
23 | DEFAULTBACKEND_qemuarm64 = "drm" | 23 | DEFAULTBACKEND:qemuarm64 = "drm" |
24 | DEFAULTBACKEND_qemux86 = "drm" | 24 | DEFAULTBACKEND:qemux86 = "drm" |
25 | DEFAULTBACKEND_qemux86-64 = "drm" | 25 | DEFAULTBACKEND:qemux86-64 = "drm" |
26 | # gallium swrast was found to crash weston on startup in x32 qemu | 26 | # gallium swrast was found to crash weston on startup in x32 qemu |
27 | DEFAULTBACKEND_qemux86-64_x86-x32 = "fbdev" | 27 | DEFAULTBACKEND:qemux86-64:x86-x32 = "fbdev" |
28 | DEFAULTBACKEND_x86-x32 = "fbdev" | 28 | DEFAULTBACKEND:x86-x32 = "fbdev" |
29 | 29 | ||
30 | do_install() { | 30 | do_install() { |
31 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then | 31 | if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then |
@@ -70,12 +70,12 @@ USERADD_PACKAGES = "${PN}" | |||
70 | # requires pam enabled if started via systemd | 70 | # requires pam enabled if started via systemd |
71 | REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" | 71 | REQUIRED_DISTRO_FEATURES = "opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" |
72 | 72 | ||
73 | RDEPENDS_${PN} = "weston kbd" | 73 | RDEPENDS:${PN} = "weston kbd" |
74 | 74 | ||
75 | INITSCRIPT_NAME = "weston" | 75 | INITSCRIPT_NAME = "weston" |
76 | INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." | 76 | INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." |
77 | 77 | ||
78 | FILES_${PN} += "\ | 78 | FILES:${PN} += "\ |
79 | ${sysconfdir}/xdg/weston/weston.ini \ | 79 | ${sysconfdir}/xdg/weston/weston.ini \ |
80 | ${systemd_system_unitdir}/weston.service \ | 80 | ${systemd_system_unitdir}/weston.service \ |
81 | ${systemd_system_unitdir}/weston.socket \ | 81 | ${systemd_system_unitdir}/weston.socket \ |
@@ -84,9 +84,9 @@ FILES_${PN} += "\ | |||
84 | /home/weston \ | 84 | /home/weston \ |
85 | " | 85 | " |
86 | 86 | ||
87 | CONFFILES_${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" | 87 | CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" |
88 | 88 | ||
89 | SYSTEMD_SERVICE_${PN} = "weston.service weston.socket" | 89 | SYSTEMD_SERVICE:${PN} = "weston.service weston.socket" |
90 | USERADD_PARAM_${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input weston" | 90 | USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input weston" |
91 | GROUPADD_PARAM_${PN} = "-r wayland" | 91 | GROUPADD_PARAM:${PN} = "-r wayland" |
92 | 92 | ||
diff --git a/meta/recipes-graphics/wayland/weston_9.0.0.bb b/meta/recipes-graphics/wayland/weston_9.0.0.bb index ce2b7d4f37..fbf181b4a6 100644 --- a/meta/recipes-graphics/wayland/weston_9.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_9.0.0.bb | |||
@@ -14,7 +14,7 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ | |||
14 | file://0001-meson.build-fix-incorrect-header.patch \ | 14 | file://0001-meson.build-fix-incorrect-header.patch \ |
15 | " | 15 | " |
16 | 16 | ||
17 | SRC_URI_append_libc-musl = " file://dont-use-plane-add-prop.patch " | 17 | SRC_URI:append:libc-musl = " file://dont-use-plane-add-prop.patch " |
18 | 18 | ||
19 | SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe" | 19 | SRC_URI[sha256sum] = "5cf5d6ce192e0eb15c1fc861a436bf21b5bb3b91dbdabbdebe83e1f83aa098fe" |
20 | 20 | ||
@@ -91,7 +91,7 @@ PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" | |||
91 | # JPEG image loading support | 91 | # JPEG image loading support |
92 | PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" | 92 | PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" |
93 | 93 | ||
94 | do_install_append() { | 94 | do_install:append() { |
95 | # Weston doesn't need the .la files to load modules, so wipe them | 95 | # Weston doesn't need the .la files to load modules, so wipe them |
96 | rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la | 96 | rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la |
97 | 97 | ||
@@ -116,20 +116,20 @@ do_install_append() { | |||
116 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ | 116 | PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ |
117 | libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" | 117 | libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" |
118 | 118 | ||
119 | FILES_${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" | 119 | FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" |
120 | FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" | 120 | FILES:${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" |
121 | 121 | ||
122 | FILES_libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" | 122 | FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" |
123 | SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." | 123 | SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." |
124 | 124 | ||
125 | FILES_${PN}-examples = "${bindir}/*" | 125 | FILES:${PN}-examples = "${bindir}/*" |
126 | 126 | ||
127 | FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" | 127 | FILES:${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" |
128 | RDEPENDS_${PN}-xwayland += "xwayland" | 128 | RDEPENDS:${PN}-xwayland += "xwayland" |
129 | 129 | ||
130 | RDEPENDS_${PN} += "xkeyboard-config" | 130 | RDEPENDS:${PN} += "xkeyboard-config" |
131 | RRECOMMENDS_${PN} = "weston-init liberation-fonts" | 131 | RRECOMMENDS:${PN} = "weston-init liberation-fonts" |
132 | RRECOMMENDS_${PN}-dev += "wayland-protocols" | 132 | RRECOMMENDS:${PN}-dev += "wayland-protocols" |
133 | 133 | ||
134 | USERADD_PACKAGES = "${PN}" | 134 | USERADD_PACKAGES = "${PN}" |
135 | GROUPADD_PARAM_${PN} = "--system weston-launch" | 135 | GROUPADD_PARAM:${PN} = "--system weston-launch" |