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/xorg-lib | |
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/xorg-lib')
11 files changed, 18 insertions, 18 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb index ffa1c859d6..b398e8b626 100644 --- a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb +++ b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb | |||
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78 | |||
13 | 13 | ||
14 | inherit autotools | 14 | inherit autotools |
15 | 15 | ||
16 | RDEPENDS_${PN}-dev = "" | 16 | RDEPENDS:${PN}-dev = "" |
17 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" | 17 | RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" |
18 | 18 | ||
19 | BBCLASSEXTEND = "native nativesdk" | 19 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb index 0f4be35770..7519b4c018 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-compose-data_1.6.8.bb | |||
@@ -23,7 +23,7 @@ EXTRA_OECONF += "--disable-xkb" | |||
23 | 23 | ||
24 | PACKAGES = "${PN}" | 24 | PACKAGES = "${PN}" |
25 | 25 | ||
26 | FILES_${PN} = "${datadir}/X11/locale ${libdir}/X11/locale" | 26 | FILES:${PN} = "${datadir}/X11/locale ${libdir}/X11/locale" |
27 | 27 | ||
28 | do_compile() { | 28 | do_compile() { |
29 | oe_runmake -C nls | 29 | oe_runmake -C nls |
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.7.2.bb b/meta/recipes-graphics/xorg-lib/libx11_1.7.2.bb index c9ddc12f08..c84f33e92c 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.7.2.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.7.2.bb | |||
@@ -36,8 +36,8 @@ PACKAGES =+ "${PN}-xcb" | |||
36 | 36 | ||
37 | inherit gettext | 37 | inherit gettext |
38 | 38 | ||
39 | FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" | 39 | FILES:${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" |
40 | FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" | 40 | FILES:${PN}-xcb += "${libdir}/libX11-xcb.so.*" |
41 | FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" | 41 | FILES:${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" |
42 | 42 | ||
43 | BBCLASSEXTEND = "native nativesdk" | 43 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb index f0a223a19c..5341bbd4bc 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb | |||
@@ -21,7 +21,7 @@ DEPENDS = "xcb-proto xorgproto libxau libpthread-stubs libxdmcp" | |||
21 | 21 | ||
22 | PACKAGES_DYNAMIC = "^${PN}-.*" | 22 | PACKAGES_DYNAMIC = "^${PN}-.*" |
23 | 23 | ||
24 | FILES_${PN} = "${libdir}/libxcb.so.*" | 24 | FILES:${PN} = "${libdir}/libxcb.so.*" |
25 | 25 | ||
26 | inherit autotools pkgconfig features_check | 26 | inherit autotools pkgconfig features_check |
27 | 27 | ||
@@ -30,10 +30,10 @@ REQUIRED_DISTRO_FEATURES = "x11" | |||
30 | 30 | ||
31 | export PYTHON = "python3" | 31 | export PYTHON = "python3" |
32 | 32 | ||
33 | do_install_append () { | 33 | do_install:append () { |
34 | chown root.root ${D}${datadir}/doc/${BPN}/tutorial -R | 34 | chown root.root ${D}${datadir}/doc/${BPN}/tutorial -R |
35 | } | 35 | } |
36 | 36 | ||
37 | python populate_packages_prepend () { | 37 | python populate_packages:prepend () { |
38 | do_split_packages(d, '${libdir}', r'^libxcb-(.*)\.so\..*$', '${PN}-%s', 'XCB library module for %s', allow_links=True) | 38 | do_split_packages(d, '${libdir}', r'^libxcb-(.*)\.so\..*$', '${PN}-%s', 'XCB library module for %s', allow_links=True) |
39 | } | 39 | } |
diff --git a/meta/recipes-graphics/xorg-lib/libxft_2.3.3.bb b/meta/recipes-graphics/xorg-lib/libxft_2.3.3.bb index 65bd9ae494..a6fb5642da 100644 --- a/meta/recipes-graphics/xorg-lib/libxft_2.3.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxft_2.3.3.bb | |||
@@ -29,5 +29,5 @@ BBCLASSEXTEND = "native nativesdk" | |||
29 | 29 | ||
30 | python () { | 30 | python () { |
31 | if d.getVar('DEBIAN_NAMES'): | 31 | if d.getVar('DEBIAN_NAMES'): |
32 | d.setVar('PKG_${PN}', '${MLPREFIX}libxft2') | 32 | d.setVar('PKG:${PN}', '${MLPREFIX}libxft2') |
33 | } | 33 | } |
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.0.bb index 26bbaadcb5..57c318cf5e 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.0.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.3.0.bb | |||
@@ -23,4 +23,4 @@ PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-n | |||
23 | 23 | ||
24 | # Fix a following runtime error: | 24 | # Fix a following runtime error: |
25 | # xkbcommon: ERROR: couldn't find a Compose file for locale "C" | 25 | # xkbcommon: ERROR: couldn't find a Compose file for locale "C" |
26 | RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" | 26 | RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" |
diff --git a/meta/recipes-graphics/xorg-lib/libxmu_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxmu_1.1.3.bb index dc3179f53e..7e92d0499a 100644 --- a/meta/recipes-graphics/xorg-lib/libxmu_1.1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxmu_1.1.3.bb | |||
@@ -23,7 +23,7 @@ LEAD_SONAME = "libXmu" | |||
23 | 23 | ||
24 | PACKAGES =+ "libxmuu" | 24 | PACKAGES =+ "libxmuu" |
25 | 25 | ||
26 | FILES_libxmuu = "${libdir}/libXmuu.so.*" | 26 | FILES:libxmuu = "${libdir}/libXmuu.so.*" |
27 | 27 | ||
28 | BBCLASSEXTEND = "native" | 28 | BBCLASSEXTEND = "native" |
29 | 29 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb index fda8e32d2c..4f0a5d7ba0 100644 --- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb +++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.13.bb | |||
@@ -18,8 +18,8 @@ PE = "1" | |||
18 | XORG_PN = "libXpm" | 18 | XORG_PN = "libXpm" |
19 | 19 | ||
20 | PACKAGES =+ "sxpm cxpm" | 20 | PACKAGES =+ "sxpm cxpm" |
21 | FILES_cxpm = "${bindir}/cxpm" | 21 | FILES:cxpm = "${bindir}/cxpm" |
22 | FILES_sxpm = "${bindir}/sxpm" | 22 | FILES:sxpm = "${bindir}/sxpm" |
23 | 23 | ||
24 | SRC_URI[md5sum] = "6f0ecf8d103d528cfc803aa475137afa" | 24 | SRC_URI[md5sum] = "6f0ecf8d103d528cfc803aa475137afa" |
25 | SRC_URI[sha256sum] = "9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25" | 25 | SRC_URI[sha256sum] = "9cd1da57588b6cb71450eff2273ef6b657537a9ac4d02d0014228845b935ac25" |
diff --git a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb index aed52e75ee..b52fd00f1a 100644 --- a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb | |||
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=21fd154ee757813632ada871a34113fb" | |||
14 | 14 | ||
15 | DEPENDS += "libxext xorgproto" | 15 | DEPENDS += "libxext xorgproto" |
16 | PROVIDES = "libxss" | 16 | PROVIDES = "libxss" |
17 | RREPLACES_${PN} = "libxss" | 17 | RREPLACES:${PN} = "libxss" |
18 | PE = "1" | 18 | PE = "1" |
19 | 19 | ||
20 | XORG_PN = "libXScrnSaver" | 20 | XORG_PN = "libXScrnSaver" |
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.33.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.33.bb index 197a870e76..138e451d07 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.33.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.33.bb | |||
@@ -20,11 +20,11 @@ DEPENDS = "util-macros libxslt-native" | |||
20 | 20 | ||
21 | EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" | 21 | EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" |
22 | 22 | ||
23 | FILES_${PN} += "${datadir}/X11/xkb" | 23 | FILES:${PN} += "${datadir}/X11/xkb" |
24 | 24 | ||
25 | inherit autotools pkgconfig gettext python3native | 25 | inherit autotools pkgconfig gettext python3native |
26 | 26 | ||
27 | do_install_append () { | 27 | do_install:append () { |
28 | install -d ${D}${datadir}/X11/xkb/compiled | 28 | install -d ${D}${datadir}/X11/xkb/compiled |
29 | cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg | 29 | cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg |
30 | } | 30 | } |
diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb index 5bf134b5f8..f33f6f0215 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.4.0.bb | |||
@@ -16,7 +16,7 @@ SRC_URI += "file://multilibfix.patch" | |||
16 | 16 | ||
17 | PE = "1" | 17 | PE = "1" |
18 | 18 | ||
19 | RDEPENDS_${PN}-dev = "" | 19 | RDEPENDS:${PN}-dev = "" |
20 | 20 | ||
21 | inherit gettext | 21 | inherit gettext |
22 | 22 | ||