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-trim_1.1.5.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-trim_1.1.5.bb')
| -rw-r--r-- | recipes/xorg-lib/libx11-trim_1.1.5.bb | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/recipes/xorg-lib/libx11-trim_1.1.5.bb b/recipes/xorg-lib/libx11-trim_1.1.5.bb index f7c40e2963..ed227493c8 100644 --- a/recipes/xorg-lib/libx11-trim_1.1.5.bb +++ b/recipes/xorg-lib/libx11-trim_1.1.5.bb @@ -1,37 +1,7 @@ -require xorg-lib-common.inc +require libx11_${PV}.bb -DESCRIPTION = "X11 protocol and utility library" -DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto" +EXTRA_OECONF += "--disable-xcms" -#FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" -#SRC_URI += "file://X18NCMSstubs.diff " +SRC_URI += " file://makekeys-update.patch" -PROVIDES = "virtual/libx11" - -PE = "1" PR = "r1" - -XORG_PN = "libX11" -LEAD_SONAME = "libX11.so" - -SRC_URI += "file://include_fix.patch \ - file://makekeys-update.patch" - -EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" -#EXTRA_OECONF += "--disable-xlocale --disable-xcms --with-xcb" -EXTRA_OECONF += "--disable-xcms --with-xcb" - -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 " - - -SRC_URI[archive.md5sum] = "d1512d65dadd4f48c779d4749e7753a8" -SRC_URI[archive.sha256sum] = "da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82" |