From patchwork Wed Feb 6 16:15:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 157650 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6590913jaa; Wed, 6 Feb 2019 08:15:30 -0800 (PST) X-Google-Smtp-Source: AHgI3IbjpXtmzi/pqiEYUFvSsvn6I9gPHEUPfD0O9K5dGS0WQZ4vFVSirEpER/Aa+I0VS5WFBM4z X-Received: by 2002:a62:1c0a:: with SMTP id c10mr11235056pfc.213.1549469730353; Wed, 06 Feb 2019 08:15:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549469730; cv=none; d=google.com; s=arc-20160816; b=wqRL848gTnZ6uKeYh2u/Xq0G1Mr0qXOmSiUFWDabkgaIyOp7tyB82qkIClLwNK0AFZ wfYYZVvRnkTS9kRwNeQyRvai4WvUyvPC4MoSW/dkB1RENDTxkoNqoqY7nzc0Ox9vF/xl T+bknlkwaUsfWj6+nC4m2hMI1aan70/Y9XBMJmGtV1R52OFGfqWmf/QwpC+/vlSd2dZk dVUAvkO8yAkUc/NiGhCHG5aC8WtOdfytBbwhnRWpQRmmMR5mvNBoLWNogh5JTa9l1xh3 wUA7OTWpTIdZLtYEesvFVwERS/0K8lg1/+O3JDzN5R/uOV9wObncuH1Btyczp9v7aaoX NCyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=mAnjroXBCgoISn1+YWsvJWsbjKEJBaWnWVzxBxg+hzc=; b=qISOuEry6Mt2i1YXiQ2p9adStrJsgt3wWavZPybVf9ZCc0RrpIWFVa2MLxjKgBa3uR qSNF3YRERTnjyKxfjetWnZ4a99aMMnJY9C/y+hHK1Ylm4xBbPZTP9RooexKAiv1aVDf1 psFYGZip0WmEdameNZYoaljNUkpcRTUfa3/eANV+itejlciTT+5uZvCgw1p1F3IpVqir EmbYDF5f8hhrGv3wF2u98hDisiY2x0t42Mw1l7Kez9Ptj3IMKG4v7TFiwWGz537ma1VM MjZRpdckWpNkWvQ4N7pAIPjtcLziW+h7BaDzwPwOlpxb2GgAkDiukgATB5bwTogrnJFZ 9TUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=nRfUeBwQ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id l23si6075004pgh.533.2019.02.06.08.15.29; Wed, 06 Feb 2019 08:15:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=nRfUeBwQ; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 3195E79CE4; Wed, 6 Feb 2019 16:15:25 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id 2E66B6B06C for ; Wed, 6 Feb 2019 16:15:22 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id a16so8255277wrv.0 for ; Wed, 06 Feb 2019 08:15:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=VQ1PcbSLC10lbS9jo+we9vL2/i+52TBTQ8ZvmLTBerc=; b=nRfUeBwQ8ZSV21CnWBDtwCYUIK858D5kRLMmyWy2xBR1D8FMXQI3lYtG4bYxZWfeRt QAJutnK323uxXf7pd8Q/Su1JeWzEcZp9REYMdwrX+EsKGyUZ8NJWoXzFcvcys0CAytJx 3HPFi5lc60L5Ck/QmebMm1Pah//dvB3vn6Hd6/c4CuPRaUPaC/vEBrVCAQUOBSs+4rei DBTzbAD49h0lYJWHsLC9MdT8pZfdf6N0DMLGPzsCNVKOuVb0owhwsFubwef5lp0zziim dfCP26KEQaVxYkx9OaQR3+7xNF66neoQy1PvyKO1beKQfHD5waEuRBqDLPVLwh0pSLr/ x97Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=VQ1PcbSLC10lbS9jo+we9vL2/i+52TBTQ8ZvmLTBerc=; b=cDE6mlkJpAVBdQq0g9XI4GxdSq/d7475DLOqdiOiYCpNlBpeoGo3ZyG/h93MJ/VuJ8 jqDPQgtniIDeGCm12xCR03UL9bClQUjQWBpoi7kf5IJGsJEdA60YEvWPRfA6sPsqPRlC rWZAWXZ4qkRh7BLvD6sC/Eu/J3I8JE9qeogmkw3liVpInS2PCJTDyKSA+ZP89MdQNywX ldA0Ukpyk4vGdjic/SORb7XI8N9JNVszWGKC2aeaxDrWhZxiiIicbsXc/fpB/UaujyBh xU5ldWUAex0zTD2ugEPs5Sw0/GYXjoM8TKVBUlXWm4HhPIc4Tiy4Fol+Ot5S9LwuSIRW CYcQ== X-Gm-Message-State: AHQUAuYutRp3Eei5HSl8YnJmTvymY6qXzOMpIXdqrQyB/DzkHzeTzKyf 5Lvg5JugJYiy0ALh1XcryrvhDX+sQL0= X-Received: by 2002:a5d:47d1:: with SMTP id l17mr8412587wrs.319.1549469722894; Wed, 06 Feb 2019 08:15:22 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id a4sm7619742wmm.22.2019.02.06.08.15.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Feb 2019 08:15:22 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Wed, 6 Feb 2019 16:15:19 +0000 Message-Id: <20190206161519.2078-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [oe] [PATCH] glmark2: update to current git X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Remove two patches merged upstream. The other patch isn't required so can be deleted. Remove explicit --std=c++11 as the wscript adds --std=c++14 now. Change PV to contain the full date just in case we want to update more than once a month. Signed-off-by: Ross Burton --- .../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 ---------------------- meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 13 ++----- 4 files changed, 3 insertions(+), 105 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch delete mode 100644 meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch delete mode 100644 meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch -- 2.11.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch b/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch deleted file mode 100644 index cdf09faec8..0000000000 --- a/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-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch b/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch deleted file mode 100644 index 7de05ee583..0000000000 --- a/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-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch b/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-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-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 99050e7047..7ed5cd0281 100644 --- a/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/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"