diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2017-02-14 11:55:06 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-23 12:49:50 -0800 |
commit | bdf3009a254ae6e3066e0b58f948f7bd71b3c260 (patch) | |
tree | d70bd6a7b0eebf4e944c8809f741b93761ca4f75 /meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch | |
parent | 6df1d58cf2d7897f8c10a2538f4a49a248f2d8f9 (diff) | |
download | poky-bdf3009a254ae6e3066e0b58f948f7bd71b3c260.tar.gz |
piglit: Upgrade to current master
Remove backported patches. Add runtime dependency for netserver
(as socketserver was recently moved there) and depend on
libxkbcommon (this is really only needed for wayland support
which could be made configurable).
(From OE-Core rev: 5a3fa55f397bb89f75fb714b1d93aa76125cc09a)
(From OE-Core rev: 87f10ec9ed63794ffd216c752cf14fd68d009d46)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch')
-rw-r--r-- | meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch deleted file mode 100644 index 845804dd66..0000000000 --- a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | From 73e4fbc5777eddd89bb0fb16e90343551fe3e0ef Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 5 Jul 2016 10:56:23 +0300 | ||
4 | Subject: [PATCH] cmake: Link utils with xcb explicitly | ||
5 | |||
6 | Linking with g++ can reportedly lead to: | ||
7 | |||
8 | libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect' | ||
9 | libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup' | ||
10 | libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator' | ||
11 | |||
12 | This may have appeared now because xcb-dri2 used to overlink publicly | ||
13 | but now does not. | ||
14 | |||
15 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
16 | Upstream-Status: Accepted | ||
17 | --- | ||
18 | CMakeLists.txt | 1 + | ||
19 | tests/util/CMakeLists.txt | 2 ++ | ||
20 | 2 files changed, 3 insertions(+) | ||
21 | |||
22 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
23 | index 8e2abba..2e1a473 100644 | ||
24 | --- a/CMakeLists.txt | ||
25 | +++ b/CMakeLists.txt | ||
26 | @@ -151,6 +151,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") | ||
27 | |||
28 | pkg_check_modules(LIBDRM QUIET libdrm) | ||
29 | pkg_check_modules(LIBDRM_INTEL QUIET libdrm_intel) | ||
30 | + pkg_check_modules(XCB QUIET xcb) | ||
31 | pkg_check_modules(XCB_DRI2 QUIET xcb-dri2) | ||
32 | pkg_check_modules(GLPROTO QUIET glproto) | ||
33 | ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") | ||
34 | diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt | ||
35 | index fb22ffa..e1f8073 100644 | ||
36 | --- a/tests/util/CMakeLists.txt | ||
37 | +++ b/tests/util/CMakeLists.txt | ||
38 | @@ -121,11 +121,13 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") | ||
39 | |||
40 | list(APPEND UTIL_GL_LIBS | ||
41 | ${LIBDRM_LDFLAGS} | ||
42 | + ${XCB_LDFLAGS} | ||
43 | ${XCB_DRI2_LDFLAGS} | ||
44 | ) | ||
45 | |||
46 | list(APPEND UTIL_GL_INCLUDES | ||
47 | ${LIBDRM_INCLUDE_DIRS} | ||
48 | + ${XCB_INCLUDE_DIRS} | ||
49 | ${XCB_DRI2_INCLUDE_DIRS} | ||
50 | ) | ||
51 | |||
52 | -- | ||
53 | 2.1.4 | ||
54 | |||