diff options
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch | 28 | ||||
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb_1.14.bb (renamed from meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb) | 6 |
2 files changed, 2 insertions, 32 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch deleted file mode 100644 index 46297c33c3..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | As pkg-config --variable doesn't respect the sysroot, add the pkg-config sysroot | ||
2 | to the beginning of variables that are used later on the host. | ||
3 | |||
4 | Upstream-Status: Pending | ||
5 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
6 | |||
7 | diff --git a/configure.ac b/configure.ac | ||
8 | index 94da4f7..d29cd6a 100644 | ||
9 | --- a/configure.ac | ||
10 | +++ b/configure.ac | ||
11 | @@ -64,7 +64,7 @@ AC_SUBST(NEEDED) | ||
12 | |||
13 | # Find the xcb-proto protocol descriptions | ||
14 | AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) | ||
15 | -XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto` | ||
16 | +XCBPROTO_XCBINCLUDEDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=xcbincludedir xcb-proto` | ||
17 | AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) | ||
18 | AC_SUBST(XCBPROTO_XCBINCLUDEDIR) | ||
19 | |||
20 | @@ -74,7 +74,7 @@ AC_SUBST(XCBPROTO_VERSION) | ||
21 | |||
22 | # Find the xcbgen Python package | ||
23 | AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR) | ||
24 | -XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` | ||
25 | +XCBPROTO_XCBPYTHONDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=pythondir xcb-proto` | ||
26 | AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR) | ||
27 | AC_SUBST(XCBPROTO_XCBPYTHONDIR) | ||
28 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb index 9befc51b50..f27c5daa61 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.14.bb | |||
@@ -9,13 +9,11 @@ SECTION = "x11/libs" | |||
9 | LICENSE = "MIT" | 9 | LICENSE = "MIT" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" |
11 | 11 | ||
12 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ | 12 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ |
13 | file://xcbincludedir.patch \ | ||
14 | file://disable-check.patch \ | 13 | file://disable-check.patch \ |
15 | " | 14 | " |
16 | 15 | ||
17 | SRC_URI[md5sum] = "f33cdfc67346f7217a9326c0d8679975" | 16 | SRC_URI[sha256sum] = "a55ed6db98d43469801262d81dc2572ed124edc3db31059d4e9916eb9f844c34" |
18 | SRC_URI[sha256sum] = "a89fb7af7a11f43d2ce84a844a4b38df688c092bf4b67683aef179cdf2a647c4" | ||
19 | 17 | ||
20 | BBCLASSEXTEND = "native nativesdk" | 18 | BBCLASSEXTEND = "native nativesdk" |
21 | 19 | ||