diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-05-26 20:25:03 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2020-05-26 20:25:03 +0300 |
commit | 35a774200999ac2fca48693c1c169bf99d2f63ea (patch) | |
tree | 0b2f65ce3a90f41d1c2542d0fd20b1604fd83fe5 /poky/meta/recipes-graphics/clutter | |
parent | 497a23ef6661ad6ca7b75009e48a592c1620d46c (diff) | |
download | openbmc-2.8.0-rc1.tar.xz |
Reset the following subtrees on HEAD:
poky: ed3bdd7fbc(dunfell)
meta-raspberrypi: 8066fac91d(dunfell)
meta-security: d83f7cb0c9(dunfell)
meta-openembedded: e413c1ef62(dunfell)
Change-Id: Ifd3228663b08911c890d7631310294cccb3dd232
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/clutter')
-rw-r--r-- | poky/meta/recipes-graphics/clutter/clutter-1.0.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch | 16 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb (renamed from poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb) | 4 |
3 files changed, 12 insertions, 10 deletions
diff --git a/poky/meta/recipes-graphics/clutter/clutter-1.0.inc b/poky/meta/recipes-graphics/clutter/clutter-1.0.inc index 80472178be..e0ac819e4c 100644 --- a/poky/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/poky/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -11,7 +11,7 @@ REQUIRED_DISTRO_FEATURES ?= "opengl" DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" PACKAGE_BEFORE_PN += "${PN}-examples" -AUTOTOOLS_AUXDIR = "${S}/build-aux" +AUTOTOOLS_AUXDIR = "${S}/build" EDEPENDS_X11 = "virtual/libx11 libxi libxfixes" EDEPENDS_GLX = "virtual/libgl" diff --git a/poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch index fef82eaf92..f5c18c5828 100644 --- a/poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch +++ b/poky/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch @@ -1,4 +1,4 @@ -From d6ceb5a44b28e0e50ede22b84984d8516897de4b Mon Sep 17 00:00:00 2001 +From 668e1d14af13249384ab324c7d79ec4147f07e48 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Mon, 27 Apr 2015 20:12:33 +0300 Subject: [PATCH] Run installed tests with tap output @@ -9,15 +9,14 @@ gnome-desktop-testing-runner properly interprets the results. Upstream-Status: Pending Signed-off-by: Tim Orling <TicoTimo@gmail.com> - --- - build-aux/autotools/glib-tap.mk | 3 ++- + build/autotools/glib-tap.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/build-aux/autotools/glib-tap.mk b/build-aux/autotools/glib-tap.mk -index a4f0dad..51cfa31 100644 ---- a/build-aux/autotools/glib-tap.mk -+++ b/build-aux/autotools/glib-tap.mk +diff --git a/build/autotools/glib-tap.mk b/build/autotools/glib-tap.mk +index 7c5f82b..844e17e 100644 +--- a/build/autotools/glib-tap.mk ++++ b/build/autotools/glib-tap.mk @@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_testcases:=.test) %.test: %$(EXEEXT) Makefile $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ @@ -28,3 +27,6 @@ index a4f0dad..51cfa31 100644 mv $@.tmp $@) CLEANFILES += $(installed_test_meta_DATA) +-- +2.1.4 + diff --git a/poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb b/poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb index ee549fbdd5..48b050198a 100644 --- a/poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.4.bb +++ b/poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.2.bb @@ -2,8 +2,8 @@ require clutter-1.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "624dd776a5159de0267587b1df6b97b2" -SRC_URI[archive.sha256sum] = "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6" +SRC_URI[archive.md5sum] = "a03482cbacf735eca8c996f210a21ee5" +SRC_URI[archive.sha256sum] = "e7233314983055e9018f94f56882e29e7fc34d8d35de030789fdcd9b2d0e2e56" SRC_URI += "file://install-examples.patch \ file://run-installed-tests-with-tap-output.patch \ file://0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch \ |