diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics/piglit')
6 files changed, 203 insertions, 38 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch new file mode 100644 index 000000000..2e1c9476f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch @@ -0,0 +1,41 @@ +Backport patch to fix build with gold linker. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Backport + + + +From 93a7113485cf1c55fd7076116faf5b3a690706b2 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 30 Aug 2016 17:17:28 +0300 +Subject: [PATCH] cmake: Link test utils with "-ldl" + +Without this linking CXX executables (e.g. fbo-blit-stretch) fails +with gold linker: + +| libpiglitutil_gl.so.0: error: undefined reference to 'dlsym' +| libpiglitutil_gl.so.0: error: undefined reference to 'dlerror' +| libpiglitutil_gl.so.0: error: undefined reference to 'dlopen' + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Reviewed-by: Emil Velikov <emil.velikov@collabora.com> +--- + tests/util/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt +index e1f8073..3d5bef5 100644 +--- a/tests/util/CMakeLists.txt ++++ b/tests/util/CMakeLists.txt +@@ -11,6 +11,8 @@ set_source_files_properties( + PROPERTIES GENERATED 1 + ) + ++link_libraries(${CMAKE_DL_LIBS}) ++ + if(HAVE_LIBCACA) + link_libraries(caca) + endif() +-- +2.9.3 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch new file mode 100644 index 000000000..845804dd6 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch @@ -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: Accepted +--- + 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 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch new file mode 100644 index 000000000..e07e810a7 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch @@ -0,0 +1,35 @@ +From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 13 Jul 2016 19:19:02 +0300 +Subject: [PATCH] cmake: install bash-completions in the right place + +The completionsdir variable is a full path and should not be +prefixed. + +This does mean the files may be installed outside of +CMAKE_INSTALL_PREFIX -- the alternative is more difficult and +means that bash completion files may be installed where +bash-completion can't find them. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Submitted [mailing list] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8e2abba..784a8f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -532,7 +532,7 @@ install ( + if (BASH_COMPLETION_FOUND) + install( + FILES completions/bash/piglit +- DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/ ++ DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/ + ) + endif (BASH_COMPLETION_FOUND) + +-- +2.8.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch deleted file mode 100644 index c27cc04f0..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> - -From e40e0a25f996d2e205c4bdec2c8a5cc7f74e5065 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Mon, 15 Jun 2015 16:25:30 -0300 -Subject: tests: Fix missing include of Xutil.h - -The EGL tests rely on Xutil.h being included. Some EGL implementation -does not explitly include it by default and then the build fails. - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> -Reviewed-by: Neil Roberts <neil@linux.intel.com> - -diff --git a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c -index 0504a26..154b55c 100644 ---- a/tests/egl/egl-configless-context.c -+++ b/tests/egl/egl-configless-context.c -@@ -32,6 +32,7 @@ - /* Chunks of code in this file are taken from egl-util.c */ - - #include <X11/Xlib.h> -+#include <X11/Xutil.h> - - #include "piglit-util-gl.h" - #include "piglit-util-egl.h" --- -cgit v0.10.2 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch new file mode 100644 index 000000000..f851a92ce --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch @@ -0,0 +1,54 @@ +From 0fc2c2932699cfd68be96c820fddfdd79b48b788 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 9 Jul 2016 07:52:19 +0000 +Subject: [PATCH] tests: Use FE_UPWARD only if its defined in fenv.h + +On ARM, musl does not define FE_* when arch does not have +VFP, (which is right interpretation), therefore check if +its defined before using it + +Fixes errors like + +tests/general/roundmode-pixelstore.c:82:19: error: 'FE_UPWARD' undeclared (first use in this function) + ret = fesetround(FE_UPWARD); + ^~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + tests/general/roundmode-getintegerv.c | 2 ++ + tests/general/roundmode-pixelstore.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c +index 28ecfaf..5c27579 100644 +--- a/tests/general/roundmode-getintegerv.c ++++ b/tests/general/roundmode-getintegerv.c +@@ -81,7 +81,9 @@ piglit_init(int argc, char **argv) + { + int ret; + bool pass = true; ++#ifdef FE_UPWARD + ret = fesetround(FE_UPWARD); ++#endif + if (ret != 0) { + printf("Couldn't set rounding mode\n"); + piglit_report_result(PIGLIT_SKIP); +diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c +index 9284f43..3fcb396 100644 +--- a/tests/general/roundmode-pixelstore.c ++++ b/tests/general/roundmode-pixelstore.c +@@ -79,7 +79,9 @@ piglit_init(int argc, char **argv) + { + int ret; + bool pass = true; ++#ifdef FE_UPWARD + ret = fesetround(FE_UPWARD); ++#endif + if (ret != 0) { + printf("Couldn't set rounding mode\n"); + piglit_report_result(PIGLIT_SKIP); +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb index 607f236c2..82adcdeca 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -3,18 +3,22 @@ LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" SRC_URI = "git://anongit.freedesktop.org/piglit \ - file://0001-tests-Fix-missing-include-of-Xutil.h.patch" - -# From 2015-02-19 -SRCREV = "c4585427913e4cb28994b4bfb11d49778273aa2c" + 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 \ + file://0001-cmake-Link-test-utils-with-ldl.patch \ + " + +# From 2016-07-07 +SRCREV = "c39e41a86551eb390b8da23232dc8577639403d0" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native" +DEPENDS = "libpng virtual/libx11 libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native" -inherit cmake pythonnative distro_features_check +inherit cmake python3native distro_features_check bash-completion # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" @@ -34,10 +38,15 @@ do_configure_prepend() { fi } -RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \ - python-argparse python-importlib python-unixadmin python-xml \ - python-multiprocessing python-textutils python-netserver python-shell \ +do_install() { + oe_runmake -C ${B} 'DESTDIR=${D}' install/strip +} + +RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \ + python3-subprocess python3-misc python3-importlib \ + python3-unixadmin python3-xml python3-multiprocessing \ + python3-six python3-shell python3-io python3-argparse \ mesa-demos bash \ " -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP_${PN} += "dev-so already-stripped" |