Was debating doing this in the last live update, and ffmpeg has now
updated (one more) ./configure dependency to require spirv_library
(aka either glslang or shaderc). Given we need to BDEPEND on shaderc
with USE=vulkan, and that losing these features if USE=-shaderc will
be confusing for users, it is probably best to merge these.
All users that had USE=shaderc set, also had vulkan due to the
REQUIRED_USE and so will not lose any features by surprise. At most
may wonder where the USE went.
The only mild annoyance is that users with USE="abi_x86_32 vulkan
-shaderc" may newly need to set abi_x86_32 on shaderc+glslang or
disable USE=vulkan.
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Would prefer not use conditional patching, so use something similar to
upstream's (initial) solution rather than the PR's (thanks for the
information and links though!). It was reverted upstream because it
failed with the gold linker, but Gentoo does not support using gold
anymore and the current patch should not make things worse for gold
either way.
Also include in 6.10 + 6.11.9999 for now given a fix would miss the
6.10.2 release (and we copy 6.10.9999 -> 6.10.2) and may still be
needed for some time or more releases given this had no activity in
over a month upstream. Will not add to patchsets so that we can
remove it easily once fixed.
Closes: https://github.com/gentoo/gentoo/pull/45441
Thanks-to: Z. Liu <zhixu.liu@gmail.com>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Broken forever (way before Toralf noticed it), and upstream hasn't
merged a PR in a concerningly long time.
Closes: https://bugs.gentoo.org/957000
Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
Use the new meson_add_machine_file helper to pick either --native-file or
--cross-file as appropriate.
Don't bother checking the dtrace-symlink USE flag because it's simpler to just
invoke stap-dtrace unconditionally.
Include systemtap in DEPEND because it's also needed for a header.
Export CC because it's needed by systemtap when cross-compiling.
Closes: https://bugs.gentoo.org/968718
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Sometimes it is necessary to give Meson configuration beyond what the
eclass currently writes to the .ini files. Multiple native and cross
files can be specified, and Meson will use them all. The only rule is
that you cannot repeat a section within the same file.
The given argument is used to form the filename for the .ini file. It is
important for the filename to be unique because timestamp changes will
trigger a reconfigure.
meson_add_machine_file uses either --native-file or --cross-file depending on
whether we're cross-compiling (including multilib) or not.
Signed-off-by: James Le Cuirot <chewi@gentoo.org>