libxcb: add explicit util-macros-native dependency
PATCH 1/7 libxcb: add explicit util-macros-native dependency
This recipe needs util-macros, but currently this comes in via target transient dependencies. Explicitly depend on util-macros-native so it is always present.
--- meta/recipes-graphics/xorg-lib/libxcb_1.17.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-lib/libxcb_1.17.0.bb +1 -1
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "599ebf9996710fea71622e6e184f3a8ad5b43d0e5fa8c4e407123c88a5 BBCLASSEXTEND = "native nativesdk" -DEPENDS = "xcb-proto xorgproto libxau libpthread-stubs libxdmcp" +DEPENDS = "util-macros-native xcb-proto xorgproto libxau libpthread-stubs libxdmcp" PACKAGES_DYNAMIC = "^${PN}-.*"
Signature · 1 line
2.43.0
PATCH 2/7 xcb-util: add explicit util-macros-native dependency
This recipe needs util-macros, but currently this comes in via target transient dependencies. Explicitly depend on util-macros-native so it is always present.
--- meta/recipes-graphics/xorg-lib/xcb-util.inc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-graphics/xorg-lib/xcb-util.inc +1 -2
@@ -13,8 +13,7 @@ LICENSE = "MIT" SECTION = "x11/libs" -DEPENDS = "libxcb" -DEPENDS += "gperf-native" +DEPENDS = "util-macros-native gperf-native libxcb" SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.xz"
Signature · 1 line
2.43.0
PATCH 3/7 rgb: remove redundant util-macros dependency
In reply to Ross BurtonThis is bought in via xorg-app-common.inc already.
--- meta/recipes-graphics/xorg-app/rgb_1.1.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-app/rgb_1.1.1.bb +1 -1
@@ -6,7 +6,7 @@ to RGB values (rgb.txt) and, if configured to use a database for color \ lookup, the rgb program to convert the text file into the binary database \ format." -DEPENDS += " xorgproto util-macros" +DEPENDS += "xorgproto" LIC_FILES_CHKSUM = "file://COPYING;md5=dc4f23db04773a414e3c39cc97a9f415" PE = "1"
Signature · 1 line
2.43.0
PATCH 4/7 xorg-driver-common: depend on util-macros-native
In reply to Ross BurtonThere's no need to depend on the target form of this recipe as it just provides autoconf macros, the native is sufficient.
--- meta/recipes-graphics/xorg-driver/xorg-driver-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +1 -1
@@ -6,7 +6,7 @@ LICENSE = "MIT" PE = "2" -DEPENDS = "virtual/xserver xorgproto util-macros" +DEPENDS = "virtual/xserver xorgproto util-macros-native" XORG_DRIVER_COMPRESSOR ?= ".tar.bz2" SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}${XORG_DRIVER_COMPRESSOR}"
Signature · 1 line
2.43.0
PATCH 5/7 xorg-lib-common: depend on util-macros-native
In reply to Ross BurtonThere's no need to depend on the target form of this recipe as it just provides autoconf macros, the native is sufficient.
--- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +1 -1
@@ -3,7 +3,7 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xorg" SECTION = "x11/libs" LICENSE = "MIT" -DEPENDS = "util-macros" +DEPENDS = "util-macros-native" XORG_PN = "${BPN}" XORG_EXT ?= "tar.xz"
Signature · 1 line
2.43.0
PATCH 6/7 xorg-lib: remove redundant util-macros dependencies
In reply to Ross BurtonThese recipes use meson to build, so no longer need util-macros (which provides xorg-specific autoconf macros).
--- meta/recipes-graphics/xorg-lib/libpciaccess_0.19.bb | 2 -- meta/recipes-graphics/xorg-lib/libxkbfile_1.2.0.bb | 2 +- meta/recipes-graphics/xorg-lib/xkeyboard-config_2.48.bb | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-)
meta/recipes-graphics/xorg-lib/libpciaccess_0.19.bb +0 -2
@@ -9,8 +9,6 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=54c978968e565218eea36cf03ef24352" -DEPENDS = "util-macros" - SRC_URI = "${XORG_MIRROR}/individual/lib/${BP}.tar.xz" SRC_URI[sha256sum] = "3c55aa86c82e54a4e3109786f0463530d53b36b6d1cfd14616454f985dd2aa43"
meta/recipes-graphics/xorg-lib/libxkbfile_1.2.0.bb +1 -1
@@ -9,7 +9,7 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=8be7367f7e5d605a426f76bb37d4d61f" -DEPENDS += "util-macros virtual/libx11 xorgproto" +DEPENDS += "virtual/libx11 xorgproto" XORG_PN = "${BPN}" XORG_EXT ?= "tar.xz"
meta/recipes-graphics/xorg-lib/xkeyboard-config_2.48.bb +1 -1
@@ -16,7 +16,7 @@ SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.xz" SRC_URI[sha256sum] = "b77041324f0109f77161ee43743fe04baa485866af8460d31e476ad3f7648fd5" SECTION = "x11/libs" -DEPENDS = "util-macros libxslt-native" +DEPENDS = "libxslt-native" FILES:${PN} += "${datadir}/X11/xkb ${datadir}/xkeyboard-config-2"
Signature · 1 line
2.43.0
PATCH 7/7 font-util: depend on util-macros-native
In reply to Ross BurtonThere's no need to depend on the target form of this recipe as it just provides autoconf macros, the native is sufficient.
--- meta/recipes-graphics/xorg-font/font-util_1.4.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-font/font-util_1.4.2.bb +1 -1
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=756e7412ee04c80f5833cd2f35242f7a \ file://map-ISO8859-1;beginline=1;endline=4;md5=9c9c1d525d29c0e82b5c99edbb8e71c1 \ " -DEPENDS = "encodings util-macros" +DEPENDS = "encodings util-macros-native" DEPENDS:class-native = "util-macros-native" RDEPENDS:${PN} = "mkfontdir mkfontscale encodings" RDEPENDS:${PN}:class-native = ""
Signature · 1 line
2.43.0