From 70abb59e71a2aed5ef7faf5ba9b56f695d562382 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 3 Oct 2011 09:35:49 +0200 Subject: libx11: package xcb, merge few changes from meta-oe * move --with-keysymdef/--with-keysymdefdir setting to recipes (newer versions are using keysymdefdir instead keysymdef * fix MIN_REHASH in makekeys by sed call Signed-off-by: Martin Jansa --- meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11-diet_git.bb | 2 +- .../recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11-trim_git.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11.inc | 25 ++++++++++++++-------- meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb | 2 +- meta/recipes-graphics/xorg-lib/libx11_git.bb | 2 ++ 7 files changed, 23 insertions(+), 14 deletions(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb index e7ad2d8780..d97a5b8ffa 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb @@ -22,5 +22,5 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" -EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale" CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb index dea7faf12a..4cda779813 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_git.bb @@ -13,5 +13,5 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005" -EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale" CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb index 5a63c53269..3c33de98c2 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb @@ -17,4 +17,4 @@ SRC_URI += "file://../libx11-${PV}/x11_disable_makekeys.patch \ SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" -EXTRA_OECONF += "--disable-xcms --with-xcb" +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb" diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb index 730efe1bfa..d1bf67bf77 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_git.bb @@ -8,6 +8,6 @@ SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005" DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" -EXTRA_OECONF += "--disable-xcms --with-xcb" +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb" CFLAGS += "-D_GNU_SOURCE" diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 455753f5db..748a48cef3 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -11,32 +11,39 @@ inherit siteinfo PROVIDES = "virtual/libx11" XORG_PN = "libX11" -LEAD_SONAME = "libX11.so" +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-specs" +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() { +do_compile_prepend() { cd ${S}/src/util mv makekeys.c.orig makekeys.c || true touch makekeys-makekeys.o ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + # MIN_REHASH 10 is only in 1.0.1 + sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c + sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c + touch makekeys-makekeys.o; if [ "${SITEINFO_BITS}" == "64" ]; then - ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys - else - ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys - fi + ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + else + ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys + fi ) if [ "$?" != "0" ]; then exit 1 fi # mv to stop it getting rebuilt mv makekeys.c makekeys.c.orig - cd ${S} - oe_runmake + cd ../../ } # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb index f98bbe8139..ffec7d1629 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb @@ -30,6 +30,6 @@ DEPENDS_virtclass-nativesdk += "bigreqsproto xproto xextproto \ XCB = "--with-xcb" XCB_virtclass-native = "--without-xcb" XCB_virtclass-nativesdk = "--without-xcb" -EXTRA_OECONF += "${XCB}" +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h ${XCB}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-graphics/xorg-lib/libx11_git.bb b/meta/recipes-graphics/xorg-lib/libx11_git.bb index 4da80bd464..afa156006d 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_git.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_git.bb @@ -11,4 +11,6 @@ DEPENDS = "xproto xextproto xcmiscproto xf86bigfontproto kbproto inputproto \ DEFAULT_PREFERENCE = "-1" +EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" + BBCLASSEXTEND = "nativesdk" -- cgit 1.2.3-korg