From 996bc45c6b2ab1ef612fa4710088373f1f627ea9 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Mon, 2 Dec 2019 13:05:15 -0500 Subject: meta-openembedded: subtree update:e4ac09169d..459dbf1078 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Alex Kiernan (1): leveldb: Upgrade 1.20 -> 1.22 Cengiz Can (1): recipes-support: gperftools: RDEPENDS for pprof Changqing Li (2): python3-django: upgrade 1.11.14 -> 2.2.7 python-sqlparse/python3-sqlparse: move from meta-cloud-services Christopher Larson (1): kconfig-frontends: drop unneeded target flex/bison deps Daniels Umanovskis (1): gattlib: add recipe Fabio Berton (3): mdbus2: Add recipe jpnevulator: Add recipe emlog: Add recipe Jacopo Dall'Aglio (1): python-netifaces: add recipes Khem Raj (8): packagegroup-meta-oe: Drop gperftools for mips/musl as well python-slip-dbus: Add missing rdep on six module htop: Use python3 pidgin: Use python3 mercurial: Upgrade to 5.2 and switch to py3 a2jmidid: Upgrade to release 9 pidgin: Use python3 during build tvheadend: Demand use of py3 during build Lei YU (1): googletest: Add PV and set to 1.10.0 Leon Anavi (1): stalonetray: Add a simple stand-alone system tray Li Zhou (1): libssh2: Security Advisory - libssh2 - CVE-2019-17498 Michael Haener (1): libmbim: upgrade 1.20.0 -> 1.20.2 Nicola Lunghi (2): python-configargparse: add package (version 0.15.1) python3-dbussy: add recipe (v1.2.1) Qi.Chen@windriver.com (1): python3-pid: upgrade to 2.2.5 Ross Burton (3): glmark2: upgrade to latest HEAD glmark2: use Python 3 to build jack: upgrade to 1.19.14 Ulrich Ölmann (1): python3-yarl: add missing dependencies Zang Ruochen (6): p910nd: upgrade 0.95 -> 0.97 links: upgrade 2.16 -> 2.20.2 links-x11: upgrade 2.16 -> 2.20.2 libmicrohttpd: upgrade 0.9.67 -> 0.9.68 gsoap: upgrade 2.8.51 -> 2.8.95 mksh: upgrade 56 -> 57 Zheng Ruoqin (1): libsdl: Refresh patch zhangxiao (1): syslog-ng: Fix multilib header conflict - syslog-ng-config.h Change-Id: I8557e00b893b61c10ee305fb3229db773b4b894f Signed-off-by: Brad Bishop --- .../meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch | 12 ++++++++++++ .../meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch (limited to 'meta-openembedded/meta-oe/recipes-benchmark') diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch new file mode 100644 index 000000000..df208cf87 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2/python3.patch @@ -0,0 +1,12 @@ +Use Python 3 instead of Python 2. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/waf b/waf +index 6ce2a24..de3c898 100755 +--- a/waf ++++ b/waf +@@ -1 +1 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 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 d590b0501..50b553c80 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -10,12 +10,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" -PV = "20190205+${SRCPV}" +PV = "20190904+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" -SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" -SRCREV = "c17fd14505f30d9e4dbad276f7aa956fd21a637b" +SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https \ + file://python3.patch" +SRCREV = "24a1139dcbfd86bd02065316eaa90559e39374e1" S = "${WORKDIR}/git" -- cgit v1.2.3