[OE-core] [PATCH 3/4] libx11: don't split libX11-xcb out into a libx11-xcb package
Ross Burton
ross.burton at intel.com
Mon Sep 10 17:20:31 UTC 2012
As XCB is a hard requirement for libX11, and libX11-xcb.so is a deprecated 3KB
.so, it's not worth splitting it into a separate package.
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb | 2 +-
meta/recipes-graphics/xorg-lib/libx11.inc | 3 ---
meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | 2 +-
3 files changed, 2 insertions(+), 5 deletions(-)
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 3d5a306..c39b859 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
@@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version."
LICENSE = "MIT & MIT-style & BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
-PR = "r1"
+PR = "r2"
DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 592f116..bbbb29c 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -18,10 +18,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
-PACKAGES =+ "${PN}-xcb"
-
FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
-FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
do_compile_prepend() {
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 a65ab1f..e78d707 100644
--- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb
@@ -1,7 +1,7 @@
require libx11.inc
inherit gettext
-PR = "r1"
+PR = "r2"
BBCLASSEXTEND = "native nativesdk"
--
1.7.10
More information about the Openembedded-core
mailing list