summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-03 09:35:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:36 +0100
commitaf0a9577604de374035c06c344771a874a2b7496 (patch)
treea14e08e709df88b2bbd2a288139a9a871b85a668
parentb093169e526fd80ccd2b66effb28f7e1b34f14f0 (diff)
downloadpoky-af0a9577604de374035c06c344771a874a2b7496.tar.gz
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 (From OE-Core rev: 70abb59e71a2aed5ef7faf5ba9b56f695d562382) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_1.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-diet_git.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_1.3.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11-trim_git.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc25
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_1.3.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11_git.bb2
7 files changed, 23 insertions, 14 deletions
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 \
22 22
23FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" 23FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11"
24 24
25EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" 25EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
26CFLAGS += "-D_GNU_SOURCE" 26CFLAGS += "-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 \
13 13
14SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005" 14SRCREV = "d23aad31338e7d869d878d5aa1b6b91d20287005"
15 15
16EXTRA_OECONF += "--without-xcb --disable-udc --disable-xcms --disable-xlocale" 16EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --without-xcb --disable-udc --disable-xcms --disable-xlocale"
17CFLAGS += "-D_GNU_SOURCE" 17CFLAGS += "-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 \
17SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd" 17SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
18SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844" 18SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
19 19
20EXTRA_OECONF += "--disable-xcms --with-xcb" 20EXTRA_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"
8 8
9DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" 9DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
10 10
11EXTRA_OECONF += "--disable-xcms --with-xcb" 11EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-xcms --with-xcb"
12CFLAGS += "-D_GNU_SOURCE" 12CFLAGS += "-D_GNU_SOURCE"
13 13
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
11PROVIDES = "virtual/libx11" 11PROVIDES = "virtual/libx11"
12 12
13XORG_PN = "libX11" 13XORG_PN = "libX11"
14LEAD_SONAME = "libX11.so" 14LICENSE = "MIT & MIT-style & BSD"
15LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
15 16
16EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-specs" 17EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs"
18
19PACKAGES =+ "${PN}-xcb"
17 20
18FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" 21FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt"
22FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
19FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" 23FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
20 24
21do_compile() { 25do_compile_prepend() {
22 cd ${S}/src/util 26 cd ${S}/src/util
23 mv makekeys.c.orig makekeys.c || true 27 mv makekeys.c.orig makekeys.c || true
24 touch makekeys-makekeys.o 28 touch makekeys-makekeys.o
25 ( 29 (
26 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS 30 unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS
31 # MIN_REHASH 10 is only in 1.0.1
32 sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c
33 sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c
34 touch makekeys-makekeys.o;
27 if [ "${SITEINFO_BITS}" == "64" ]; then 35 if [ "${SITEINFO_BITS}" == "64" ]; then
28 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys 36 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys
29 else 37 else
30 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys 38 ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys
31 fi 39 fi
32 ) 40 )
33 if [ "$?" != "0" ]; then 41 if [ "$?" != "0" ]; then
34 exit 1 42 exit 1
35 fi 43 fi
36 # mv to stop it getting rebuilt 44 # mv to stop it getting rebuilt
37 mv makekeys.c makekeys.c.orig 45 mv makekeys.c makekeys.c.orig
38 cd ${S} 46 cd ../../
39 oe_runmake
40} 47}
41 48
42# Multiple libx11 derivatives from from this file and are selected by virtual/libx11 49# 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 \
30XCB = "--with-xcb" 30XCB = "--with-xcb"
31XCB_virtclass-native = "--without-xcb" 31XCB_virtclass-native = "--without-xcb"
32XCB_virtclass-nativesdk = "--without-xcb" 32XCB_virtclass-nativesdk = "--without-xcb"
33EXTRA_OECONF += "${XCB}" 33EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h ${XCB}"
34 34
35BBCLASSEXTEND = "native nativesdk" 35BBCLASSEXTEND = "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 \
11 11
12DEFAULT_PREFERENCE = "-1" 12DEFAULT_PREFERENCE = "-1"
13 13
14EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
15
14BBCLASSEXTEND = "nativesdk" 16BBCLASSEXTEND = "nativesdk"