libx11_1.4.3.bb: Remove --without-xcb

--without-xcb is no longer supported and that made a lot of difference
in different BBCLASSEXTENDED recipes. It can be unified now

(From meta-openembedded rev: c33ec1e9af2731765802e1004c5e533d017a2353)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libx11.inc b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libx11.inc
index d1e646a..2aa9700 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libx11.inc
@@ -1,13 +1,10 @@
 require xorg-lib-common.inc
 
 DESCRIPTION = "Base X libs."
-COMMON_DEPENDS = "util-macros xtrans libxdmcp libxau \
-                  bigreqsproto xproto xextproto xcmiscproto \
-                  xf86bigfontproto kbproto inputproto xproto-native"
-
-DEPENDS = "libxcb ${COMMON_DEPENDS}"             
-DEPENDS_virtclass-native = "${COMMON_DEPENDS}"
-DEPENDS_virtclass-nativesdk = "${COMMON_DEPENDS}"
+DEPENDS += "util-macros xtrans libxdmcp libxau \
+            bigreqsproto xproto xextproto xcmiscproto \
+            xf86bigfontproto kbproto inputproto libxcb \
+           xproto-native"
 
 FILESPATHPKG .= ":libx11-${PV}:libx11"
 BBCLASSEXTEND = "native nativesdk"
@@ -22,9 +19,7 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
 
 XORG_PN = "libX11"
 
-EXTRA_OECONF += " --with-xcb --with-keysymdefdir=${STAGING_INCDIR}/X11 --with-groff=no --with-ps2pdf=no --with-fop=no"
-EXTRA_OECONF_virtclass-native = " --without-xcb --with-groff=no --with-ps2pdf=no --with-fop=no"
-EXTRA_OECONF_virtclass-nativesdk = " --without-xcb --with-groff=no --with-ps2pdf=no --with-fop=no"
+EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11 --with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
 
 # Below option is added to overcome the GCC bug on ARM
 # see http://gcc.gnu.org/PR42981 for further details.

diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
index 481b90f..3c6a170 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-lib/libx11_1.4.3.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
 
 #--without-xcb is not an option anymore
 #http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=15e5eaf62897b3179d1fbe457cb19f886f0449f8
-DEPENDS_virtclass-native = "libxcb-native ${COMMON_DEPENDS}"
 PR = "${INC_PR}.0"
 
 SRC_URI[md5sum] = "85e942627aaa020813e0eb8433353563"