Commit Graph

41 Commits

Author SHA1 Message Date
Jon Mason
ceefa75ac0 Space-comma Cleanups
Multiple files have " ," instead of ", " in expressions.  This changes
them to conform to the way the rest of them are done.

Found and corrected via:
git ls-files | xargs sed --follow-symlinks -i 's/ ,d/, d/g'

(From OE-Core rev: 36c3afd2dd8bded02ea8f255e89a09ebd75c795b)

Signed-off-by: Jon Mason <jon.mason@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-09-30 15:01:51 +01:00
Richard Purdie
0caaf17660 vulkan-headers: Fix upstream branch deletion issue
The upstream branch was deleted but the commit is in master so reference
that instead.

(From OE-Core rev: 4e0f64cba6e9d3ef4837460c9a6b506c33344012)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-23 14:41:56 +01:00
Alexander Kanavin
e89492a25d vulkan-demos: upgrade to latest revision
(From OE-Core rev: 3922eaf495f29be29cf685556935deb9649bae24)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-06-09 13:14:00 +01:00
Alexander Kanavin
17b8a3da16 vulkan-demos: upgrade to latest revision
gli is replaced upstream with ktx.

lfs objects are not in a revision that we use, so they can be ignored.

(From OE-Core rev: a837a33e78b471038ec289eb1c641d2e6da462ed)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-07 12:16:00 +01:00
Alexander Kanavin
a846602f39 vulkan-tools: upgrade 1.1.126.0 -> 1.2.135.0
(From OE-Core rev: 99dea774d51f9b7af9dd2359ab59cde1ea60374c)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-07 12:16:00 +01:00
Alexander Kanavin
da9f963ff1 vulkan-loader: upgrade 1.1.126.0 -> 1.2.135.0
(From OE-Core rev: 8ecb1e82cbf7df676f6f7e79c5d1210643a7babb)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-07 12:16:00 +01:00
Alexander Kanavin
69e454728c vulkan-headers: upgrade 1.1.126.0 -> 1.2.135.0
(From OE-Core rev: 890a81e4d3e85644b3905bd50c85da98c0588f2c)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-05-07 12:16:00 +01:00
Anuj Mittal
4a762d532c assimp: upgrade 5.0.0 -> 5.0.1
(From OE-Core rev: ea43f8af4652d78546fee874606cf4093b11098e)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2020-02-04 15:56:29 +00:00
Hongxu Jia
56fa7845a4 assimp: fix search library failed on multilib
While multilib enabled, it builds vulkan-demos failed
...
|CMake Error at tmp-glibc/work/aarch64-wrs-linux/vulkan-demos/git-r0/
recipe-sysroot/usr/lib64/cmake/assimp-5.0/assimpTargets.cmake:85 (message):
|  The imported target "assimp::assimp" references the file
|     "tmp-glibc/work/aarch64-wrs-linux/vulkan-demos/git-r0/recipe-sysroot/usr/lib/libassimp.so.5"
|  but this file does not exist.  Possible reasons include:
...

Since oe-core set ASSIMP_LIB_INSTALL_DIR to baselib, use it rather than
hardcoded `/lib' to search library

(From OE-Core rev: 2f37056cc6380a6dbc6e43152d2c7a4846526904)

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-12-28 23:25:41 +00:00
Alexander Kanavin
4aac76b458 assimp: update to 5.0.0
(From OE-Core rev: de3117ef4ed05721a25d24bae91ab65cab3ca664)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-12-09 12:00:43 +00:00
Alexander Kanavin
b6754e6ec6 vulkan-demos: update to latest revision
(From OE-Core rev: 2666f3978bd217303bb4306a14d9d88ab59dc697)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-12-09 12:00:43 +00:00
Alexander Kanavin
9ad29096a8 vulkan: update to 1.1.126
Disable assembly for vulkan-loader, as it tries to execute
a target binary (previously it would fail to detect a working
assembler and do the same fallback quietly).

(From OE-Core rev: fe2db77803846faa29226b821aaa985e009ac3cc)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-12-09 12:00:43 +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
Anuj Mittal
b8da24b85d vulkan: remove
This has been split in multiple components which are now being packaged
separately following the repository split upstream.

https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/wiki/Repository-Split

(From OE-Core rev: 928d09f88c0f11cc6686d85fbe47e6e68a999289)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-07-10 09:56:22 +01:00
Anuj Mittal
7a9702bdf1 vulkan-demos: depend on vulkan-loader
Depend on vulkan-loader component of the now split-up vulkan.

(From OE-Core rev: 64ee4af8c057dea47cdedf2ae6d1b8f62ecdbc7e)

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-07-10 09:56:22 +01:00
Tim Orling
17dab68520 vulkan-tools: add recipe
Vulkan tools and utilities that can assist development by enabling
developers to verify their applications correct use of the Vulkan API.

DEPENDS on vulkan-headers and vulkan-loader.

(From OE-Core rev: c4db69fc0d8d46a396ee744fddad0300ec730f46)

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-07-10 09:56:22 +01:00
Tim Orling
e8131220ec vulkan-loader: add recipe
Khronos official Vulkan ICD desktop loader for Windows, Linux, and MacOS.

Adapted from vulkan recipe with the changes done to remove obsolete options.
Needs either of X11 or Wayland to be enabled.

(From OE-Core rev: 4d9b993bd1706a8c29b45f58d513347a3d9f26d6)

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-07-10 09:56:22 +01:00
Tim Orling
257f47803c vulkan-headers: add recipe
Provides vulkan header files and API registry.

(From OE-Core rev: 59953afcff884684e5b0df3ff7f4f1a1204384d8)

Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-07-10 09:56:22 +01:00
Robert Yang
3be36b0d27 cmake.bbclass: Make it work with ccache
This can make the following recipes work with cmake:
cmake libdnf libcomps librepo createrepo-c llvm dnf libsolv assimp waffle
libjpeg-turbo taglib libproxy libical

And the following 3 recipes don't:
webkitgtk vulkan piglit
Now cmake.bbclass doesn't disble ccache any more, disable it in the recipes if
needed.

(From OE-Core rev: d014c8c11fb663f131d3a860ddeda17d604b2dd3)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2019-01-14 11:35:55 +00:00
Ross Burton
6a0ebb6123 vulkan: don't fetch from the deprecated repository
(From OE-Core rev: 34109d66cd0f1f9746e8cc50a5d4334efdc0ce38)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-12-14 17:10:59 +00:00
Maxin B. John
6049b9b19b vulkan-demos: upgrade to latest commit
Remove upstreamed patches:
        1. 0001-Fix-build-on-x86.patch
        2. 0001-Support-installing-demos-support-out-of-tree-builds.patch

Updated the following patch:
        1. 0001-Don-t-build-demos-with-questionably-licensed-data.patch

Update subcomponents gli and glm based on the new structure of
repository.

License-Update: Update in location of file. No change in checksum

(From OE-Core rev: c9e12bc8872710ca7f788d3709c42425872fd033)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-01 10:07:22 +01:00
Maxin B. John
b5dbf20ce6 vulkan: upgrade to version 1.1.73.0
Refresh the patch:
        demos-Don-t-build-tri-or-cube.patch

License-Update: Updates in copyright information.

(From OE-Core rev: 4f6652e9b8a4fad7d650e1f88aa830fd7f88ea49)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-08-01 10:07:22 +01:00
Ross Burton
261b8ddf5b vulkan: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

(From OE-Core rev: 453a433768bff76e4d3ad9bf40fd9d8210b0950e)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-03-07 06:34:51 -08:00
Maxin B. John
e3c3e30a0a vulkan: upgrade to version 1.0.65.2
1.0.61.1 -> 1.0.65.2

(From OE-Core rev: c61ad4db01b18ff8c162a39e04ce4871e2926a0e)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-02-06 11:06:28 +00:00
Maxin B. John
c3d4f290d5 assimp: upgrade to version 4.1.0
4.0.1 -> 4.1.0

(From OE-Core rev: 35d5c239f379e99700073971e0cb0a84037ec0d0)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-02-06 11:06:28 +00:00
Mike Crowe
4192c657fe vulkan: Rely on cmake.bbclass to put cmake package files in dev package
cmake.bbclass now ensures that ${libdir}/cmake ends up in the dev package,
so this recipe doesn't need to do so itself.

(From OE-Core rev: d860e2f36f3561532972edd04062392a40a0c8d6)

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
Alexander Kanavin
e4f7ae23d1 oe-core: take UPSTREAM_CHECK_COMMITS into use where possible
This greatly reduces the amount of recipes for which upstream
version check fails: from about 30 to about 8.

(From OE-Core rev: bb9066670a6096aa4134bebc84132b4eb3964b6d)

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>
2017-11-30 10:49:22 +00:00
Alexander Kanavin
638971d641 assimp: update to 4.0.1
(From OE-Core rev: 8d3128811739c0ddcb3f062a9098d81b611da9e3)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-11-09 12:33:17 +00:00
Alexander Kanavin
24e95761c2 vulkan: update to 1.0.61.1
(From OE-Core rev: 939e6ca27ca1f500bc3bbfdf4f7f893a57cc0820)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-11-09 12:33:16 +00:00
Jussi Kukkonen
15a9f32ed4 vulkan: rrecommended drivers unconditionally
mesa can now build vulkan drivers without opengl: remove workaround.

(From OE-Core rev: c5fdda293a8f0b18293295d05a33697e3b2f1877)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-30 11:14:26 +01:00
Mark Hatle
11eba8cd8a vulkan: Only build when 'vulkan' distro flag is set
Only build with the vulkan distro flag is set.  (References to this flag
were found in the mesa recipe.)

In addition, only set the RRECOMEMND to mesa, if 'opengl' flag is set.  Mesa
required opengl distro flag to build.

(From OE-Core rev: 152b59e07aed76de158d553178a2710330bc4cc1)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-24 13:48:10 +01:00
Alexander Kanavin
5813f1f764 selftest: fix distrodata.py to use per-recipe UPSTREAM_VERSION_UNKNOWN setting
... instead of a global exception list which was problematic.

[YOCTO #11896]

(From OE-Core rev: 89dfede4ca795ba085f1ee7290c6dede573c11db)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-16 00:03:13 +01:00
Alexander Kanavin
1d84ef26fb assimp: fix upstream version check
(From OE-Core rev: d15bcae5fa04a84f2909217bcfc657aa2ce7d3f0)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-08-16 00:03:13 +01:00
Kai Kang
e35fe8c06d assimp: upgrade to 4.0.0
Upgrade assimp to 4.0.0.

* Because there is also an assimp recipe in meta-oe, so update
  DESCRIPTION, HOMEPAGE and SECTION from it.
* Remove redundant license file
* Update EXTRA_OECMAKE to fix library install path for multilib

(From OE-Core rev: e639f8845f78a0a75b9cab81d9a9f6a2810a313c)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-30 08:46:20 +01:00
Jussi Kukkonen
f5bdf4d37f vulkan-demos: Rename ${bindir}/screenshot
This conflicts with sato-screenshot.

(From OE-Core rev: 2cd6ef9309541c625bc3c3bd48e06dcf4a6edd80)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-21 22:51:38 +01:00
Jussi Kukkonen
2d339f752a vulkan-demos: Add recipe
Sascha Willems collection of Vulkan demos is useful as a smoke testing
tool.

* Add patch to install binaries and data.
* Add patch to fix build on X86
* Use a combination of patch and do_install_append to avoid some 3D
models with unclear licensing.

(From OE-Core rev: 88a6fa37e7ec2e68cdb2374f2a5371a6f44b3d67)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-17 14:01:37 +01:00
Jussi Kukkonen
85a891e8e7 vulkan: RRECOMMEND mesa drivers
One less thing to remember when trying to build an image
with working vulkan.

(From OE-Core rev: 0fc904749f45bd7d679233cced9d5a155afac421)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-08 13:34:46 +01:00
Jussi Kukkonen
5e4845d15e assimp: Add as dependency of vulkan-demos
Asset import library used by Sascha Willems Vulkan demos.

(From OE-Core rev: d3f7a18c8119c22b5120fc618396548259a012e7)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-08 13:34:46 +01:00
Jussi Kukkonen
d18c434487 vulkan: Upgrade 1.0.39.1 -> 1.0.51.0
Remove a patch that's no longer needed

(From OE-Core rev: da21b51ec84080b5e544b197e7fb49cb91642a31)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-08 13:34:46 +01:00
Alexander Kanavin
53ed1b3063 vulkan: fix upstream version check
(From OE-Core rev: 76366b0e93a50a18e6c1203984e951e0f698c20f)

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>
2017-05-23 17:45:36 +01:00
Jussi Kukkonen
3835f04fc3 vulkan: Add recipe for Vulkan common loader
Add a recipe for vulkan loader library and the vulkaninfo binary.

Vulkan can be built to support X11 or wayland or both. There is
currently no support for building tests, validation layers or even
the demos as that would require a bunch of otherwise unnecessary
dependencies.

Fix the build on musl by defaulting to getenv() if secure_getenv()
is not available.

(From OE-Core rev: ce0acee244cdae287fa0d3b048d371627a69a030)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-03-10 14:50:10 +00:00