diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-09-11 20:17:59 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 14:52:50 +0100 |
| commit | a66e6a7765525d3e18cd81b68c422b3dab81d498 (patch) | |
| tree | 893258fa5834c54ea13338af3d6781bda8398b96 /meta/recipes-graphics | |
| parent | 34b337e52551717106b377c53ea5dc617ac4c92c (diff) | |
| download | openembedded-core-a66e6a7765525d3e18cd81b68c422b3dab81d498.tar.gz openembedded-core-a66e6a7765525d3e18cd81b68c422b3dab81d498.tar.bz2 openembedded-core-a66e6a7765525d3e18cd81b68c422b3dab81d498.zip | |
libx11: refresh dependencies, and centralise into libx11.inc
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
4 files changed, 4 insertions, 11 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index 04ee1b89fc..50000ab882 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb @@ -18,9 +18,6 @@ RPROVIDES_${PN}-locale = "libx11-locale" SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" -DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" - FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11" EXTRA_OECONF += "--disable-xlocale" diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb index 65509031fe..6619946c4c 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb @@ -4,8 +4,6 @@ DESCRIPTION += " Support for XCMS is disabled in this version." PR = "${INC_PR}.0" -DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" - SRC_URI += "file://x11_disable_makekeys.patch \ file://keysymdef_include.patch \ file://makekeys_crosscompile.patch" diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 1e9f9423f0..85fdbe7dd9 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -11,7 +11,7 @@ inherit siteinfo FILESPATH = "${FILE_DIRNAME}/libx11" PE = "1" -INC_PR = "r5" +INC_PR = "r6" PROVIDES = "virtual/libx11" @@ -19,6 +19,9 @@ XORG_PN = "libX11" LICENSE = "MIT & MIT-style & BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" +DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" +DEPENDS += "xf86bigfontproto xproto-native" + PACKAGES =+ "${PN}-xcb" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index 0ba0f9b0d6..c138785640 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -5,11 +5,6 @@ PR = "${INC_PR}.0" BBCLASSEXTEND = "native nativesdk" -DEPENDS += "util-macros xtrans libxdmcp libxau \ - bigreqsproto xproto xextproto xcmiscproto \ - xf86bigfontproto kbproto inputproto libxcb \ - xproto-native" - SRC_URI += " file://keysymdef_include.patch \ file://x11_disable_makekeys.patch \ file://makekeys_crosscompile.patch \ |