diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2012-10-27 16:48:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-02 16:18:29 +0000 |
commit | cc1f50fca85dc48a237a518b8afe8563225ea8fa (patch) | |
tree | 7ce566113bbb68a5b305de8529908914b51b36c6 | |
parent | 5ddf8570a113035f40fa8f203c3ac33582e2c745 (diff) | |
download | poky-cc1f50fca85dc48a237a518b8afe8563225ea8fa.tar.gz |
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 <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-graphics/freetype/freetype_2.4.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-graphics/libsdl/libsdl_1.2.15.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xcb/xcb-proto.inc | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb | 2 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-font/font-util_1.3.0.bb | 4 |
7 files changed, 9 insertions, 9 deletions
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 | |||
27 | 27 | ||
28 | LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" | 28 | LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" |
29 | EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" | 29 | EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" |
30 | EXTRA_OEMAKE_virtclass-native = "" | 30 | EXTRA_OEMAKE_class-native = "" |
31 | EXTRA_OECONF = "--without-zlib --without-bzip2" | 31 | EXTRA_OECONF = "--without-zlib --without-bzip2" |
32 | 32 | ||
33 | do_configure() { | 33 | do_configure() { |
@@ -40,7 +40,7 @@ do_configure() { | |||
40 | oe_runconf | 40 | oe_runconf |
41 | } | 41 | } |
42 | 42 | ||
43 | do_configure_virtclass-native() { | 43 | do_configure_class-native() { |
44 | (cd builds/unix && gnu-configize) || die "failure running gnu-configize" | 44 | (cd builds/unix && gnu-configize) || die "failure running gnu-configize" |
45 | oe_runconf | 45 | oe_runconf |
46 | } | 46 | } |
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)} \ | |||
16 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ | 16 | ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ |
17 | ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ | 17 | ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ |
18 | tslib" | 18 | tslib" |
19 | DEPENDS_virtclass-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" | 19 | DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" |
20 | 20 | ||
21 | PR = "r1" | 21 | PR = "r1" |
22 | 22 | ||
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)}" | |||
16 | PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" | 16 | PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" |
17 | 17 | ||
18 | BBCLASSEXTEND = "native" | 18 | BBCLASSEXTEND = "native" |
19 | DEPENDS_virtclass-native = "glib-2.0-native cairo-native" | 19 | DEPENDS_class-native = "glib-2.0-native cairo-native" |
20 | 20 | ||
21 | PACKAGES_DYNAMIC += "^pango-module-.*" | 21 | PACKAGES_DYNAMIC += "^pango-module-.*" |
22 | 22 | ||
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*" | |||
21 | RDEPENDS_${PN}-dev = "" | 21 | RDEPENDS_${PN}-dev = "" |
22 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" | 22 | RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" |
23 | 23 | ||
24 | DEPENDS_append_virtclass-native = " python-native" | 24 | DEPENDS_append_class-native = " python-native" |
25 | BBCLASSEXTEND = "native nativesdk" | 25 | 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" | |||
12 | PR = "${INC_PR}.0" | 12 | PR = "${INC_PR}.0" |
13 | 13 | ||
14 | RDEPENDS_${PN} += "mkfontscale" | 14 | RDEPENDS_${PN} += "mkfontscale" |
15 | RDEPENDS_${PN}_virtclass-native += "mkfontscale-native" | 15 | RDEPENDS_${PN}_class-native += "mkfontscale-native" |
16 | 16 | ||
17 | BBCLASSEXTEND = "native" | 17 | BBCLASSEXTEND = "native" |
18 | 18 | ||
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" | |||
13 | 13 | ||
14 | DEPENDS = "util-macros-native" | 14 | DEPENDS = "util-macros-native" |
15 | RDEPENDS_${PN} = "encodings font-util" | 15 | RDEPENDS_${PN} = "encodings font-util" |
16 | RDEPENDS_${PN}_virtclass-native = "font-util-native" | 16 | RDEPENDS_${PN}_class-native = "font-util-native" |
17 | 17 | ||
18 | inherit allarch | 18 | inherit allarch |
19 | 19 | ||
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 \ | |||
10 | file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34" | 10 | file://map-ISO8859-1;beginline=9;endline=23;md5=1cecb984063248f29ffe5c46f5c04f34" |
11 | 11 | ||
12 | DEPENDS = "encodings util-macros" | 12 | DEPENDS = "encodings util-macros" |
13 | DEPENDS_virtclass-native = "util-macros-native" | 13 | DEPENDS_class-native = "util-macros-native" |
14 | RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" | 14 | RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" |
15 | RDEPENDS_${PN}_virtclass-native = "mkfontdir-native mkfontscale-native" | 15 | RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native" |
16 | 16 | ||
17 | PR = "${INC_PR}.0" | 17 | PR = "${INC_PR}.0" |
18 | 18 | ||