subtree updates
poky: 94dfcaff64..359e1cb62f:
Alexander Kanavin (76):
tcf-agent: fetching over git:// no longer works
lighttpd: convert from autotools to meson
libxcrypt: upgrade 4.4.23 -> 4.4.25
python3-cython: upgrade 0.29.23 -> 0.29.24
python3-numpy: upgrade 1.21.0 -> 1.21.2
systemd: upgrade 249.1 -> 249.3
xeyes: upgrade 1.1.2 -> 1.2.0
btrfs-tools: update 5.13 -> 5.13.1
diffutils: update 3.7 -> 3.8
mc: update 4.8.26 - > 4.8.27
libsdl2: update 2.0.14 -> 2.0.16
vulkan-samples: update to latest revision
pulseaudio: update 14.2 -> 15.0
libjitterentropy: update 3.0.2 -> 3.1.0
usbutils: upgrade 013 -> 014
inetutils: upgrade 2.0 -> 2.1
mobile-broadband-provider-info: upgrade 20201225 -> 20210805
glib-networking: upgrade 2.68.1 -> 2.68.2
e2fsprogs: upgrade 1.46.2 -> 1.46.4
help2man: upgrade 1.48.3 -> 1.48.4
libedit: upgrade 20210522-3.1 -> 20210714-3.1
log4cplus: upgrade 2.0.6 -> 2.0.7
mtools: upgrade 4.0.34 -> 4.0.35
patchelf: upgrade 0.12 -> 0.13
pkgconf: upgrade 1.7.4 -> 1.8.0
python3-git: upgrade 3.1.18 -> 3.1.20
python3-pip: upgrade 21.2.1 -> 21.2.4
python3-pygments: upgrade 2.9.0 -> 2.10.0
python3-setuptools: upgrade 57.1.0 -> 57.4.0
squashfs-tools: upgrade 4.4 -> 4.5
acpica: upgrade 20210331 -> 20210730
libidn2: upgrade 2.3.1 -> 2.3.2
stress-ng: upgrade 0.12.12 -> 0.13.00
sudo: upgrade 1.9.7p1 -> 1.9.7p2
epiphany: upgrade 40.2 -> 40.3
libgudev: upgrade 236 -> 237
libjpeg-turbo: upgrade 2.1.0 -> 2.1.1
libepoxy: upgrade 1.5.8 -> 1.5.9
pango: upgrade 1.48.7 -> 1.48.9
mesa: upgrade 21.1.5 -> 21.2.1
libinput: upgrade 1.18.0 -> 1.18.1
libxfont2: upgrade 2.0.4 -> 2.0.5
libxft: upgrade 2.3.3 -> 2.3.4
xserver-xorg: upgrade 1.20.12 -> 1.20.13
linux-firmware: upgrade 20210511 -> 20210818
wireless-regdb: upgrade 2021.04.21 -> 2021.07.14
libwebp: upgrade 1.2.0 -> 1.2.1
webkitgtk: upgrade 2.32.2 -> 2.32.3
boost: upgrade 1.76.0 -> 1.77.0
diffoscope: upgrade 179 -> 181
enchant2: upgrade 2.3.0 -> 2.3.1
re2c: upgrade 2.1.1 -> 2.2
rng-tools: upgrade 6.13 -> 6.14
kea: backport a patch to fix build errors exposed by latest update batch
qemu: add a hint on how to enable CPU render nodes when a suitable GPU is absent
mc: fix reproducibility
libjitterentropy: remove contaminated hashequiv entry
binutils: drop target flex/bison from build dependencies
gnu-efi: update 3.0.13 -> 3.0.14
glib-2.0: upgrade 2.68.3 -> 2.68.4
util-linux: upgrade 2.37.1 -> 2.37.2
ccache: upgrade 4.3 -> 4.4
git: upgrade 2.32.0 -> 2.33.0
openssh: upgrade 8.6p1 -> 8.7p1
ell: upgrade 0.42 -> 0.43
python3-mako: upgrade 1.1.4 -> 1.1.5
vala: upgrade 0.52.4 -> 0.52.5
libnsl2: upgrade 1.3.0 -> 2.0.0
gi-docgen: upgrade 2021.6 -> 2021.7
json-glib: upgrade 1.6.2 -> 1.6.4
bind: upgrade 9.16.19 -> 9.16.20
harfbuzz: upgrade 2.8.2 -> 2.9.0
qemurunner.py: print output from runqemu/qemu-system in stop()
qemurunner.py: handle getOutput() having nothing to read
rust: fix upstream version checks
mesa: enable crocus driver for older intel graphics
Andreas Müller (2):
mesa: upgrade 21.1.5 -> 21.1.7
binutils: Apply upstream patch to fix 'too many open files' on qtwebengine
Andrej Valek (2):
busybox: 1.33.1 -> 1.34.0
vim: add option to disable NLS support
Andres Beltran (2):
buildhistory: Add output file listing package information
buildhistory: Label packages providing per-file dependencies in depends.dot
Andrey Zhizhikin (2):
lttng-modules: do not search in non-existing folder during install
nativesdk-packagegroup-sdk-host: add perl integer module
Armin Kuster (2):
lz4: Security Fix for CVE-2021-3520
lz4: remove rest of ptest artifacts
Bruce Ashfield (21):
linux-yocto/5.13: update to v5.13.7
linux-yocto/5.4: update to v5.4.137
linux-yocto/5.10: update to v5.10.55
linux-yocto/5.4: update to v5.4.139
linux-yocto/5.10: update to v5.10.57
linux-yocto/5.13: update to v5.13.9
linux-yocto/5.4: remove recipes
conf/machine: bump qemu preferred versions to 5.13
linux-yocto-dev: bump to v5.14+
lttng-modules: update to 2.13.0
kernel-devsrc: 5.14+ updates
kernel-devsrc: fix 5.14+ objtool compilation
poky/poky-tiny: set default kernel to 5.13
poky: set default kernel to 5.13
yocto-bsp: drop 5.4 bbappend
poky-alt: switch default kernel to 5.10
linux-yocto/5.13: update to v5.13.11
linux-yocto/5.10: update to v5.10.59
linux-yocto/5.13: update to v5.13.12
linux-yocto/5.10: update to v5.10.60
parselogs.py: ignore intermittent CD/DVDROM identification failure
Chen Qi (1):
package_rpm/update-alternatives: fix package's provides
Daniel Gomez (2):
wic: Add --no-fstab-update part option
oeqa: wic: Add tests for --no-fstab-update
Denys Dmytriyenko (1):
grep: upgrade 3.6 -> 3.7
Enrico Scholz (1):
bitbake: fetch2/wget: fix 'no_proxy' handling
Hongxu Jia (2):
nativesdk-pseudo: Fix to work with glibc 2.34 systems
glibc: fix create thread failed in unprivileged process
Hsia-Jun Li (1):
lib/oe/elf: Add Android OS to machine_dict
Jon Mason (8):
arch-armv8m-main: missing space
conf/machine: move tune files to architecture directories
yocto-bsp: update machine confs with new tune locations
docs: update docs with new tune locations
arch-arm*: add better support for gcc march extensions
tune-cortexr*: add support for all Arm Cortex-R processors
arch-arm*: Fix bugs with dsp and simd feature include files
tune-*: Use more specific DEFAULTTUNE
Jose Quaresma (1):
sstate.bbclass: get the number of threads from BB_NUMBER_THREADS
Joshua Watt (17):
bitbake: contrib: vim: Add "remove" override highlighting
bitbake.conf: Add lz4c, pzstd and zstd
bitbake: bitbake: asyncrpc: Defer all asyncio to child process
conf/licenses: Add FreeType SPDX mapping
tzdata: Remove BSD License specifier
glib-2.0: Use specific BSD license variant
e2fsprogs: Use specific BSD license variant
shadow: Use specific BSD license variant
libcap: Use specific BSD license variant
sudo: Use specific BSD license variant
libpam: Use specific BSD license variant
libxfont2: Use specific BSD license variant
libjitterentropy: Use specific BSD license variant
libx11: Use specific BSD license variant
font-util: Use specific BSD license variant
flac: Use specific BSD license variant
swig: Use specific BSD license variant
Kai Kang (2):
libcgroup: fix installed-vs-shipped qa issue
rustfmt: fix SRC_URI
Kevin Hao (2):
meta-yocto-bsp: Set the default kernel to v5.13
meta-yocto-bsp: Bump the kernel to v5.13.11
Khem Raj (2):
weston: Re-order gbm destruction at DRM-backend tear down
musl: Update to latest tip of trunk
Kristian Klausen (1):
systemd: Add repart PACKAGECONFIG
Marco Felsch (1):
bitbake: bitbake: bitbake-layers: add skip reason to output
Marek Vasut (1):
weston: Add rdp PACKAGECONFIG
Marta Rybczynska (1):
lzo: add CVE_PRODUCT
Martin Jansa (3):
bitbake: prserv: handle PRSERV_HOST = "127.0.0.1:0" the same as "localhost:0"
bitbake: cooker/process: Fix typos in exiting message
rust: remove unused patches
Michael Halstead (2):
uninative: Upgrade to 3.3, support glibc 2.34
uninative: Upgrade to 3.4
Michael Opdenacker (2):
maintainers.inc: maintainer for alsa-*, flac, lame and speex
meta: stop using "virtual/" in RPROVIDES and RDEPENDS
Mingli Yu (2):
shadow: fix default value in SHA_get_salt_rounds()
bitbake: prserv: make localhost work
Oleksandr Popovych (1):
utils: Reduce the number of calls to the "dirname" command
Oliver Kranz (1):
Allow global override of golang GO_DYNLINK
Paul Barker (2):
bitbake: prserv: Replace XML RPC with modern asyncrpc implementation
bitbake: prserv: Add read-only mode
Paul Gortmaker (1):
ltp: backport ioctl_ns05 fix from upstream
Peter Kjellerstedt (7):
lttng-modules: Make it build when CONFIG_TRACEPOINTS is not enabled again
poky-floating-revisions.inc: Use new override syntax for commented vars
local.conf.sample: Use the new override syntax for a commented variable
bitbake.conf: Use the new variable override syntax in a comment
buildhistory-collect-srcrevs: Adapt to the new variable override syntax
meson.bbclass: Make the default buildtype "debug" if DEBUG_BUILD is 1
bitbake: providers: Use new override syntax when handling pn- "override"
Purushottam Choudhary (1):
assimp: added patch to fix hardcoded non-existing paths in CMake modules
Randy MacLeod (8):
openssl: upgrade from 1.1.1k to 1.1.1l
rust: initial merge of most of meta-rust
rust: mv README.md to recipes-devtools/rust/README-rust.md
rust: update the README to conform to being in oe-core
cargo/rust/rustfmt: exclude from world
maintainers: Add myself as maintainer for rust pkgs
cargo_common: remove http_proxy
rust: remove Rust version 1.51.0 toolchain
Richard Purdie (27):
elfutils: Add zstd PACKAGECONFIG for determinism
man-db: Add compression PACKAGECONFIG entries
oeqa/selftest/glibc: Handle incorrect encoding issuesin glibc test results
package/scripts: Fix FILES_INFO handling
package: Fix overrides converion issue with PKGSIZE
bitbake: bitbake: Make 3.6.0 the minimum python version
elfutils: Fix ptest dependencies
bsp-guide: Fix reference to bbappend section of dev-manual
ref-manual: Fix reference to bbappend section of dev-manual
gcc: Fix nativesdk builds and multilib fixes with gcc 11
bitbake: README: Add note about test suite and new tests
pseudo: Fix to work with glibc 2.34 systems
bitbake: README: Fix typo
rust-cross*: Fix OVERRRIDE references in task signature computation
rust-cross-canadian-common: Use rust.inc directly, not rust-target
cargo: Ensure cargo-cross-canadian doesn't have native/nativesdk versions
rust-native: Avoid stripped warning
rust-llvm: Add missing HOMEPAGE
rust: Skip target recipe since it doesn't work
oeqa/selftest/distrodata: Fix up rust maintainer testing
rust: Avoid buildtools+uninative issues with glibc symbols mismatches
rust-common: Add LDFLAGS to cc wrapper
oeqa/selftest/reproducibile: Exclude rust packages
kernel: Use unexpanded EXTENDPKGV
oeqa/buildtools-cases: Allow bitbake time to shutdown
cargo: Apply uninative fix to snapshot as with rust
rust-common: Hack around LD_LIBRARY_PATH issues on centos7
Robert P. J. Day (1):
scripts/lib/wic/help/py: "Redhat" -> "Red Hat"
Ross Burton (11):
oeqa/selftest/buildoptions: test buildhistory PKGSIZE and FILELIST fields
uninative: Improve glob to handle glibc 2.34
oeqa/sdk: add relocation test for buildtools
glibc: package the stub .a libaries into glibc-dev
oeqa/sdk: add HTTPS test for buildtools
libcgroup: upgrade to 2.0
gcc: also relocate the musl loader
local.conf.sample.extended: fix commented-out override syntax
cpio: backport fix for CVE-2021-38185
mesa: fix build on Arm V5 with soft float
ptest: allow the ptest-packagelists.inc warning to be disabled
Sakib Sajal (1):
qemu: fix CVE-2021-3682
Scott Murray (2):
bitbake: bitbake: asyncrpc: always create new asyncio loops
prservice: remove connection caching
Stefan Herbrechtsmeier (4):
u-boot: Remove redundancy from installed and deployed SPL artifact names
u-boot: Remove misplaced configuration type variable
u-boot: Make SPL suffix configurable
u-boot: Make UBOOT_BINARYNAME configurable
Tim Orling (7):
python3-importlib-metadata: upgrade 4.6.3 -> 4.6.4
python3-hypothesis: upgrade 6.14.5 -> 6.14.8
python3-hypothesis: upgrade 6.14.8 -> 6.15.0
python3-hypothesis: enable ptest
python3-pluggy: upgrade 0.13.1 -> 1.0.0
python3-pytest: allow python3-pluggy >=1.0.0
rust-common.bbclass: export RUST_TARGET_PATH
Trevor Gamblin (1):
bluez: upgrade 5.60 -> 5.61
Trevor Woerner (1):
distro_features_check: expand with IMAGE_FEATURES
Vinay Kumar (2):
glibc: Fix CVE-2021-38604
rust-common.inc: Fix build failure with qemuppc64.
Yi Zhao (2):
prelink: add PACKAGECONFIG for selinux
shadow: add /etc/default/useradd
Zoltán Böszörményi (4):
kernel-module-split.bbclass: Support zstd-compressed modules
Allow opt-out of split kernel modules
kernel.bbclass: Use full versions for inter-package dependencies
base/kernel: Support zstd-compressed squashfs and cpio initramfs
leimaohui (2):
Fix conflict error when enable multilib.
wordsize.h: Fix a miss, this file in arm and aarch64 should be the same.
meta-raspberrypi: 32921fc9bd..a6fa6b3aec:
Khem Raj (4):
machines: Use tune files from new location in oe-core
linux-raspberrypi: Update to 5.10.59
raspberrypi-firmware: Update to latest
raspberrypi4: Use full kms (vc4-kms-v3d) DT overlay
Marcus Comstedt (1):
pi-bluetooth: Add compatibility with non-systemd builds
Tom Rini (1):
xserver-xf86-config: Correctly append to FILES:${PN}
meta-security: c885d399cd..1f18c623e9:
Armin Kuster (10):
cryfs: add new package
kas-security-bas: bump conf value
kas: fix DISTRO appends
dm-verity-img.bbclass: more overided fixups
krill: Rust is in core now
suricata: rust is in core
layer.conf: drop dynamic-layer
layer.conf: drop meta-rust
harden-image-minimal: fix useradd inherit
kas: remove rust layers
Daiane Angolini (1):
meta-integrity: kernel-modsign: Change weak default value
George Liu (1):
meta: Fix typos
Marta Rybczynska (2):
README: fix mailing lists
README: fix mailing lists and a typo
meta-openembedded: a13db91f19..9fdc7960ba:
Andreas Müller (6):
catch2: upgrade 2.13.6 -> 2.13.7
fltk/CMake: Do not export executable 'fluid'
fltk: upgrade 1.3.6 -> 1.3.7
network-manager-applet: upgrade 1.22.0 -> 1.24.0
networkmanager: upgrade 1.32.4 -> 1.32.8
udisks2: upgrade 2.9.2 -> 2.9.3
Anton Blanchard (2):
boost-url: Use GNUInstallDirs instead of hard wiring install directories
cereal: Use GNUInstallDirs instead of hard wiring install directories
Changqing Li (1):
linuxptp: upgrade 3.1 -> 3.1.1
Devendra Tewari (1):
android-tools: Add flag to enable adbd service (#147)
Dmitry Baryshkov (1):
image_types_sparse: stop using ext2simg
Easwar Hariharan (1):
chrony: Fix privdrop packageconfig
Joe Slater (1):
nginx: fix CVE-2021-3618
Justin Bronder (1):
hidapi: add rdep on glibc-gconv-utf-16
Khem Raj (7):
layer.conf: Add ttf-ipa to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS on fontconfig
mpich: link explictly with libgcc
packagegroup-meta-networking: Add bmon
libnss-nisplus: Remove
pipewire: Upgrade to 0.3.34
bluealsa: Add recipe
apitrace: Enable on glibc >= 2.34
Leon Anavi (21):
python3-astroid: Upgrade 2.6.6 -> 2.7.0
python3-ujson: Upgrade 4.0.2 -> 4.1.0
python3-pycurl: Upgrade 7.44.0 -> 7.44.1
python3-websocket-client: Upgrade 1.1.0 -> 1.2.1
python3-bitarray: Upgrade 2.2.5 -> 2.3.0
python3-langtable: Upgrade 0.0.54 -> 0.0.56
python3-pandas: Upgrade 1.3.1 -> 1.3.2
python3-tzlocal: Upgrade 2.1 -> 3.0
python3-zeroconf: Upgrade 0.34.3 -> 0.36.0
python3-dbus-next: Upgrade 0.2.2 -> 0.2.3
python3-astroid: Upgrade 2.7.0 -> 2.7.1
python3-ruamel-yaml: Upgrade 0.17.10 -> 0.17.11
python3-unidiff: Upgrade 0.6.0 -> 0.7.0
python3-qrcode: Upgrade 7.2 -> 7.3
python3-simplejson: Upgrade 3.17.3 -> 3.17.4
python3-regex: Upgrade 2021.7.6 -> 2021.8.3
python3-colorlog: Upgrade 5.0.1 -> 6.4.1
python3-ruamel-yaml: Upgrade 0.17.11 -> 0.17.13
python3-simplejson: Upgrade 3.17.4 -> 3.17.5
python3-bitarray: Upgrade 2.3.0 -> 2.3.2
python3-watchdog: Upgrade 2.1.3 -> 2.1.5
Martin Jansa (1):
layer.conf: Add ttf-takao to SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS on fontconfig
Matija Tudan (1):
gpsd: upgrade 3.20 -> 3.23
Matteo Croce (1):
libbpf: bump to 0.4.0
Michael Opdenacker (2):
meta-multimedia: stop using "virtual/" in RPROVIDES and RDEPENDS
meta-oe: stop using "virtual/" in RPROVIDES and RDEPENDS
Mingli Yu (4):
polkit: fix CVE-2021-3560
vsftpd: Upgrade to 3.0.5
mariadb: Upgrade to 10.6.4
jemalloc: improve reproducibility
Nathan Rossi (1):
nginx: Fix off_t size passed in configure
Oleksandr Kravchuk (6):
font-adobe-100dpi: fix UPSTREAM_CHECK_REGEX
font-adobe-utopia-100dpi: fix UPSTREAM_CHECK_REGEX
font-bh-100dpi: fix UPSTREAM_CHECK_REGEX
font-bh-lucidatypewriter-100dpi: fix UPSTREAM_CHECK_REGEX
font-bitstream-100dpi: fix UPSTREAM_CHECK_REGEX
xf86-input-tslib: update to 1.1.1
Patrick Areny (2):
libConfuse: Add recipe
bmon: Add recipe
Peter Kjellerstedt (6):
gpsd: Let scons install the udev and systemd files
gpsd: Move /usr/share/gpsd/doc to the gpsd-doc package
poppler: Explicitly enable/disable boost together with splash
chrony: Use new override syntax for USERADD_PARAM
gpsd: Correct the installation of gpsd.hotplug if systemd is not enabled
gpsd: Do not install gpsd.hotplug unconditionally
Peter Morrow (1):
libbpf: remove stale comment
Sakib Sajal (2):
lmdb: use libprefix in Makefile to install libraries
gd: fix CVE-2021-38115
Sinan Kaya (4):
c-ares: remove custom patches
grpc: make SHARED library build optional
libkcapi: add a hash only packageconfig
libkcapi: allow an option to build natively
Tim Orling (2):
bootchart: drop; unfetchable
python3-django_2.2.x: only check upstream 2.2.x
Trevor Gamblin (5):
python3-click: Add missing ptest artifacts
python3-eventlet: add 0.30.2 to meta-python
python3-gunicorn: tweak run-ptest, add RDEPENDS
python3-license-expression: add ptest artifacts
nftables: upgrade 0.9.9 -> 1.0.0
Vesa Jääskeläinen (2):
python3-cached-property: Add recipe for version 1.5.2
python3-pkcs11: Add recipe for version 0.7.0
Yi Zhao (2):
audit: upgrade 3.0.4 -> 3.0.5
krb5: filtering out -f*-prefix-map from krb5-config
Zoltán Böszörményi (1):
metacity: Add a patch to create build/src/core before moving generated sources to it
leimaohui (3):
packagegroup-meta-oe: Update ttf-ipa package name.
uim: Dleted takao fonts from DEPENDS.
takao-fonts: It should be in ttf-fonts directory as the other ttf fonts.
wangmy (14):
fetchmail: upgrade 6.4.20 -> 6.4.21
c-ares: upgrade 1.17.1 -> 1.17.2
icewm: upgrade 2.6.0 -> 2.7.0
netplan: upgrade 0.102 -> 0.103
ctags: upgrade 5.9.20210801.0 -> 5.9.20210815.0
live555: upgrade 20210720 -> 20210809
opensc: upgrade 0.21.0 -> 0.22.0
xfsprogs: upgrade 5.12.0 -> 5.13.0
networkmanager: upgrade 1.32.8 -> 1.32.10
can-utils: upgrade 2021.06.0 -> 2021.08.0
doxygen: upgrade 1.9.1 -> 1.9.2
gensio: upgrade 2.2.8 -> 2.2.9
live555: upgrade 20210809 -> 20210824
sedutil: upgrade 1.15.1.01 -> 1.20.0
zangrc (14):
python3-flask-migrate: upgrade 3.0.1 -> 3.1.0
python3-flask-socketio: upgrade 5.1.0 -> 5.1.1
python3-google-api-python-client: upgrade 2.15.0 -> 2.17.0
python3-grpcio-tools: upgrade 1.38.1 -> 1.39.0
python3-grpcio: upgrade 1.38.1 -> 1.39.0
python3-wheel: upgrade 0.36.2 -> 0.37.0
libio-socket-ssl-perl: upgrade 2.071 -> 2.072
python3-aiohttp-jinja2: upgrade 1.4.2 -> 1.5
python3-gevent: upgrade 21.1.2 -> 21.8.0
python3-google-api-python-client: upgrade 2.17.0 -> 2.18.0
python3-h5py: upgrade 3.3.0 -> 3.4.0
python3-haversine: upgrade 2.3.1 -> 2.4.0
python3-pyephem: upgrade 3.7.7.1 -> 4.0.0.2
rdma-core: upgrade 35.0 -> 36.0
zhengruoqin (12):
libqmi: upgrade 1.28.8 -> 1.30.0
sedutil: upgrade 1.15.1 -> 1.15.1.01
libencode-perl: upgrade 3.11 -> 3.12
python3-pymisp: upgrade 2.4.144 -> 2.4.148
python3-pyzmq: upgrade 22.1.0 -> 22.2.1
python3-tqdm: upgrade 4.62.0 -> 4.62.2
iwd: upgrade 1.16 -> 1.17
xmlsec1: upgrade 1.2.31 -> 1.2.32
xrdb: upgrade 1.2.0 -> 1.2.1
python3-regex: upgrade 2021.8.3 -> 2021.8.27
python3-sqlalchemy: upgrade 1.4.22 -> 1.4.23
python3-stevedore: upgrade 3.3.0 -> 3.4.0
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I2960f1ce53a1e2cde8b03b929829db9a2f105541
diff --git a/poky/meta/recipes-graphics/vulkan/assimp/use-GNUInstallDirs-where-possible.patch b/poky/meta/recipes-graphics/vulkan/assimp/use-GNUInstallDirs-where-possible.patch
new file mode 100644
index 0000000..e4f5b9c
--- /dev/null
+++ b/poky/meta/recipes-graphics/vulkan/assimp/use-GNUInstallDirs-where-possible.patch
@@ -0,0 +1,257 @@
+From cbf94fd62ff831879d10f99aa7766d391ae8a9b7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Victor=20Matar=C3=A9?= <matare@fh-aachen.de>
+Date: Tue, 31 Mar 2020 21:30:07 +0200
+Subject: [PATCH] use GNUInstallDirs where possible
+
+Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and
+disable redefining FHS-mandated install locations via user-editable
+ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary,
+Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables.
+---
+ CMakeLists.txt | 36 ++++++++++++++++++++++------------
+ assimp.pc.in | 6 ++----
+ assimpTargets-debug.cmake.in | 20 +++++++++----------
+ assimpTargets-release.cmake.in | 18 ++++++++---------
+ assimpTargets.cmake.in | 15 +-------------
+ 5 files changed, 45 insertions(+), 50 deletions(-)
+
+Upstream-Status: Backport
+Comment: Additionally remove setting of ASSIMP_LIBRARY_DIRS, ASSIMP_INCLUDE_DIRS
+ and INTERFACE_INCLUDE_DIRECTORIES as default cross compile paths are enough
+ and setting them manually adds non-existing paths to CMake modules
+
+Signed-off-by: Ranjitsinh Rathod <ranjitsinh.rathod@kpit.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dcafb649f5..c23c0df33e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M
+ SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev)
+ SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names")
+
+-IF( UNIX )
+- # Use GNUInstallDirs for Unix predefined directories
+- INCLUDE(GNUInstallDirs)
+-ENDIF( UNIX )
+-
+ # Grouped compiler settings
+ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
+ IF(NOT HUNTER_ENABLED)
+@@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
+ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" )
+ ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR )
+
+-# Cache these to allow the user to override them manually.
+-SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
+- "Path the built library files are installed to." )
+-SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
+- "Path the header files are installed to." )
+-SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
+- "Path the tool executables are installed to." )
+-
+ get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG)
+
+ IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug"))
+@@ -391,6 +378,29 @@ IF(HUNTER_ENABLED)
+ )
+ ELSE(HUNTER_ENABLED)
+ # cmake configuration files
++
++ IF( UNIX )
++ # Use GNUInstallDirs for Unix predefined directories
++ INCLUDE(GNUInstallDirs)
++
++ SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
++ SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
++ SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR})
++ ELSE( UNIX )
++ # Cache these to allow the user to override them on non-Unix platforms
++ SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING
++ "Path the built library files are installed to." )
++ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING
++ "Path the header files are installed to." )
++ SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING
++ "Path the tool executables are installed to." )
++
++ SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR})
++ SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR})
++ SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR})
++ ENDIF( UNIX )
++
++
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE)
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE)
+ IF (is_multi_config)
+diff --git a/assimp.pc.in b/assimp.pc.in
+index c659e19f2c..555a3a1d3b 100644
+--- a/assimp.pc.in
++++ b/assimp.pc.in
+@@ -1,7 +1,5 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@CMAKE_INSTALL_PREFIX@/
+-libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
+
+ Name: @CMAKE_PROJECT_NAME@
+ Description: Import various well-known 3D model formats in an uniform manner.
+diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in
+index 1ebe2a6081..f5034c9349 100644
+--- a/assimpTargets-debug.cmake.in
++++ b/assimpTargets-debug.cmake.in
+@@ -42,22 +42,22 @@ if(MSVC)
+ # Import target "assimp::assimp" for configuration "Debug"
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(assimp::assimp PROPERTIES
+- IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}"
+- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
++ IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
+ else()
+ set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
+
+ # Import target "assimp::assimp" for configuration "Debug"
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(assimp::assimp PROPERTIES
+- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
+ endif()
+
+ else()
+@@ -66,17 +66,17 @@ else()
+ set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
+ set_target_properties(assimp::assimp PROPERTIES
+ IMPORTED_SONAME_DEBUG "${sharedLibraryName}"
+- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
+ else()
+ set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
+ set_target_properties(assimp::assimp PROPERTIES
+- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
+ endif()
+ endif()
+
+diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
+index f3db8f12cd..a416e8899b 100644
+--- a/assimpTargets-release.cmake.in
++++ b/assimpTargets-release.cmake.in
+@@ -42,12 +42,12 @@ if(MSVC)
+ # Import target "assimp::assimp" for configuration "Release"
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(assimp::assimp PROPERTIES
+- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
+- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
++ IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}"
++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}")
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}")
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" )
+ else()
+ set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
+
+@@ -57,7 +57,7 @@ if(MSVC)
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}")
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}")
+ endif()
+
+ else()
+@@ -70,17 +70,17 @@ else()
+ endif()
+ set_target_properties(assimp::assimp PROPERTIES
+ IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
+- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" )
+ else()
+ set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
+ set_target_properties(assimp::assimp PROPERTIES
+- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" )
+ endif()
+ endif()
+
+@@ -91,8 +91,6 @@ get_filename_component(ASSIMP_ROOT_DIR "@CMAKE_INSTALL_PREFIX@" REALPATH)
+
+ set( ASSIMP_CXX_FLAGS ) # dynamically linked library
+ set( ASSIMP_LINK_FLAGS "" )
+-set( ASSIMP_LIBRARY_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_LIB_INSTALL_DIR@")
+-set( ASSIMP_INCLUDE_DIRS "${ASSIMP_ROOT_DIR}/@ASSIMP_INCLUDE_INSTALL_DIR@")
+ if(ASSIMP_BUILD_SHARED_LIBS)
+ set( ASSIMP_LIBRARIES ${sharedLibraryName})
+ else()
+
+diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in
+index ab1a8d2c7b..ef90c834a6 100644
+--- a/assimpTargets.cmake.in
++++ b/assimpTargets.cmake.in
+@@ -40,16 +40,6 @@ unset(_targetsDefined)
+ unset(_targetsNotDefined)
+ unset(_expectedTargets)
+
+-
+-# Compute the installation prefix relative to this file.
+-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
+-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH)
+-if(_IMPORT_PREFIX STREQUAL "/")
+- set(_IMPORT_PREFIX "")
+-endif()
+-
+ # Create imported target assimp::assimp
+ if(@BUILD_SHARED_LIBS@)
+ add_library(assimp::assimp SHARED IMPORTED)
+@@ -60,7 +50,7 @@ endif()
+ set_target_properties(assimp::assimp PROPERTIES
+ COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION"
+ INTERFACE_assimp_MAJOR_VERSION "1"
+- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include"
++ #INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
+ #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine"
+ )
+
+@@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES})
+ include(${f})
+ endforeach()
+
+-# Cleanup temporary variables.
+-set(_IMPORT_PREFIX)
+-
+ # Loop over all imported files and verify that they actually exist
+ foreach(target ${_IMPORT_CHECK_TARGETS} )
+ foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} )
+