diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-24 20:09:24 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-06-25 15:44:27 +0200 |
| commit | 82dd23467d2a7dd7c3c2b3a32635f8e925c7d589 (patch) | |
| tree | d04ae6ce563ea118c26c3ba546a3b9639bc5e4d7 /recipes/xorg-lib/libx11_1.1.3.bb | |
| parent | 2e0f5099dae869f19984b67a75ff166b345b31db (diff) | |
| download | openembedded-82dd23467d2a7dd7c3c2b3a32635f8e925c7d589.tar.gz | |
libx11: convert to BBCLASSEXTEND
* common patches in new libx11.inc (some needed to be renamed to keep
same name across version)
* keep one common dir with diet-x11/libx11-trip variants
* enable xcb again for non-native non-sdk versions newer than 1.3 and
add libx11-xcb package, XCB seems more popular then in 2007
(xls* projects were coverted lately, so this actually reverts patch from bug #3372)
* also xcb enabled makes mesa build after libxcb was staged (mesa itself
has xcb disabled, but if it founds libxcb, then it expects to find
libx11 with xcb too)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-lib/libx11_1.1.3.bb')
| -rw-r--r-- | recipes/xorg-lib/libx11_1.1.3.bb | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/recipes/xorg-lib/libx11_1.1.3.bb b/recipes/xorg-lib/libx11_1.1.3.bb index 8100baa9e8..659fa89e24 100644 --- a/recipes/xorg-lib/libx11_1.1.3.bb +++ b/recipes/xorg-lib/libx11_1.1.3.bb @@ -1,29 +1,8 @@ -require xorg-lib-common.inc +require libx11.inc +PR = "r7" -DESCRIPTION = "Base X libs." -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" -PROVIDES = "virtual/libx11" -PE = "1" -PR = "r3" - -XORG_PN = "libX11" - -SRC_URI += "file://include_fix.patch" - -EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" - -do_compile() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys - cd ../../ - ) || exit 1 - oe_runmake -} - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" +DEPENDS = "${COMMON_DEPENDS}" +EXTRA_OECONF += " --without-xcb" SRC_URI[archive.md5sum] = "4d43d3e472c552d2f191ecdd4e75112c" SRC_URI[archive.sha256sum] = "4a2f566e2ea5dd955c875cb8fa9c18dd725324fc5cf4e23c803442e31ab8917a" |