diff options
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb index 4ae8b29a7f..7d4facdb05 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb | |||
@@ -5,7 +5,7 @@ this version." | |||
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" |
7 | 7 | ||
8 | PR = "r0" | 8 | PR = "r1" |
9 | 9 | ||
10 | SRC_URI += "file://x11_disable_makekeys.patch \ | 10 | SRC_URI += "file://x11_disable_makekeys.patch \ |
11 | file://X18NCMSstubs.diff \ | 11 | file://X18NCMSstubs.diff \ |
diff --git a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb index 89c45974f3..3d5a306a17 100644 --- a/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb | |||
@@ -5,7 +5,7 @@ DESCRIPTION += " Support for XCMS is disabled in this version." | |||
5 | LICENSE = "MIT & MIT-style & BSD" | 5 | LICENSE = "MIT & MIT-style & BSD" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" |
7 | 7 | ||
8 | PR = "r0" | 8 | PR = "r1" |
9 | 9 | ||
10 | DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" | 10 | DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native" |
11 | 11 | ||
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index a1e4386feb..592f116532 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc | |||
@@ -35,9 +35,9 @@ do_compile_prepend() { | |||
35 | sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c | 35 | sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c |
36 | touch makekeys-makekeys.o; | 36 | touch makekeys-makekeys.o; |
37 | if [ "${SITEINFO_BITS}" == "64" ]; then | 37 | if [ "${SITEINFO_BITS}" == "64" ]; then |
38 | ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys | 38 | ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -I${S}/include -o makekeys |
39 | else | 39 | else |
40 | ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys | 40 | ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -I${S}/include -o makekeys |
41 | fi | 41 | fi |
42 | ) | 42 | ) |
43 | if [ "$?" != "0" ]; then | 43 | if [ "$?" != "0" ]; then |
diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb index 04805d74f4..a65ab1faad 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.5.0.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require libx11.inc | 1 | require libx11.inc |
2 | inherit gettext | 2 | inherit gettext |
3 | 3 | ||
4 | PR = "r0" | 4 | PR = "r1" |
5 | 5 | ||
6 | BBCLASSEXTEND = "native nativesdk" | 6 | BBCLASSEXTEND = "native nativesdk" |
7 | 7 | ||