30 Commits
Author SHA1 Message Date
Sébastien Szymanski ec5fffbca0 package/glmark2: bump to version 2023.01
Convert the package to a meson package as recommanded by upstream.
Drop no longer needed patchs.

Fixes: http://autobuild.buildroot.net/results/b32/b3245c4ee8e0b3592b09e0bc57bc0928018936c2
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
[yann.morin.1998@free.fr:
  - drop --prefix=/usr, already passed by the meson-package infra
  - regenerate .checkpackageignore for removed patches
]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2023-05-14 15:36:46 +02:00
Peter Korsgaard e331da62fb package/glmark2: use external waf
Fixes:
http://autobuild.buildroot.net/results/bbd/bbd90f11975b691f694412a6fc3446f37dd7c0aa/

The bundled waf script is too old (1.9.3) for python >= 3.11 as it uses the
'U' modifier to open (universal newlines), which have been deprecated since
python 3.3 and finally removed in 3.11.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2023-02-10 15:10:42 +01:00
Paul Cercueil bacbda92e1 package/glmark2: add patch to fix GCC 12 build
Add a patch cherry-picked from upstream to fix the build with GCC 12.

Upstream commit is d1ca3f53c96dc8a4048b17dc16147a8fac782d4a.
I don't know if it fixes any autobuilder errors, I noticed the bug when
building locally.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-10-31 11:46:07 +01:00
Bernd Kuhls 695fd9bf72 package/glmark2: drm-glesv2 needs libgbm
Fixes build error with defconfig from:
http://autobuild.buildroot.net/results/e393dbfba7c2989fe983df47ea0638c3ba62ae7a/

  Checking for 'libdrm': yes
  Checking for 'gbm'   : not found

after http://patchwork.ozlabs.org/project/buildroot/patch/20200104193919.91589-1-bernd.kuhls@t-online.de/
was applied. Both patches are needed to fix the build error.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2021-11-13 10:50:27 +01:00
Bernd Kuhls 5b401925ba package/glmark2: drm-glesv2 needs libdrm
Fixes:
http://autobuild.buildroot.net/results/58a/58a498fac83cbb55b252ab54cd8db04570bb5ec9/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[yann.morin.1998@free.fr: comment on same line as depends-on]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2021-11-13 10:50:05 +01:00
Bernd Kuhls 4a36af9450 package/glmark2: fix selection of dependencies
Commit 9c068b4be8 (package/glmark2: fix wayland build) extended the set
of required libraries for various "flavor" options by selecting those
libraries from the blind options.

However, those blind options are true as soon as their requirements are
met (the depends on), even when glmark2 itself is not enabled.

This means that extra libraries are pulled in to the build, even when
not required.

We fix that by moving the actual selects to the main symbol, along with
the proper conditions. This means that we have two lines that select
wayland-protocols, under two different conditions; we could make that a
single select, but the condition would need to be on two lines anyway,
so meh...

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2021-11-13 10:40:47 +01:00
David Corbeil 1d952aafab package/glmark2: bumped to latest version
Fixes a segfault happening on Raspberry Pi4 on the fourth test

Signed-off-by: David Corbeil <david.corbeil@dynonavionics.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2021-09-18 17:33:49 +02:00
Fabrice Fontaine 9c068b4be8 package/glmark2: fix wayland build
wayland-protocols is needed since
https://github.com/glmark2/glmark2/commit/58763e2c13db39ad7c1a994c261146154e4f0afa

Fixes:
 - http://autobuild.buildroot.org/results/6106f07602c014897331daac3de01ac4a74e2016
 - http://autobuild.buildroot.org/results/b8d43fad291022cbc6e43988fe6bec14f594591a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2020-11-09 21:11:37 +01:00
Fabio Estevam 7ea9a4efa1 package/glmark2: bump to the latest version
Current version does not run on imx6 and fails like this:

Error: eglCreateWindowSurface failed with error: 0x3009
Error: eglCreateWindowSurface failed with error: 0x3009
Error: CanvasGeneric: Invalid EGL state
Error: main: Could not initialize canvas

Bumping to the latest version fixes this problem.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2020-09-21 22:36:16 +02:00
Heiko Thiery aaae3ab1f8 package/g*: add license file hashes
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2020-02-03 14:44:53 +01:00
Bernd Kuhls 4b831565d0 package/glmark2: rework selection of flavours
https://git.buildroot.net/buildroot/commit/?id=cf66a67112cd706d2e71665e45e8f6453fd53963
was not enough to fix building glmark2 because it was possible to
configure buildroot in a way that no flavour would be active:
http://lists.busybox.net/pipermail/buildroot/2019-October/261943.html
http://lists.busybox.net/pipermail/buildroot/2019-October/261944.html

The broken defconfig was fixed
https://git.buildroot.net/buildroot/commit/?id=ca6f9504dd3825fe4fbd0b4a4b3eea4261032d03

but we need to fix the selection of flavours to ensure that at least
on flavour is available:
http://lists.busybox.net/pipermail/buildroot/2019-October/262022.html

Suggested-by: Arnout Vandecappelle <arnout@mind.be>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-10-16 22:46:53 +02:00
Bernd Kuhls cf66a67112 package/glmark2: drm support needs udev
Upstream commit
https://github.com/glmark2/glmark2/commit/a7ae55dae4971af97bb71d38419089018c3671de
added a dependency for udev when the drm flavor is used.

Fixes:
http://autobuild.buildroot.net/results/01b/01b7374a5b7e66f2c369c7f93dae68353a3ffe81/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-09-29 09:12:29 +02:00
Neil Armstrong 151da9661e package/glmark2: bump to the latest version
Bump to the latest git version, containing multiple fixes and support
for render-only GPUs (lima, panfrost, ...) and missing DRM driver
names to run like meson, rockchip, sun4i-drm.

Tested on Khadas VIM2 (aarch64) and Panfrost.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2019-08-29 22:49:47 +02:00
Fabio Estevam e4768669a7 glmark2: Bump to the latest version
The two patches are no longer needed with the latest upstream version,
so bump to the latest one.

Tested on imx6.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-06-23 21:13:44 +02:00
Fabio Estevam 6846d83b14 glmark2: Fix segmentation fault
Running glmark2 on imx6 with kernel 4.11.4 and Mesa 17.1.2 leads to
a segmentation fault.

Apply Lucas Stach's patch to fix the problem while upstream glmark2
doesn't get fixed.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-06-15 22:37:40 +02:00
Rahul Bedarkar 337aa51f3f boot, package: use SPDX short identifier for GPLv3/GPLv3+
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for GPLv3/GPLv3+ is GPL-3.0/GPL-3.0+.

This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/\<GPLv3\>/GPL-3.0/g'

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-01 15:17:59 +02:00
Gary Bisson a10b15ebeb glmark2: add imx-drm driver support
Upstream status: pending
https://github.com/glmark2/glmark2/pull/29

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-01 23:13:54 +01:00
Danomi Manchego a3a2dbc409 packages: improve license type lists
Make license type lists more uniform:

* put content license applies to in parenthesis; ex: "GPLv2+ (programs)"
* use commas to separate types listed without conjuction; ex: "GPLv2, LGPLv2"

No attempt was made to validate the claimed licenses.  This is just a tweak
to increase uniformity of the _LICENSE variables.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Thomas: replace semi-colons by commas in LIBURCU_LICENSE.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-20 22:16:01 +01:00
Yann E. MORIN dbdf1ae69e package/glmark2: needs gcc >= 4.9 for C++14
Fixes:
    http://autobuild.buildroot.org/results/511/51162285d197deabb63727c19cdf5512b0e68f29/

[Peter: also add libstdcpp dependency]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Cc: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-02-19 22:58:46 +01:00
Gary Bisson 8b8b4f7bfe glmark2: bump version to fix build
The package otherwise fails to build with a recent toolchain with GCC6
(tested with Linaro ARM 2016.11).

It used to fail at sqrt check during package configuration:
 Checking for function sqrt               : not found
 The configuration failed

Bumping version to latest HEAD fixes the issue as explained in the
following discussion:
https://github.com/glmark2/glmark2/issues/15

Fixes:

  http://autobuild.buildroot.net/results/8dc9400505b9087ce290981d95486598df0beb56/

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
[Thomas: add reference to autobuilder failure.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-13 22:37:09 +01:00
Yann E. MORIN 680d6177d0 package/glmark2: make it a waf-package
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Cc: Spenser Gilliland <spenser@gillilanding.com>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-12-02 22:37:52 +01:00
Bernd Kuhls 33e2bd9b36 package/glmark2: add hash
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-06-06 21:44:38 +02:00
Bernd Kuhls 878108c560 package/glmark2: bump version
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-06-05 21:35:08 +02:00
Gustavo Zacarias 3c87cc9e42 glmark2: narrow down libgl requirements
Mesa3d DRI drivers can be enabled without support for libgl (for
example without x11). So make glmark2 gl (x11) support depend on
BR2_PACKAGE_HAS_LIBGL being present as well.
It doesn't exactly mean mesa3d providing libgl, but since we can't have
more than one libgl provider at the same time it's equivalent.
This is fallout from f1894ec957 which
enabled DRI drivers for non-xorg builds. Fixes:
http://autobuild.buildroot.net/results/174/1743ee5a340e5f4b1f8519e0b11eb196caa4f30e/

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-05-14 15:22:28 +02:00
Bernd Kuhls c933a5824a package/glmark2: remove unneeded comment
glmark2 depends on mesa3d which already depends on BR2_INSTALL_LIBSTDCPP
and BR2_TOOLCHAIN_HAS_THREADS_NPTL, glmark2 does not depend on udev so
the comment stating all these dependencies is not needed.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-04-25 21:17:13 +02:00
Bernd Kuhls f58cf6ddb2 package/glmark2: Wayland-gl support also needs egl
We were missing the egl dependency when enabling Wayland GL support:
https://github.com/glmark2/glmark2/blob/master/src/wscript_build#L28

Fixes
http://autobuild.buildroot.net/results/858/8587d0cea86efa4c6e98817cadc7cce0b1b36e3d/
http://autobuild.buildroot.net/results/1f6/1f6853d5f7a83be60ccdf4f071a1df1491cf8137/
http://autobuild.buildroot.net/results/a4d/a4d830291ee8550b3c544ade7169218d5edd4d52/
http://autobuild.buildroot.net/results/536/536a8dc62783633943770a278dc9f1c6c5c0807c/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-11-29 14:26:39 +01:00
Vicente Olivert Riera 97acef48bb glmark2: depend on host-python
The waf build system of glmark2 needs Python 2 as stated on its README
file:

python 2.x (>= 2.4) for the build system (waf)

Building it with a system with Python 3 as the default Python version
will result on a failure like this one:

File "waflib/Utils.py", line 199
    except OSError ,e:
                   ^
SyntaxError: invalid syntax

So, in order to fix this, make this package depending on host-python and
also run the waf script using $(HOST_DIR)/usr/bin/python2.

At the same time delete 3 Python environment variables passed to the waf
script during the configure phase which it seems there aren't needed for
anything.

Fixes:

  http://autobuild.buildroot.net/results/fc6/fc6cd2a90bbb0e6f80f6c4afaae1430f82e54046/

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-09-30 12:35:00 +02:00
Gustavo Zacarias f4716f79a0 packages: remove (non-)lfs dependencies and tweaks
Now that largefile is mandatory removes package dependencies and
conditionals.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-04-01 22:47:22 +02:00
Bernd Kuhls a5f3db697f package/glmark2: Fix mesa3d dependency
Compilation fails with this defconfig, provided by Thomas

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2014.11.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_17=y
BR2_TOOLCHAIN_EXTERNAL_LARGEFILE=y
BR2_TOOLCHAIN_EXTERNAL_INET_IPV6=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_PACKAGE_GLMARK2=y
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_RPI_USERLAND=y

because rpi-userland is used a provider for libegl/gles.
Fix this by depending on the corresponding mesa3d suboptions.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-12 22:21:44 +01:00
Spenser Gilliland 8304c360b0 glmark2: new package
Signed-off-by: Spenser Gilliland <spenser@gillilanding.com>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-01-10 17:12:00 +01:00