summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2017-02-14 11:55:06 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:49:50 -0800
commitbdf3009a254ae6e3066e0b58f948f7bd71b3c260 (patch)
treed70bd6a7b0eebf4e944c8809f741b93761ca4f75
parent6df1d58cf2d7897f8c10a2538f4a49a248f2d8f9 (diff)
downloadpoky-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>
-rw-r--r--meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch41
-rw-r--r--meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch54
-rw-r--r--meta/recipes-graphics/piglit/piglit_git.bb10
3 files changed, 4 insertions, 101 deletions
diff --git a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch b/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch
deleted file mode 100644
index 2e1c9476f2..0000000000
--- a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1Backport patch to fix build with gold linker.
2
3Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
4Upstream-Status: Backport
5
6
7
8From 93a7113485cf1c55fd7076116faf5b3a690706b2 Mon Sep 17 00:00:00 2001
9From: Jussi Kukkonen <jussi.kukkonen@intel.com>
10Date: Tue, 30 Aug 2016 17:17:28 +0300
11Subject: [PATCH] cmake: Link test utils with "-ldl"
12
13Without this linking CXX executables (e.g. fbo-blit-stretch) fails
14with gold linker:
15
16| libpiglitutil_gl.so.0: error: undefined reference to 'dlsym'
17| libpiglitutil_gl.so.0: error: undefined reference to 'dlerror'
18| libpiglitutil_gl.so.0: error: undefined reference to 'dlopen'
19
20Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
21Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
22---
23 tests/util/CMakeLists.txt | 2 ++
24 1 file changed, 2 insertions(+)
25
26diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
27index e1f8073..3d5bef5 100644
28--- a/tests/util/CMakeLists.txt
29+++ b/tests/util/CMakeLists.txt
30@@ -11,6 +11,8 @@ set_source_files_properties(
31 PROPERTIES GENERATED 1
32 )
33
34+link_libraries(${CMAKE_DL_LIBS})
35+
36 if(HAVE_LIBCACA)
37 link_libraries(caca)
38 endif()
39--
402.9.3
41
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 @@
1From 73e4fbc5777eddd89bb0fb16e90343551fe3e0ef Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 5 Jul 2016 10:56:23 +0300
4Subject: [PATCH] cmake: Link utils with xcb explicitly
5
6Linking with g++ can reportedly lead to:
7
8libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect'
9libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup'
10libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator'
11
12This may have appeared now because xcb-dri2 used to overlink publicly
13but now does not.
14
15Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
16Upstream-Status: Accepted
17---
18 CMakeLists.txt | 1 +
19 tests/util/CMakeLists.txt | 2 ++
20 2 files changed, 3 insertions(+)
21
22diff --git a/CMakeLists.txt b/CMakeLists.txt
23index 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")
34diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
35index 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--
532.1.4
54
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index b9cdce8307..d6bfb14e63 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -5,18 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0"
5SRC_URI = "git://anongit.freedesktop.org/piglit \ 5SRC_URI = "git://anongit.freedesktop.org/piglit \
6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \ 6 file://0001-cmake-install-bash-completions-in-the-right-place.patch \
7 file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \ 7 file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \
8 file://0001-cmake-Link-utils-with-xcb-explicitly.patch \
9 file://0001-cmake-Link-test-utils-with-ldl.patch \
10 " 8 "
11 9
12# From 2016-07-07 10# From 2017-02-06
13SRCREV = "c39e41a86551eb390b8da23232dc8577639403d0" 11SRCREV = "ca58eec0b965655c7eba592a634cbf4aadfbc675"
14# (when PV goes above 1.0 remove the trailing r) 12# (when PV goes above 1.0 remove the trailing r)
15PV = "1.0+gitr${SRCPV}" 13PV = "1.0+gitr${SRCPV}"
16 14
17S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
18 16
19DEPENDS = "libpng virtual/libx11 libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native" 17DEPENDS = "libpng virtual/libx11 libxkbcommon libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native"
20 18
21inherit cmake python3native distro_features_check bash-completion 19inherit cmake python3native distro_features_check bash-completion
22# depends on virtual/libx11 20# depends on virtual/libx11
@@ -49,7 +47,7 @@ RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \
49 python3-subprocess python3-misc python3-importlib \ 47 python3-subprocess python3-misc python3-importlib \
50 python3-unixadmin python3-xml python3-multiprocessing \ 48 python3-unixadmin python3-xml python3-multiprocessing \
51 python3-six python3-shell python3-io python3-argparse \ 49 python3-six python3-shell python3-io python3-argparse \
52 mesa-demos bash \ 50 python3-netserver mesa-demos bash \
53 " 51 "
54 52
55INSANE_SKIP_${PN} += "dev-so already-stripped" 53INSANE_SKIP_${PN} += "dev-so already-stripped"