Commit Graph

27 Commits

Author SHA1 Message Date
Upgrade Helper
b7f72b6d88 waffle: upgrade 1.7.0 -> 1.7.2
The Waffle bugfix release 1.7.1 is now available.

What is new in this release:
  - cmake: pass deps' cflags to the build
  - gbm: fix crash when platform lacks modifier support
  - gitlab-ci: stabilise CI runs under X
  - gitlab-ci: add more warnings, make all warnings fatal
  - gitlab-ci: update to bullseye
  - meson: add override_* support, when using waffle as submodule
  - meson: skip installing bash completion when custom prefix is used
  - meson: silence deprecation warnings
  - meson: generate cmake files only on Windows
  - meson: find wayland.xml from wayland-scanner.pc
  - misc: zsh completion
  - misc: fix dozens of compiler warnings
  - misc: update website references
  - wayland: fix build against wayland 1.20

The Waffle bugfix release 1.7.2 is now available.

What is new in this release:
  - all: use format(gnu_printf), enable in mingw
  - meson: don't run TLS checks on mingw
  - wgl: remove unused dummy wgl_error.[ch]

Upstream now only generates CMake files on Windows, so remove all
references to CMake.

A zsh completion is now installed, remove this for now as we don't really
use zsh.

(From OE-Core rev: 6b1d94fe5d8728e3eb152426cde08634d248e1f7)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 94cf6ef11bba381ab6f65b03ed1ed14022438151)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
(cherry picked from commit e4ebfb5c7892488fc834d9837e9a5a4c28eb676f)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
2023-05-30 04:11:15 -10:00
Alexander Kanavin
5b4699fc90 waffle: correctly request wayland-scanner executable
(From OE-Core rev: 05457e7f2a4c379082f8f39480f16b90141dc54f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit cd05e2543bde4175da67781ec6f3eebc143d95d0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-07-25 15:11:46 +01:00
Robert Yang
939142ff9c waffle: The surfaceless-egl and gbm requires opengl
Fixed when opengl is not in DISTRO_FEATURES:
ERROR: Nothing PROVIDES 'virtual/libgbm' (but /path/to/waffle/waffle_1.7.0.bb DEPENDS on or otherwise requires it)

(From OE-Core rev: a762162fa0f51b9c6187fd1fcfaad2f317f8762e)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-04-03 20:47:14 +01:00
Khem Raj
1ac90b6f8c waffle: Use the right dependencies as needed
using virtual/libgl is a broad brush, we can be more specific and ask
for dependencies which are really needed

(From OE-Core rev: d96fdf89efa95dc5e42e01ba970afd3645ced3bc)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-03-24 17:45:29 +00:00
Andrey Zhizhikin
3bf0e3d86b waffle: add wayland-protocols when building with wayland
When 'wayland is selected in ' DISTRO_FEATURES, following build error
occurs during do_configure:

| Run-time dependency wayland-protocols found: NO (tried pkgconfig)
|
| ../git/meson.build:120:2: ERROR: Dependency "wayland-protocols" not found, tried pkgconfig

Add "wayland-protocols" to PACKAGECONFIG to resolve missing dependency.

(From OE-Core rev: a545a0848c6526d58731bc333f2ade0ae926fcc4)

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2022-02-20 16:45:25 +00:00
Chen Qi
50e0aed068 waffle: add cmake-native to DEPENDS
waffle currently requires cmake-native because it has the following lines
in git/src/waffle/meson.build.

  if meson.version().version_compare('>= 0.50')
    cmake = import('cmake')

In case of 'wayland' not being in DISTRO_FEATURES, we will get the
following error at do_configure.

  | ../git/src/waffle/meson.build:233:8: ERROR: Unable to find cmake

So explictly add 'cmake-native' to DEPENDS to solve this problem.

(From OE-Core rev: 19753e7fff81a4252d0095b54d37d52db11e3f56)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-11-16 22:20:33 +00:00
Richard Purdie
ddcf16d1f7 meta: Add explict branch to git SRC_URIs
There is uncertainty about the default branch name in git going forward.
To try and cover the different possible outcomes, add branch names to all
git:// and gitsm:// SRC_URI entries.

This update was made with the script added to contrib in this patch which
aims to help others convert other layers.

(From OE-Core rev: b51c405faf6f8c0365f7533bfaf470d79152a463)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-10-30 18:56:47 +01:00
Alexander Kanavin
aae23182ef waffle: update 1.6.1 -> 1.7.0
(From OE-Core rev: 95acd86a4aeb8d2122285dd1745c77622462d33f)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-10-28 14:16:31 +01:00
Alexander Kanavin
28e8d76683 waffle: convert to git, website is down
(From OE-Core rev: 28391c20044058e05a1bfdacc31a3e876828fb72)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-10-23 17:42:28 +01:00
Richard Purdie
596cbbf615 recipes: Add missing pkgconfig inherit
Various recipes were missing a pkgconfig inherit or pkgconfig-native
dependency despite using pkgconfig.

Add the inherit to igt-gpu-tools/gdb/libmodulemd/libwpe/xwayland/waffle
shaderc/iputils/wpebackend-fdo/lttng-ust/cargo.

(From OE-Core rev: 777d9744570c2dc119dc5d04985896bbb1da5885)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-09-21 23:44:08 +01:00
Richard Purdie
bb6ddc3691 Convert to new override syntax
This is the result of automated script conversion:

scripts/contrib/convert-overrides.py <oe-core directory>

converting the metadata to use ":" as the override character instead of "_".

(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-08-02 15:44:10 +01:00
Meh Mbeh Ida Delphine
1f0b83c5eb recipes-graphics: Add missing HOMEPAGE and DESCRIPTION for recipes.
Fixes: [YOCTO #13471]

(From OE-Core rev: 24eac1fef8892484cc3dede1853d180e0c235120)

Signed-off-by: Ida Delphine <idadelm@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2021-03-02 20:39:35 +00:00
Alexander Kanavin
42e2e1ab4e waffle: upgrade 1.6.0 -> 1.6.1
(From OE-Core rev: 8189d2530180709a53bace1c88de73de5347db1a)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-04 13:27:30 +01:00
Aníbal Limón
ac467533f0 meta/recipes-graphics/waffle: Add python3 dependency
The python3native.bbclass set PYTHON_{LIBRARY, INCLUDE_DIR} pointing to
python target build, a patch was add to use target _sysconfigdata too [1]
but is not available without python3 dependency.

Fixes waffle build when trying to find _sysconfigdata module,

...
| Program python3 found: YES (/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3)
|
| meson.build:36:0: ERROR: <ExternalProgram 'python3' -> ['/home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools
|
| A full log can be found at /home/anibal.limon/linaro/oe-rpb-master/build-410c/tmp-rpb-glibc/work/aarch64-linaro-linux/waffle/1.6.0-r0/build/meson-logs/meson-log.txt
| WARNING: exit code 1 from a shell command.
...

[1] http://git.openembedded.org/openembedded-core/commit/?id=02714c105426b0d687620913c1a7401b386428b6

(From OE-Core rev: d3032809136707b584e7938c01e77da36abc1b00)

Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-02-13 12:19:14 +00:00
Denys Dmytriyenko
9702544b3e distro_features_check: expand with MACHINE_FEATURES and COMBINED_FEATURES, rename
Besides checking DISTRO_FEATURES for required or conflicting features,
being able to check MACHINE_FEATURES and/or COMBINED_FEATURES may also
be useful at times.

Temporarily support the old class name with a warning about future
deprecation.

(From OE-Core rev: 5f4875b950ce199e91f99c8e945a0c709166dc14)

Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-11-21 23:08:19 +00:00
Ross Burton
48a979be54 waffle: upgrade 1.5.2 -> 1.6.0
Switch to Meson instead of CMake.

Add PACKAGECONFIG for surfaceless-egl.

Inherit bash-completion for the new wlinfo completion script.

(From OE-Core rev: 96decf673992b1cd1eebac45a5cd534eef27ebd7)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-08-07 16:08:15 +01:00
Changqing Li
c40482a68e waffle: supprt build waffle without x11
respect DISTRO_FEATURES to make waffle support different platform,
gbm platform is supported by default.

[YOCTO #6077]

(From OE-Core rev: 37dc4ad4a87fb9042dc3e9bb389cedc8b5acadf7)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-04-30 12:05:23 +01:00
Mike Crowe
29fde69fd9 waffle: Rely on cmake.bbclass to put cmake package files in dev package
cmake.bbclass now ensures that ${libdir}/cmake and ${datadir}/cmake end up
in the dev package, so this recipe doesn't need to do so itself.

(From OE-Core rev: f6b4f06c5b11860f02b896286471b5cbb57b66ae)

Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-01-07 14:05:39 +00:00
Leonardo Sandoval
1f3e46b6a1 waffle: fix REQUIRED_DISTRO_FEATURES and PACKAGECONFIG virtual/libgl dependencies
Waffle's REQUIRED_DISTRO_FEATURES statement looks into DEPENDS and if
virtual/libgl is present, it includes opengl as distro feature. However,
in a multilib environment, recipes provides virtual/${MLPREFIX}libgl,
thus waffle recipe needs to include the prefix. Also PACKAGECONFIG
statements need this change in order to properly include the libgl
dependency.

The way this error showed up was in a multilib environment and a distro
not containing opengl, i.e. nodistro, leading the following error when
building world -S none (because opengl was not included as required distro
feature):

    ERROR: Nothing PROVIDES 'virtual/lib32-libgl' (but virtual:multilib:lib32:/meta/recipes-graphics/waffle/waffle_1.5.2.bb DEPENDS on or otherwise requires it). Close matches:
      virtual/lib32-libsdl
      virtual/lib32-libc
      virtual/lib32-libsdl2
    ERROR: Required build target 'lib32-meta-world-pkgdata' has no buildable providers.
    Missing or unbuildable dependency chain was: ['lib32-meta-world-pkgdata', 'meta-world-pkgdata', 'lib32-waffle', 'virtual/lib32-libgl']

    Summary: There were 2 ERROR messages shown, returning a non-zero exit code.

[YOCTO #10900]

(From OE-Core rev: 2e3344a3b6d5c709ab0d368dd171240ab5cc6e22)

Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-31 23:30:03 +01:00
Christopher Larson
99ae8c0919 waffle: add opengl to REQUIRED_DISTRO_FEATURES
Multiple packageconfigs depend upon virtual/libgl, whose providers require the
opengl distro feature.

(From OE-Core rev: 930c5a17b543bef9d5c2efe71680f82993d77269)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-01-05 13:54:06 +00:00
Alexander Kanavin
dff038aad5 waffle: update to 1.5.2
(From OE-Core rev: 7d977e4e9aa4986e59ca99342af8c57e7cfb45e1)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-26 22:49:39 +00:00
Alexander Kanavin
976f0e35c6 package_regex.inc: split the rest of the entries to their recipes
(From OE-Core rev: 73e2555cc7d529a93362b3fcfea3fbc7a4c60ca1)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-08 10:20:52 +00:00
Khem Raj
5942dfec50 waffle: Fix build with musl
Backport needed patches for compilation fixes on musl

(From OE-Core rev: d19772d1f3c9d0a06c10dfb246bb156b575a14c5)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-28 12:00:26 +01:00
Jussi Kukkonen
320d766fe4 waffle: Upgrade 1.3.0 -> 1.5.1
* Update SRC_URI to waffle-gl.org
* Add new cmake files to -dev package
* Inherit lib_package so the new wflinfo binary is packaged properly
* Fix PACKAGECONFIG line for gbm
* Add the not-found configuration for all PACKAGECONFIG options to make
  builds reproducible (the default builds if dependencies are there)

(From OE-Core rev: f58ddacfa153e2bd9fcc79fa1e2c65ae6ef6af02)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-29 10:17:14 +01:00
Robert Yang
b741051080 recipes-graphics: add x11 to REQUIRED_DISTRO_FEATURES
They can't be built withou x11 in DISTRO_FEATURES.

(From OE-Core rev: 908f6f2ded18d5301f428e685bface60335bd791)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-05-14 11:43:58 +01:00
Paul Eggleton
c65e36478f waffle: drop unneeded setting of EXTRA_OECMAKE
base.bbclass already sets EXTRA_OECMAKE when cmake.bbclass is inherited.

(From OE-Core rev: c9959f2a69e7edfe8b9e4a7bc99f0d77f03aff73)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-03-20 11:03:43 +00:00
Ross Burton
971c2e09c6 waffle: add (from meta-oe)
Waffle is needed for Piglit.  This recipe is based on the recipe in meta-oe,
upgraded to the latest upstream 1.3.0.

(From OE-Core rev: 67228f682cb8acc71dd5f8b44af67f529727f780)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-01-14 17:03:57 +00:00