* [PATCH 0/4] Upgrade mesa, piglit
@ 2016-11-16 13:14 Jussi Kukkonen
2016-11-16 13:15 ` [PATCH 1/4] piglit: Package tests in compressed form as well Jussi Kukkonen
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Jussi Kukkonen @ 2016-11-16 13:14 UTC (permalink / raw)
To: openembedded-core
This includes
* Mesa 13.0.1 upgrade
* piglit master upgrade
* piglit test compression patches that I sent earlier
All three are independent of each other.
This passes a quick smoke test and piglit results are ok:
pass: 57334
fail: 345
crash: 1
skip: 7558
warn: 7
total: 65245
Thanks,
Jussi
The following changes since commit 7c3a47ed8965c3a3eb90a9a4678d5caedbba6337:
bitbake: toaster: settings set ALLOWED_HOSTS to * in debug mode (2016-11-16 11:38:44 +0000)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib jku/mesa-piglit
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/mesa-piglit
Jussi Kukkonen (4):
piglit: Package tests in compressed form as well
core-tools-testapps: Re-add piglit
piglit: Upgrade to current master head
mesa: Upgrade 12.0.3 -> 13.0.1
.../packagegroup-core-tools-testapps.bb | 2 +
.../0001-Use-wayland-scanner-in-the-path.patch | 37 +++++++++++++++
.../files/replace_glibc_check_with_linux.patch | 25 ++++++----
.../mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
.../mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} | 5 +-
.../0001-cmake-Link-test-utils-with-ldl.patch | 41 ----------------
...0001-cmake-Link-utils-with-xcb-explicitly.patch | 54 ----------------------
meta/recipes-graphics/piglit/piglit/piglit.sh | 20 ++++++++
meta/recipes-graphics/piglit/piglit_git.bb | 26 +++++++++--
10 files changed, 101 insertions(+), 111 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
rename meta/recipes-graphics/mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} (100%)
rename meta/recipes-graphics/mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} (75%)
delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch
delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch
create mode 100644 meta/recipes-graphics/piglit/piglit/piglit.sh
--
2.1.4
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/4] piglit: Package tests in compressed form as well 2016-11-16 13:14 [PATCH 0/4] Upgrade mesa, piglit Jussi Kukkonen @ 2016-11-16 13:15 ` Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 2/4] core-tools-testapps: Re-add piglit Jussi Kukkonen ` (3 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Jussi Kukkonen @ 2016-11-16 13:15 UTC (permalink / raw) To: openembedded-core Modify packaging so that generated tests are available in two forms: * piglit-generated-tests contains the tests as they are now (1.5GB when installed) * piglit-generated-tests-compressed contains a tar.gz with the same files (45 MB when installed) Add wrapper script that decompresses the tests at runtime: this requires 1.5GB free space. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- meta/recipes-graphics/piglit/piglit/piglit.sh | 20 ++++++++++++++++++++ meta/recipes-graphics/piglit/piglit_git.bb | 20 +++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/piglit/piglit/piglit.sh diff --git a/meta/recipes-graphics/piglit/piglit/piglit.sh b/meta/recipes-graphics/piglit/piglit/piglit.sh new file mode 100644 index 0000000..3308b70 --- /dev/null +++ b/meta/recipes-graphics/piglit/piglit/piglit.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +# If we're using compressed generated tests we may need to +# decompress first. This is going to require at least 1.5 GB of space +if [[ /usr/lib/piglit/generated_tests.tar.gz -nt /usr/lib/piglit/generated_tests/ ]]; then + echo "Decompressing generated tests..." + tar -C /usr/lib/piglit/ -zxf /usr/lib/piglit/generated_tests.tar.gz || { + echo "Failed to decompress tests, exiting." + exit 1 + } + touch /usr/lib/piglit/generated_tests +fi + +if ! [[ -d /usr/lib/piglit/generated_tests ]]; then + echo "NOTE: No generated tests found, install piglit-generated-tests-compressed" + echo " or piglit-generated-tests to include them in the tests." +fi + +echo "Now running piglit..." +PIGLIT_NO_WINDOW=1 piglit.real "$@" diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 82adcde..916154a 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -7,6 +7,7 @@ SRC_URI = "git://anongit.freedesktop.org/piglit \ 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 \ + file://piglit.sh \ " # From 2016-07-07 @@ -39,9 +40,14 @@ do_configure_prepend() { } do_install() { - oe_runmake -C ${B} 'DESTDIR=${D}' install/strip + oe_runmake -C ${B} 'DESTDIR=${D}' install/strip + mv ${D}${bindir}/piglit ${D}${bindir}/piglit.real + install -m 755 ${WORKDIR}/piglit.sh ${D}${bindir}/piglit + tar -C ${D}${libdir}/piglit/ -czf ${D}${libdir}/piglit/generated_tests.tar.gz generated_tests/ } +PACKAGES =+ "${PN}-generated-tests ${PN}-generated-tests-compressed" + RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \ python3-subprocess python3-misc python3-importlib \ python3-unixadmin python3-xml python3-multiprocessing \ @@ -50,3 +56,15 @@ RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \ " INSANE_SKIP_${PN} += "dev-so already-stripped" + +SUMMARY_${PN}-generated-tests = "Generated piglit tests (multiple GB)" +FILES_${PN}-generated-tests = "${libdir}/piglit/generated_tests/*" +CONFLICTS_${PN}-generated-tests = "${PN}-generated-tests-compressed" + +SUMMARY_${PN}-generated-tests-compressed = "Generated piglit tests in compressed archive" +FILES_${PN}-generated-tests-compressed = "${libdir}/piglit/generated_tests.tar.gz" +CONFLICTS_${PN}-generated-tests-compressed = "${PN}-generated-tests" +pkg_postrm_${PN}-generated-tests-compressed () { + rm -rf $D${libdir}/piglit/generated_tests/ +} + -- 2.1.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/4] core-tools-testapps: Re-add piglit 2016-11-16 13:14 [PATCH 0/4] Upgrade mesa, piglit Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 1/4] piglit: Package tests in compressed form as well Jussi Kukkonen @ 2016-11-16 13:15 ` Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 3/4] piglit: Upgrade to current master head Jussi Kukkonen ` (2 subsequent siblings) 4 siblings, 0 replies; 11+ messages in thread From: Jussi Kukkonen @ 2016-11-16 13:15 UTC (permalink / raw) To: openembedded-core Piglit was removed from testapps in 9e227ecb3a because it made sdk images massive. Add piglit back now that the installed size is no longer humongous: it still needs 1.5 GB free space at runtime but the image sizes stay reasonable. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index 3170978..69cfd57 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb @@ -17,6 +17,8 @@ KEXECTOOLS_nios2 ?= "" X11GLTOOLS = "\ mesa-demos \ + piglit \ + piglit-generated-tests-compressed \ " 3GTOOLS = "\ -- 2.1.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 3/4] piglit: Upgrade to current master head 2016-11-16 13:14 [PATCH 0/4] Upgrade mesa, piglit Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 1/4] piglit: Package tests in compressed form as well Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 2/4] core-tools-testapps: Re-add piglit Jussi Kukkonen @ 2016-11-16 13:15 ` Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 Jussi Kukkonen 2016-11-17 8:56 ` [PATCH] libdrm: Upgrade 2.4.71 -> 2.4.73 Jussi Kukkonen 4 siblings, 0 replies; 11+ messages in thread From: Jussi Kukkonen @ 2016-11-16 13:15 UTC (permalink / raw) To: openembedded-core Remove upstreamed patches. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- .../0001-cmake-Link-test-utils-with-ldl.patch | 41 ---------------- ...0001-cmake-Link-utils-with-xcb-explicitly.patch | 54 ---------------------- meta/recipes-graphics/piglit/piglit_git.bb | 6 +-- 3 files changed, 2 insertions(+), 99 deletions(-) delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch delete mode 100644 meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch 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 2e1c947..0000000 --- a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch +++ /dev/null @@ -1,41 +0,0 @@ -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/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 845804d..0000000 --- a/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch +++ /dev/null @@ -1,54 +0,0 @@ -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/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 916154a..6533855 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -5,13 +5,11 @@ 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 \ - file://0001-cmake-Link-test-utils-with-ldl.patch \ file://piglit.sh \ " -# From 2016-07-07 -SRCREV = "c39e41a86551eb390b8da23232dc8577639403d0" +# Head of master 2016-11-16 +SRCREV = "1619c37a88770c9c0d8467939e34ffd337241c14" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" -- 2.1.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 2016-11-16 13:14 [PATCH 0/4] Upgrade mesa, piglit Jussi Kukkonen ` (2 preceding siblings ...) 2016-11-16 13:15 ` [PATCH 3/4] piglit: Upgrade to current master head Jussi Kukkonen @ 2016-11-16 13:15 ` Jussi Kukkonen 2016-11-16 13:39 ` Andreas Müller 2016-11-17 11:48 ` Burton, Ross 2016-11-17 8:56 ` [PATCH] libdrm: Upgrade 2.4.71 -> 2.4.73 Jussi Kukkonen 4 siblings, 2 replies; 11+ messages in thread From: Jussi Kukkonen @ 2016-11-16 13:15 UTC (permalink / raw) To: openembedded-core New major release with OpenGL 4.4 support. Dependency on libudev has been removed. Rebase replace_glibc_check_with_linux.patch. Add patch to find native wayland-scanner. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- .../0001-Use-wayland-scanner-in-the-path.patch | 37 ++++++++++++++++++++++ .../files/replace_glibc_check_with_linux.patch | 25 ++++++++++----- .../mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 2 +- .../mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} | 5 +-- 5 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch rename meta/recipes-graphics/mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} (75%) diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch new file mode 100644 index 0000000..e49695b --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch @@ -0,0 +1,37 @@ +From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 15 Nov 2016 15:20:49 +0200 +Subject: [PATCH] Simplify wayland-scanner lookup + +Don't use pkg-config to lookup the path of a binary that's in the path. + +Alternatively we'd have to prefix the path returned by pkg-config with +PKG_CONFIG_SYSROOT_DIR. + +Upstream-Status: Pending +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e56e35a..a92005a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then + AC_MSG_ERROR([cannot build egl state tracker without EGL library]) + fi + +-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, +- WAYLAND_SCANNER='') +-if test "x$WAYLAND_SCANNER" = x; then +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) +-fi ++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) + + # Do per-EGL platform setups and checks + egl_platforms=`IFS=', '; echo $with_egl_platforms` +-- +2.1.4 + diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch index e4461ef..0280ee8 100644 --- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch +++ b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch @@ -2,16 +2,25 @@ endianness check is OS wide and not specific to libc Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h -=================================================================== ---- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h -+++ mesa-11.1.1/src/gallium/include/pipe/p_config.h -@@ -130,7 +130,7 @@ - * Endian detection. - */ + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + src/util/u_endian.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/u_endian.h b/src/util/u_endian.h +index b9d563d..2d5eab9 100644 +--- a/src/util/u_endian.h ++++ b/src/util/u_endian.h +@@ -27,7 +27,7 @@ + #ifndef U_ENDIAN_H + #define U_ENDIAN_H --#ifdef __GLIBC__ +-#if defined(__GLIBC__) || defined(ANDROID) +#if defined(__linux__) #include <endian.h> #if __BYTE_ORDER == __LITTLE_ENDIAN +-- +2.1.4 + diff --git a/meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index e4880ff..2f5511e 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d PE = "2" -DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev" +DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native" PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" diff --git a/meta/recipes-graphics/mesa/mesa_12.0.3.bb b/meta/recipes-graphics/mesa/mesa_13.0.1.bb similarity index 75% rename from meta/recipes-graphics/mesa/mesa_12.0.3.bb rename to meta/recipes-graphics/mesa/mesa_13.0.1.bb index acc8353..37ac15f 100644 --- a/meta/recipes-graphics/mesa/mesa_12.0.3.bb +++ b/meta/recipes-graphics/mesa/mesa_13.0.1.bb @@ -3,10 +3,11 @@ require ${BPN}.inc SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ file://replace_glibc_check_with_linux.patch \ file://disable-asm-on-non-gcc.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ " -SRC_URI[md5sum] = "1113699c714042d8c4df4766be8c57d8" -SRC_URI[sha256sum] = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1" +SRC_URI[md5sum] = "72b7f4d0c2407f367484abd201cb8276" +SRC_URI[sha256sum] = "71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -- 2.1.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 2016-11-16 13:15 ` [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 Jussi Kukkonen @ 2016-11-16 13:39 ` Andreas Müller 2016-11-16 14:20 ` Jussi Kukkonen 2016-11-17 11:48 ` Burton, Ross 1 sibling, 1 reply; 11+ messages in thread From: Andreas Müller @ 2016-11-16 13:39 UTC (permalink / raw) To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer On Wed, Nov 16, 2016 at 2:15 PM, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote: > New major release with OpenGL 4.4 support. Dependency on libudev has > been removed. > > Rebase replace_glibc_check_with_linux.patch. > Add patch to find native wayland-scanner. > > Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > --- > .../0001-Use-wayland-scanner-in-the-path.patch | 37 ++++++++++++++++++++++ > .../files/replace_glibc_check_with_linux.patch | 25 ++++++++++----- > .../mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} | 0 > meta/recipes-graphics/mesa/mesa.inc | 2 +- > .../mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} | 5 +-- > 5 files changed, 58 insertions(+), 11 deletions(-) > create mode 100644 meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch > rename meta/recipes-graphics/mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} (100%) > rename meta/recipes-graphics/mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} (75%) > > diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch > new file mode 100644 > index 0000000..e49695b > --- /dev/null > +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch > @@ -0,0 +1,37 @@ > +From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 > +From: Jussi Kukkonen <jussi.kukkonen@intel.com> > +Date: Tue, 15 Nov 2016 15:20:49 +0200 > +Subject: [PATCH] Simplify wayland-scanner lookup > + > +Don't use pkg-config to lookup the path of a binary that's in the path. > + > +Alternatively we'd have to prefix the path returned by pkg-config with > +PKG_CONFIG_SYSROOT_DIR. > + > +Upstream-Status: Pending > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > +--- > + configure.ac | 7 +------ > + 1 file changed, 1 insertion(+), 6 deletions(-) > + > +diff --git a/configure.ac b/configure.ac > +index e56e35a..a92005a 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then > + AC_MSG_ERROR([cannot build egl state tracker without EGL library]) > + fi > + > +-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], > +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, > +- WAYLAND_SCANNER='') > +-if test "x$WAYLAND_SCANNER" = x; then > +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) > +-fi > ++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) > + > + # Do per-EGL platform setups and checks > + egl_platforms=`IFS=', '; echo $with_egl_platforms` > +-- > +2.1.4 > + > diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch > index e4461ef..0280ee8 100644 > --- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch > +++ b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch > @@ -2,16 +2,25 @@ endianness check is OS wide and not specific to libc > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > Upstream-Status: Pending > -Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h > -=================================================================== > ---- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h > -+++ mesa-11.1.1/src/gallium/include/pipe/p_config.h > -@@ -130,7 +130,7 @@ > - * Endian detection. > - */ > + > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > +--- > + src/util/u_endian.h | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/util/u_endian.h b/src/util/u_endian.h > +index b9d563d..2d5eab9 100644 > +--- a/src/util/u_endian.h > ++++ b/src/util/u_endian.h > +@@ -27,7 +27,7 @@ > + #ifndef U_ENDIAN_H > + #define U_ENDIAN_H > > --#ifdef __GLIBC__ > +-#if defined(__GLIBC__) || defined(ANDROID) > +#if defined(__linux__) > #include <endian.h> > > #if __BYTE_ORDER == __LITTLE_ENDIAN > +-- > +2.1.4 > + > diff --git a/meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb > similarity index 100% > rename from meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb > rename to meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc > index e4880ff..2f5511e 100644 > --- a/meta/recipes-graphics/mesa/mesa.inc > +++ b/meta/recipes-graphics/mesa/mesa.inc > @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d > > PE = "2" > > -DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev" > +DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native" > > PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" > > diff --git a/meta/recipes-graphics/mesa/mesa_12.0.3.bb b/meta/recipes-graphics/mesa/mesa_13.0.1.bb > similarity index 75% > rename from meta/recipes-graphics/mesa/mesa_12.0.3.bb > rename to meta/recipes-graphics/mesa/mesa_13.0.1.bb > index acc8353..37ac15f 100644 > --- a/meta/recipes-graphics/mesa/mesa_12.0.3.bb > +++ b/meta/recipes-graphics/mesa/mesa_13.0.1.bb > @@ -3,10 +3,11 @@ require ${BPN}.inc > SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ > file://replace_glibc_check_with_linux.patch \ > file://disable-asm-on-non-gcc.patch \ > + file://0001-Use-wayland-scanner-in-the-path.patch \ > " > > -SRC_URI[md5sum] = "1113699c714042d8c4df4766be8c57d8" > -SRC_URI[sha256sum] = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1" > +SRC_URI[md5sum] = "72b7f4d0c2407f367484abd201cb8276" > +SRC_URI[sha256sum] = "71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731" > > #because we cannot rely on the fact that all apps will use pkgconfig, > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER > -- > 2.1.4 > I had already tested mesa 13.0.0 and ran into similar problems as reported in [1]. So I waited for libdrm which was updated yesterday. Can you prepare an update for libdrm 2.4.73 too - or shall I take care? [1] https://bugs.freedesktop.org/show_bug.cgi?id=98563 Andreas ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 2016-11-16 13:39 ` Andreas Müller @ 2016-11-16 14:20 ` Jussi Kukkonen 0 siblings, 0 replies; 11+ messages in thread From: Jussi Kukkonen @ 2016-11-16 14:20 UTC (permalink / raw) To: Andreas Müller; +Cc: Patches and discussions about the oe-core layer [-- Attachment #1: Type: text/plain, Size: 6890 bytes --] On 16 November 2016 at 15:39, Andreas Müller <schnitzeltony@googlemail.com> wrote: > On Wed, Nov 16, 2016 at 2:15 PM, Jussi Kukkonen > <jussi.kukkonen@intel.com> wrote: > > New major release with OpenGL 4.4 support. Dependency on libudev has > > been removed. > > > > Rebase replace_glibc_check_with_linux.patch. > > Add patch to find native wayland-scanner. > > > > Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > > --- > > .../0001-Use-wayland-scanner-in-the-path.patch | 37 > ++++++++++++++++++++++ > > .../files/replace_glibc_check_with_linux.patch | 25 ++++++++++----- > > .../mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} | 0 > > meta/recipes-graphics/mesa/mesa.inc | 2 +- > > .../mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} | 5 +-- > > 5 files changed, 58 insertions(+), 11 deletions(-) > > create mode 100644 meta/recipes-graphics/mesa/files/0001-Use-wayland- > scanner-in-the-path.patch > > rename meta/recipes-graphics/mesa/{mesa-gl_12.0.3.bb => > mesa-gl_13.0.1.bb} (100%) > > rename meta/recipes-graphics/mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} > (75%) > > > > diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch > b/meta/recipes-graphics/mesa/files/0001-Use-wayland- > scanner-in-the-path.patch > > new file mode 100644 > > index 0000000..e49695b > > --- /dev/null > > +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland- > scanner-in-the-path.patch > > @@ -0,0 +1,37 @@ > > +From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 > > +From: Jussi Kukkonen <jussi.kukkonen@intel.com> > > +Date: Tue, 15 Nov 2016 15:20:49 +0200 > > +Subject: [PATCH] Simplify wayland-scanner lookup > > + > > +Don't use pkg-config to lookup the path of a binary that's in the path. > > + > > +Alternatively we'd have to prefix the path returned by pkg-config with > > +PKG_CONFIG_SYSROOT_DIR. > > + > > +Upstream-Status: Pending > > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > > +--- > > + configure.ac | 7 +------ > > + 1 file changed, 1 insertion(+), 6 deletions(-) > > + > > +diff --git a/configure.ac b/configure.ac > > +index e56e35a..a92005a 100644 > > +--- a/configure.ac > > ++++ b/configure.ac > > +@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a > "x$enable_egl" != xyes; then > > + AC_MSG_ERROR([cannot build egl state tracker without EGL library]) > > + fi > > + > > +-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], > > +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner > wayland-scanner`, > > +- WAYLAND_SCANNER='') > > +-if test "x$WAYLAND_SCANNER" = x; then > > +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) > > +-fi > > ++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) > > + > > + # Do per-EGL platform setups and checks > > + egl_platforms=`IFS=', '; echo $with_egl_platforms` > > +-- > > +2.1.4 > > + > > diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch > b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch > > index e4461ef..0280ee8 100644 > > --- a/meta/recipes-graphics/mesa/files/replace_glibc_check_ > with_linux.patch > > +++ b/meta/recipes-graphics/mesa/files/replace_glibc_check_ > with_linux.patch > > @@ -2,16 +2,25 @@ endianness check is OS wide and not specific to libc > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > Upstream-Status: Pending > > -Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h > > -=================================================================== > > ---- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h > > -+++ mesa-11.1.1/src/gallium/include/pipe/p_config.h > > -@@ -130,7 +130,7 @@ > > - * Endian detection. > > - */ > > + > > +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > > +--- > > + src/util/u_endian.h | 2 +- > > + 1 file changed, 1 insertion(+), 1 deletion(-) > > + > > +diff --git a/src/util/u_endian.h b/src/util/u_endian.h > > +index b9d563d..2d5eab9 100644 > > +--- a/src/util/u_endian.h > > ++++ b/src/util/u_endian.h > > +@@ -27,7 +27,7 @@ > > + #ifndef U_ENDIAN_H > > + #define U_ENDIAN_H > > > > --#ifdef __GLIBC__ > > +-#if defined(__GLIBC__) || defined(ANDROID) > > +#if defined(__linux__) > > #include <endian.h> > > > > #if __BYTE_ORDER == __LITTLE_ENDIAN > > +-- > > +2.1.4 > > + > > diff --git a/meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb > b/meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb > > similarity index 100% > > rename from meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb > > rename to meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb > > diff --git a/meta/recipes-graphics/mesa/mesa.inc > b/meta/recipes-graphics/mesa/mesa.inc > > index e4880ff..2f5511e 100644 > > --- a/meta/recipes-graphics/mesa/mesa.inc > > +++ b/meta/recipes-graphics/mesa/mesa.inc > > @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5= > 899fbe7e42d494c7c8c159c7001693d > > > > PE = "2" > > > > -DEPENDS = "expat makedepend-native flex-native bison-native > libxml2-native udev" > > +DEPENDS = "expat makedepend-native flex-native bison-native > libxml2-native" > > > > PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl > virtual/mesa" > > > > diff --git a/meta/recipes-graphics/mesa/mesa_12.0.3.bb > b/meta/recipes-graphics/mesa/mesa_13.0.1.bb > > similarity index 75% > > rename from meta/recipes-graphics/mesa/mesa_12.0.3.bb > > rename to meta/recipes-graphics/mesa/mesa_13.0.1.bb > > index acc8353..37ac15f 100644 > > --- a/meta/recipes-graphics/mesa/mesa_12.0.3.bb > > +++ b/meta/recipes-graphics/mesa/mesa_13.0.1.bb > > @@ -3,10 +3,11 @@ require ${BPN}.inc > > SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ > > file://replace_glibc_check_with_linux.patch \ > > file://disable-asm-on-non-gcc.patch \ > > + file://0001-Use-wayland-scanner-in-the-path.patch \ > > " > > > > -SRC_URI[md5sum] = "1113699c714042d8c4df4766be8c57d8" > > -SRC_URI[sha256sum] = "1dc86dd9b51272eee1fad3df65e18c > da2e556ef1bc0b6e07cd750b9757f493b1" > > +SRC_URI[md5sum] = "72b7f4d0c2407f367484abd201cb8276" > > +SRC_URI[sha256sum] = "71962fb2bf77d33b0ad4a565b490db > beaf4619099c6d9722f04a73187957a731" > > > > #because we cannot rely on the fact that all apps will use pkgconfig, > > #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER > > -- > > 2.1.4 > > > I had already tested mesa 13.0.0 and ran into similar problems as > reported in [1]. So I waited for libdrm which was updated yesterday. > Can you prepare an update for libdrm 2.4.73 too - or shall I take > care? > > [1] https://bugs.freedesktop.org/show_bug.cgi?id=98563 > Thanks for heads-up, I can send that tomorrow. Jussi [-- Attachment #2: Type: text/html, Size: 10675 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 2016-11-16 13:15 ` [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 Jussi Kukkonen 2016-11-16 13:39 ` Andreas Müller @ 2016-11-17 11:48 ` Burton, Ross 2016-11-17 15:21 ` [PATCHv2 " Jussi Kukkonen 1 sibling, 1 reply; 11+ messages in thread From: Burton, Ross @ 2016-11-17 11:48 UTC (permalink / raw) To: Jussi Kukkonen; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 774 bytes --] On 16 November 2016 at 13:15, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote: > New major release with OpenGL 4.4 support. Dependency on libudev has > been removed. > > Rebase replace_glibc_check_with_linux.patch. > Add patch to find native wayland-scanner. > > Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > This has removed some files: packages/corei7-64-poky-linux/mesa/libgl-mesa-dev: FILELIST: removed "/usr/include/GL/osmesa.h /usr/include/GL/wglext.h /usr/include/GL/mesa_glinterop.h" osmesa is now behind a disabled configure option, so I guess we should make that an option at least, even if we do disable it by default. wglext is Windows specific, and mesa-glinterop.h appears to be internal only, so they're good. Ross [-- Attachment #2: Type: text/html, Size: 1384 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCHv2 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 2016-11-17 11:48 ` Burton, Ross @ 2016-11-17 15:21 ` Jussi Kukkonen 0 siblings, 0 replies; 11+ messages in thread From: Jussi Kukkonen @ 2016-11-17 15:21 UTC (permalink / raw) To: openembedded-core New major release with OpenGL 4.4 support. Dependency on libudev has been removed. * Rebase replace_glibc_check_with_linux.patch * Add patch to find native wayland-scanner * Add PACKAGECONFIG[osmesa], disabled by default * package osmesa header correctly Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- Changes since v1: * Add PACKAGECONFIG[osmesa], disabled by default * package osmesa header correctly I've force pushed the branch: git://git.yoctoproject.org/poky-contrib jku/mesa-piglit http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/mesa-piglit Thanks, Jussi .../0001-Use-wayland-scanner-in-the-path.patch | 37 ++++++++++++++++++++++ .../files/replace_glibc_check_with_linux.patch | 25 ++++++++++----- .../mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 7 ++-- .../mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} | 5 +-- 5 files changed, 62 insertions(+), 12 deletions(-) create mode 100644 meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch rename meta/recipes-graphics/mesa/{mesa-gl_12.0.3.bb => mesa-gl_13.0.1.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_12.0.3.bb => mesa_13.0.1.bb} (75%) diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch new file mode 100644 index 0000000..e49695b --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch @@ -0,0 +1,37 @@ +From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 15 Nov 2016 15:20:49 +0200 +Subject: [PATCH] Simplify wayland-scanner lookup + +Don't use pkg-config to lookup the path of a binary that's in the path. + +Alternatively we'd have to prefix the path returned by pkg-config with +PKG_CONFIG_SYSROOT_DIR. + +Upstream-Status: Pending +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e56e35a..a92005a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then + AC_MSG_ERROR([cannot build egl state tracker without EGL library]) + fi + +-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, +- WAYLAND_SCANNER='') +-if test "x$WAYLAND_SCANNER" = x; then +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) +-fi ++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) + + # Do per-EGL platform setups and checks + egl_platforms=`IFS=', '; echo $with_egl_platforms` +-- +2.1.4 + diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch index e4461ef..0280ee8 100644 --- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch +++ b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch @@ -2,16 +2,25 @@ endianness check is OS wide and not specific to libc Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending -Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h -=================================================================== ---- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h -+++ mesa-11.1.1/src/gallium/include/pipe/p_config.h -@@ -130,7 +130,7 @@ - * Endian detection. - */ + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + src/util/u_endian.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/u_endian.h b/src/util/u_endian.h +index b9d563d..2d5eab9 100644 +--- a/src/util/u_endian.h ++++ b/src/util/u_endian.h +@@ -27,7 +27,7 @@ + #ifndef U_ENDIAN_H + #define U_ENDIAN_H --#ifdef __GLIBC__ +-#if defined(__GLIBC__) || defined(ANDROID) +#if defined(__linux__) #include <endian.h> #if __BYTE_ORDER == __LITTLE_ENDIAN +-- +2.1.4 + diff --git a/meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb b/meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_12.0.3.bb rename to meta/recipes-graphics/mesa/mesa-gl_13.0.1.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index e4880ff..4ec4961 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d PE = "2" -DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native udev" +DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native" PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" @@ -64,6 +64,9 @@ PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" +OSMESA = "${@bb.utils.contains('PACKAGECONFIG', 'gallium', 'gallium-osmesa', 'osmesa', d)}" +PACKAGECONFIG[osmesa] = "--enable-${OSMESA},--disable-${OSMESA}" + # Mesa requires one of the following crypto implementation, pick one of them MESA_CRYPTO ??= "openssl" PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" @@ -183,7 +186,7 @@ FILES_libglapi-dev = "${libdir}/libglapi.*" FILES_libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" FILES_libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" FILES_libgles3-mesa-dev = "${includedir}/GLES3" -FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h ${libdir}/pkgconfig/osmesa.pc" +FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayland-egl.*" FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ diff --git a/meta/recipes-graphics/mesa/mesa_12.0.3.bb b/meta/recipes-graphics/mesa/mesa_13.0.1.bb similarity index 75% rename from meta/recipes-graphics/mesa/mesa_12.0.3.bb rename to meta/recipes-graphics/mesa/mesa_13.0.1.bb index acc8353..37ac15f 100644 --- a/meta/recipes-graphics/mesa/mesa_12.0.3.bb +++ b/meta/recipes-graphics/mesa/mesa_13.0.1.bb @@ -3,10 +3,11 @@ require ${BPN}.inc SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ file://replace_glibc_check_with_linux.patch \ file://disable-asm-on-non-gcc.patch \ + file://0001-Use-wayland-scanner-in-the-path.patch \ " -SRC_URI[md5sum] = "1113699c714042d8c4df4766be8c57d8" -SRC_URI[sha256sum] = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1" +SRC_URI[md5sum] = "72b7f4d0c2407f367484abd201cb8276" +SRC_URI[sha256sum] = "71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -- 2.1.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH] libdrm: Upgrade 2.4.71 -> 2.4.73 2016-11-16 13:14 [PATCH 0/4] Upgrade mesa, piglit Jussi Kukkonen ` (3 preceding siblings ...) 2016-11-16 13:15 ` [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 Jussi Kukkonen @ 2016-11-17 8:56 ` Jussi Kukkonen 2016-11-17 9:46 ` Andreas Müller 4 siblings, 1 reply; 11+ messages in thread From: Jussi Kukkonen @ 2016-11-17 8:56 UTC (permalink / raw) To: openembedded-core Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- I've pushed this into the mesa-piglit update branch: git://git.yoctoproject.org/poky-contrib jku/mesa-piglit http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/mesa-piglit Thanks, Jussi meta/recipes-graphics/drm/{libdrm_2.4.71.bb => libdrm_2.4.73.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/drm/{libdrm_2.4.71.bb => libdrm_2.4.73.bb} (93%) diff --git a/meta/recipes-graphics/drm/libdrm_2.4.71.bb b/meta/recipes-graphics/drm/libdrm_2.4.73.bb similarity index 93% rename from meta/recipes-graphics/drm/libdrm_2.4.71.bb rename to meta/recipes-graphics/drm/libdrm_2.4.73.bb index 152cf55..3315014 100644 --- a/meta/recipes-graphics/drm/libdrm_2.4.71.bb +++ b/meta/recipes-graphics/drm/libdrm_2.4.73.bb @@ -16,8 +16,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \ " -SRC_URI[md5sum] = "776bccc84618b616fc57a7143836ae7a" -SRC_URI[sha256sum] = "c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8" +SRC_URI[md5sum] = "bc1cee09cde72ffe3b952e8f50ccdaa8" +SRC_URI[sha256sum] = "96bfd39242fe168017d95f22e141645a35591f5902a7d98c2fa4ca8c31df5e4d" inherit autotools pkgconfig manpages -- 2.1.4 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] libdrm: Upgrade 2.4.71 -> 2.4.73 2016-11-17 8:56 ` [PATCH] libdrm: Upgrade 2.4.71 -> 2.4.73 Jussi Kukkonen @ 2016-11-17 9:46 ` Andreas Müller 0 siblings, 0 replies; 11+ messages in thread From: Andreas Müller @ 2016-11-17 9:46 UTC (permalink / raw) To: Jussi Kukkonen; +Cc: Patches and discussions about the oe-core layer On Thu, Nov 17, 2016 at 9:56 AM, Jussi Kukkonen <jussi.kukkonen@intel.com> wrote: > Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> > --- > > I've pushed this into the mesa-piglit update branch: > > git://git.yoctoproject.org/poky-contrib jku/mesa-piglit > http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/mesa-piglit > > Thanks, > Jussi > > > meta/recipes-graphics/drm/{libdrm_2.4.71.bb => libdrm_2.4.73.bb} | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > rename meta/recipes-graphics/drm/{libdrm_2.4.71.bb => libdrm_2.4.73.bb} (93%) > > diff --git a/meta/recipes-graphics/drm/libdrm_2.4.71.bb b/meta/recipes-graphics/drm/libdrm_2.4.73.bb > similarity index 93% > rename from meta/recipes-graphics/drm/libdrm_2.4.71.bb > rename to meta/recipes-graphics/drm/libdrm_2.4.73.bb > index 152cf55..3315014 100644 > --- a/meta/recipes-graphics/drm/libdrm_2.4.71.bb > +++ b/meta/recipes-graphics/drm/libdrm_2.4.73.bb > @@ -16,8 +16,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ > file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \ > " > > -SRC_URI[md5sum] = "776bccc84618b616fc57a7143836ae7a" > -SRC_URI[sha256sum] = "c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8" > +SRC_URI[md5sum] = "bc1cee09cde72ffe3b952e8f50ccdaa8" > +SRC_URI[sha256sum] = "96bfd39242fe168017d95f22e141645a35591f5902a7d98c2fa4ca8c31df5e4d" > > inherit autotools pkgconfig manpages > > -- > 2.1.4 > Thanks! Andreas ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-11-17 15:21 UTC | newest] Thread overview: 11+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-11-16 13:14 [PATCH 0/4] Upgrade mesa, piglit Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 1/4] piglit: Package tests in compressed form as well Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 2/4] core-tools-testapps: Re-add piglit Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 3/4] piglit: Upgrade to current master head Jussi Kukkonen 2016-11-16 13:15 ` [PATCH 4/4] mesa: Upgrade 12.0.3 -> 13.0.1 Jussi Kukkonen 2016-11-16 13:39 ` Andreas Müller 2016-11-16 14:20 ` Jussi Kukkonen 2016-11-17 11:48 ` Burton, Ross 2016-11-17 15:21 ` [PATCHv2 " Jussi Kukkonen 2016-11-17 8:56 ` [PATCH] libdrm: Upgrade 2.4.71 -> 2.4.73 Jussi Kukkonen 2016-11-17 9:46 ` Andreas Müller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox