diff options
| author | Marek Vasut <marex@denx.de> | 2021-10-15 00:36:21 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-16 17:41:59 +0100 |
| commit | db22ea8dbac3bc9fff5d8e7ee06ca633c59f3e24 (patch) | |
| tree | a695ad66a0e0863ed0112f61c25e1e8028a74a8b /meta/recipes-graphics/piglit | |
| parent | d2344474eba35ccdd9bca7088de1463ebd6095dd (diff) | |
| download | poky-db22ea8dbac3bc9fff5d8e7ee06ca633c59f3e24.tar.gz | |
piglit: upgrade to latest revision
Update piglit to latest git revision and update the branch name,
since the original one is no longer updated. Make sure the VK
tests are only enabled if VK is also enabled in PACKAGECONFIG,
and that this is opt-in, otherwise older systems fail to build.
(From OE-Core rev: 9ba6df1b2cda5d95b60e9a80bf6b1d4e4855b10c)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Anuj Mittal <anuj.mittal@intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/piglit')
| -rw-r--r-- | meta/recipes-graphics/piglit/piglit_git.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 2e0dfeee42..4b515cc537 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb | |||
| @@ -6,7 +6,7 @@ BUGTRACKER = "https://gitlab.freedesktop.org/mesa/piglit/-/issues" | |||
| 6 | LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" | 6 | LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" |
| 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" |
| 8 | 8 | ||
| 9 | SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ | 9 | SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=main \ |
| 10 | file://0001-cmake-install-bash-completions-in-the-right-place.patch \ | 10 | file://0001-cmake-install-bash-completions-in-the-right-place.patch \ |
| 11 | file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ | 11 | file://0001-cmake-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ |
| 12 | file://0001-Add-a-missing-include-for-htobe32-definition.patch \ | 12 | file://0001-Add-a-missing-include-for-htobe32-definition.patch \ |
| @@ -18,7 +18,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ | |||
| 18 | " | 18 | " |
| 19 | UPSTREAM_CHECK_COMMITS = "1" | 19 | UPSTREAM_CHECK_COMMITS = "1" |
| 20 | 20 | ||
| 21 | SRCREV = "6a4be9e9946df310d9402f995f371c7deb8c27ba" | 21 | SRCREV = "014c9d09115e15f5a074457a753bf3a43173ef7f" |
| 22 | # (when PV goes above 1.0 remove the trailing r) | 22 | # (when PV goes above 1.0 remove the trailing r) |
| 23 | PV = "1.0+gitr${SRCPV}" | 23 | PV = "1.0+gitr${SRCPV}" |
| 24 | 24 | ||
| @@ -43,6 +43,7 @@ do_compile[dirs] =+ "${B}/temp/" | |||
| 43 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" | 43 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" |
| 44 | PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," | 44 | PACKAGECONFIG[freeglut] = "-DPIGLIT_USE_GLUT=1,-DPIGLIT_USE_GLUT=0,freeglut," |
| 45 | PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" | 45 | PACKAGECONFIG[x11] = "-DPIGLIT_BUILD_GL_TESTS=ON,-DPIGLIT_BUILD_GL_TESTS=OFF,${X11_DEPS}, ${X11_RDEPS}" |
| 46 | PACKAGECONFIG[vulkan] = "-DPIGLIT_BUILD_VK_TESTS=ON,-DPIGLIT_BUILD_VK_TESTS=OFF,vulkan-loader" | ||
| 46 | 47 | ||
| 47 | export PIGLIT_BUILD_DIR = "../../../../git" | 48 | export PIGLIT_BUILD_DIR = "../../../../git" |
| 48 | 49 | ||