mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 03:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

piglit: Add build fix patch

Browse Source 
Fixes [YOCTO #9851] (fingers crossed).

(From OE-Core rev: 913149f269679bda87badb94e1de66646fdc5362)

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>
This commit is contained in:
Jussi Kukkonen
2016-07-19 15:16:35 +03:00
committed by Richard Purdie
parent ad625f7f9b
commit 0e63414bc3
2 changed files with 55 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch Normal file
View File

@@ -0,0 +1,54 @@
From 73e4fbc5777eddd89bb0fb16e90343551fe3e0ef Mon Sep 17 00:00:00 2001
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Tue, 5 Jul 2016 10:56:23 +0300
Subject: [PATCH] cmake: Link utils with xcb explicitly
Linking with g++ can reportedly lead to:
libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect'
libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup'
libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator'
This may have appeared now because xcb-dri2 used to overlink publicly
but now does not.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Upstream-Status: Pending
---
CMakeLists.txt | 1 +
tests/util/CMakeLists.txt | 2 ++
2 files changed, 3 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e2abba..2e1a473 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,6 +151,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
pkg_check_modules(LIBDRM QUIET libdrm)
pkg_check_modules(LIBDRM_INTEL QUIET libdrm_intel)
+ pkg_check_modules(XCB QUIET xcb)
pkg_check_modules(XCB_DRI2 QUIET xcb-dri2)
pkg_check_modules(GLPROTO QUIET glproto)
ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index fb22ffa..e1f8073 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -121,11 +121,13 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
list(APPEND UTIL_GL_LIBS
${LIBDRM_LDFLAGS}
+ ${XCB_LDFLAGS}
${XCB_DRI2_LDFLAGS}
)
list(APPEND UTIL_GL_INCLUDES
${LIBDRM_INCLUDE_DIRS}
+ ${XCB_INCLUDE_DIRS}
${XCB_DRI2_INCLUDE_DIRS}
)
--
2.1.4

1
meta/recipes-graphics/piglit/piglit_git.bb
View File

@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
SRC_URI = "git://anongit.freedesktop.org/piglit \
file://0001-cmake-install-bash-completions-in-the-right-place.patch \
file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
file://0001-cmake-Link-utils-with-xcb-explicitly.patch \
"
# From 2016-07-07