From patchwork Mon Sep 10 17:20:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4/4] libx11: re-arrange recipies to make comparisons easier Date: Mon, 10 Sep 2012 17:20:32 -0000 From: Ross Burton X-Patchwork-Id: 36225 Message-Id: <1347297632-16529-4-git-send-email-ross.burton@intel.com> To: openembedded-core@lists.openembedded.org Signed-off-by: Ross Burton --- meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | 9 +++------ meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb | 3 --- meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 4 ++-- 3 files changed, 5 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 4440a80..5b1e367 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 @@ -3,10 +3,11 @@ require libx11.inc DESCRIPTION += " Support for XCMS and XLOCALE is disabled in \ this version." -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" - PR = "r3" +DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" + SRC_URI += "file://x11_disable_makekeys.patch \ file://X18NCMSstubs.diff \ file://keysymdef_include.patch \ @@ -20,11 +21,7 @@ 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-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11" CFLAGS += "-D_GNU_SOURCE" - 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 c39b859..697fe66 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 @@ -2,9 +2,6 @@ require libx11.inc DESCRIPTION += " Support for XCMS is disabled in this version." -LICENSE = "MIT & MIT-style & BSD" -LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" - PR = "r2" DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" 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 e78d707..dca220b 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb @@ -5,8 +5,6 @@ PR = "r2" BBCLASSEXTEND = "native nativesdk" -EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11" - DEPENDS += "util-macros xtrans libxdmcp libxau \ bigreqsproto xproto xextproto xcmiscproto \ xf86bigfontproto kbproto inputproto libxcb \ @@ -19,3 +17,5 @@ SRC_URI += " file://keysymdef_include.patch \ SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6" SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86" + +EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11"