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>

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 04ee1b89fc7983d2ed16c35c42fadc30d0c80a9f..50000ab882b5a9d84d73bc5efb1ca04d77a4f91e 100644 (file)
--- 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 65509031fe1802861c3ea9ec873bea47bf0e9403..6619946c4c1fb116fd0233a3d4ed43925896892a 100644 (file)
--- 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 1e9f9423f049cbb91137edf8dfc466aea6eafee7..85fdbe7dd9b661efabea5e33cfb52bc2d158ebab 100644 (file)
--- 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 0ba0f9b0d61d52b70db70a7968a320f65aae1111..c1387856405127fe6463c3bc0f792f5eba46ccc6 100644 (file)
--- 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 \