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_git.bb | |
| parent | 2e0f5099dae869f19984b67a75ff166b345b31db (diff) | |
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_git.bb')
| -rw-r--r-- | recipes/xorg-lib/libx11_git.bb | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/recipes/xorg-lib/libx11_git.bb b/recipes/xorg-lib/libx11_git.bb index 9cd227b0bb..947316de9c 100644 --- a/recipes/xorg-lib/libx11_git.bb +++ b/recipes/xorg-lib/libx11_git.bb @@ -1,30 +1,12 @@ -DEFAULT_PREFERENCE = "-1" +require libx11.inc -DESCRIPTION = "Xlib/XCB: Xlib with XCB transport" -SECTION = "x11/libs" -LICENSE = "XFree86" -DEPENDS = "libxcb xproto xextproto libxau xtrans libxdmcp xcmiscproto xf86bigfontproto kbproto inputproto bigreqsproto util-macros" -PROVIDES = "virtual/libx11" -RPROVIDES_${PN} = "virtual-libx11" -SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d" +DEFAULT_PREFERENCE = "-1" PV = "1.3.3+git" -PR = "r4" - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB" -FILES_${PN}-locale += "${datadir}/X11/locale" - +SRCREV = "c3f3e4a9e531d010312c97e753d6e543e607094d" SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF="--enable-malloc0returnsnull" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - oe_runmake -} +SRC_URI += " file://keysymdef_include.patch \ + file://x11_disable_makekeys.patch \ + file://dolt-fix.patch \ +" +S = "${WORKDIR}/git" |