mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

libx11: package xcb, merge few changes from meta-oe

Browse Source 
* move --with-keysymdef/--with-keysymdefdir setting to recipes (newer
  versions are using keysymdefdir instead keysymdef
* fix MIN_REHASH in makekeys by sed call

(From OE-Core rev: 70abb59e71a2aed5ef7faf5ba9b56f695d562382)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2011-10-03 09:35:49 +02:00
committed by Richard Purdie
parent b093169e52
commit af0a957760
7 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb
+1 -1
View File
@@ -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"
meta/recipes-graphics/xorg-lib/libx11-diet_git.bb
+1 -1
View File
@@ -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"
meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb
+1 -1
View File
@@ -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"
meta/recipes-graphics/xorg-lib/libx11-trim_git.bb
+1 -1
View File
@@ -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"
meta/recipes-graphics/xorg-lib/libx11.inc
+16 -9
View File
@@ -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
meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb
+1 -1
View File
@@ -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"
meta/recipes-graphics/xorg-lib/libx11_git.bb
+2
View File
@@ -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"