From cc1f50fca85dc48a237a518b8afe8563225ea8fa Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Sat, 27 Oct 2012 16:48:17 +0800 Subject: recipes-graphics: replace virtclass-native(sdk) with class-native(sdk) The overrides virtclass-native and virtclass-nativesdk are deprecated, which should be replaced by class-native and class-nativesdk. [YOCTO #3297] (From OE-Core rev: db1a03da3a6a6e7adb68e28883204adfaa8b3f47) Signed-off-by: Robert Yang Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-graphics/freetype/freetype_2.4.10.bb | 4 ++-- meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 +- meta/recipes-graphics/pango/pango.inc | 2 +- meta/recipes-graphics/xcb/xcb-proto.inc | 2 +- meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 2 +- meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | 2 +- meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/freetype/freetype_2.4.10.bb b/meta/recipes-graphics/freetype/freetype_2.4.10.bb index cf2a78e02c..9365475bcc 100644 --- a/meta/recipes-graphics/freetype/freetype_2.4.10.bb +++ b/meta/recipes-graphics/freetype/freetype_2.4.10.bb @@ -27,7 +27,7 @@ inherit autotools pkgconfig binconfig LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" -EXTRA_OEMAKE_virtclass-native = "" +EXTRA_OEMAKE_class-native = "" EXTRA_OECONF = "--without-zlib --without-bzip2" do_configure() { @@ -40,7 +40,7 @@ do_configure() { oe_runconf } -do_configure_virtclass-native() { +do_configure_class-native() { (cd builds/unix && gnu-configize) || die "failure running gnu-configize" oe_runconf } diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index d5c127d2c5..e25c597a07 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -16,7 +16,7 @@ DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ tslib" -DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" +DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" PR = "r1" diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index b36197895c..839c00d933 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -16,7 +16,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" BBCLASSEXTEND = "native" -DEPENDS_virtclass-native = "glib-2.0-native cairo-native" +DEPENDS_class-native = "glib-2.0-native cairo-native" PACKAGES_DYNAMIC += "^pango-module-.*" diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc index feb9e4dd53..2e1b57bae4 100644 --- a/meta/recipes-graphics/xcb/xcb-proto.inc +++ b/meta/recipes-graphics/xcb/xcb-proto.inc @@ -21,5 +21,5 @@ FILES_python-xcbgen = "${libdir}/python*" RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -DEPENDS_append_virtclass-native = " python-native" +DEPENDS_append_class-native = " python-native" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb index 6637326131..a453e24876 100644 --- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb +++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb @@ -12,7 +12,7 @@ PE = "1" PR = "${INC_PR}.0" RDEPENDS_${PN} += "mkfontscale" -RDEPENDS_${PN}_virtclass-native += "mkfontscale-native" +RDEPENDS_${PN}_class-native += "mkfontscale-native" BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb index a212f1964a..2c51cbbeb2 100644 --- a/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +++ b/meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb @@ -13,7 +13,7 @@ SRC_URI += "file://nocompiler.patch" DEPENDS = "util-macros-native" RDEPENDS_${PN} = "encodings font-util" -RDEPENDS_${PN}_virtclass-native = "font-util-native" +RDEPENDS_${PN}_class-native = "font-util-native" inherit allarch diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb index 180c7dd49e..723cb0ccd9 100644 --- a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb +++ b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c0067273d90f6336008cb2504e14bd32 \ file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34" DEPENDS = "encodings util-macros" -DEPENDS_virtclass-native = "util-macros-native" +DEPENDS_class-native = "util-macros-native" RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" -RDEPENDS_${PN}_virtclass-native = "mkfontdir-native mkfontscale-native" +RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native" PR = "${INC_PR}.0" -- cgit v1.2.3-54-g00ecf