From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../glmark2/files/0001-Fix-clang-warnings.patch | 31 ---------------- .../files/Fix-configure-for-sqrt-check.patch | 21 ----------- ...-packages-to-be-used-by-the-enabled-flavo.patch | 43 ---------------------- .../recipes-benchmark/glmark2/glmark2_git.bb | 13 ++----- 4 files changed, 3 insertions(+), 105 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch delete mode 100644 meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch (limited to 'meta-openembedded/meta-oe/recipes-benchmark/glmark2') diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch deleted file mode 100644 index cdf09faec8..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 35e9f80518d666db5f9c62e8072ffbc307b4af4f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 26 Aug 2017 08:30:01 -0700 -Subject: [PATCH] Fix clang warnings - -../src/native-state-drm.cpp:334:20: error: cannot pass object of non-trivial type 'std::__cxx11::basic_string' through variadic function; call will abort at runtime [-Wnon-pod-varargs] - dev_path); - ^ -1 error generated. - -Signed-off-by: Khem Raj ---- - src/native-state-drm.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp -index dc2b323..62566ee 100644 ---- a/src/native-state-drm.cpp -+++ b/src/native-state-drm.cpp -@@ -331,7 +331,7 @@ static int open_using_udev_scan() - if (!valid_fd(fd)) { - // %m is GLIBC specific... Maybe use strerror here... - Log::error("Tried to use '%s' but failed.\nReason : %m", -- dev_path); -+ dev_path.c_str()); - } - else - Log::debug("Success!\n"); --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch deleted file mode 100644 index 7de05ee583..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9fb298c398f88a63d71432be1410d52fae089063 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein -Date: Mon, 8 Aug 2016 11:39:54 -0500 - ---- - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index ca843f4..eb4a26a 100644 ---- a/wscript -+++ b/wscript -@@ -84,7 +84,7 @@ def configure(ctx): - ctx.check_cc(lib = lib, uselib_store = uselib) - - # Check required functions -- req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])] -+ req_funcs = [('memset', 'string.h', [])] - for func, header, uselib in req_funcs: - ctx.check_cc(function_name = func, header_name = header, - uselib = uselib, mandatory = True) diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch deleted file mode 100644 index 72b8debe56..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Otavio Salvador -Subject: [PATCH] build: Check packages to be used by the enabled flavors -Organization: O.S. Systems Software LTDA. - -The packages shouldn't be dynamically detected otherwise the build -predictability is lost. We now have all packages as mandatory but -dependent of the flavors which use them. - -Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/8] - -Signed-off-by: Otavio Salvador ---- - wscript | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/wscript b/wscript -index cab62a3..e7eaed0 100644 ---- a/wscript -+++ b/wscript -@@ -121,13 +121,17 @@ def configure(ctx): - ('mirclient','mirclient', '0.13', list_contains(ctx.options.flavors, 'mir')), - ('wayland-client','wayland-client', None, list_contains(ctx.options.flavors, 'wayland')), - ('wayland-egl','wayland-egl', None, list_contains(ctx.options.flavors, 'wayland'))] -- for (pkg, uselib, atleast, mandatory) in opt_pkgs: -+ for (pkg, uselib, atleast, check) in opt_pkgs: -+ # Check packages required by the flavors -+ if not check: -+ continue -+ - if atleast is None: - ctx.check_cfg(package = pkg, uselib_store = uselib, -- args = '--cflags --libs', mandatory = mandatory) -+ args = '--cflags --libs', mandatory = True) - else: - ctx.check_cfg(package = pkg, uselib_store = uselib, atleast_version=atleast, -- args = '--cflags --libs', mandatory = mandatory) -+ args = '--cflags --libs', mandatory = True) - - - # Prepend CXX flags so that they can be overriden by the --- -2.4.6 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 99050e7047..7ed5cd0281 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -10,16 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" -PV = "2017.07+${SRCPV}" +PV = "20190205+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" -SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ - file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ - file://Fix-configure-for-sqrt-check.patch \ - file://0001-Fix-clang-warnings.patch \ - " -SRCREV = "ed20c633f1926d1dd78e3e89043c85a81302cbe6" +SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" +SRCREV = "0c90dd48df43a6b0db1d9aabca6298240f4968f7" S = "${WORKDIR}/git" @@ -31,9 +27,6 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gl ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gl wayland-gles2', '', d)} \ drm-gl drm-gles2" -# Enable C++11 features -CXXFLAGS += "-std=c++11" - PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11" PACKAGECONFIG[drm-gl] = ",,virtual/libgl libdrm virtual/libgbm" -- cgit v1.2.3