From 1cfea2a84c51291a77ab820b6871efcff10c148d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 7 Nov 2022 21:22:54 +0000 Subject: gentoo auto-resync : 07:11:2022 - 21:22:53 --- media-libs/Manifest.gz | Bin 67089 -> 67078 bytes media-libs/libplacebo/Manifest | 11 +- .../libplacebo-4.192.1-python-executable.patch | 8 + .../files/libplacebo-5.229.1-llvm-libunwind.patch | 9 + .../libplacebo-5.229.1-python-executable.patch | 11 + .../files/libplacebo-5.229.1-shared-glslang.patch | 12 + media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild | 73 ---- media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild | 81 ++++ media-libs/libplacebo/libplacebo-5.229.1.ebuild | 91 ++++ media-libs/libplacebo/libplacebo-9999.ebuild | 93 ++-- media-libs/mesa/Manifest | 2 + media-libs/mesa/mesa-22.2.3.ebuild | 476 +++++++++++++++++++++ 12 files changed, 755 insertions(+), 112 deletions(-) create mode 100644 media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch create mode 100644 media-libs/libplacebo/files/libplacebo-5.229.1-llvm-libunwind.patch create mode 100644 media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch create mode 100644 media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch delete mode 100644 media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild create mode 100644 media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild create mode 100644 media-libs/libplacebo/libplacebo-5.229.1.ebuild create mode 100644 media-libs/mesa/mesa-22.2.3.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 266f972f8bb5..ef79b14e871a 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest index 532304cc2e9a..9b4222e0dd7e 100644 --- a/media-libs/libplacebo/Manifest +++ b/media-libs/libplacebo/Manifest @@ -1,5 +1,12 @@ AUX libplacebo-2.72.2-fix-vulkan-undeclared.patch 963 BLAKE2B 3b6944af02eb6078dc5224309e3af4b65a4681e29701622e95166a4156d3eecd6e671fc2b4acec633340c0582afc96419b2a7a170de1b7976b04c880a1d4672a SHA512 4154e1ec3f06b08628444ba36fcdd4bac48b06ef8d0caf689a2fe3fb3e48ed7d1e4cc3f568401025174235e1ce1359eb4f010047aee99cfe7e0fa20c4cfa01c5 +AUX libplacebo-4.192.1-python-executable.patch 266 BLAKE2B 23146785355b86440974d5017f7a1f0766d65b937153755ddf4f6785ab835232f5b2f363279a8df332333c2ef9de9bfef8ff7acaf70cec892f54c87283a5b7df SHA512 ad3a07536731b2c454ad342c0db330e13fe12f61b5fce76b49be643d3bba3297bd53723d7bc34898346cbbc481d59437b1a65f56225790824eedca7ee81606c6 +AUX libplacebo-5.229.1-llvm-libunwind.patch 418 BLAKE2B 0042bc6404de57fbbb814ebc91bb51ee5a6bb279a960af81bd2bc71b9eb092c0ee183e31614a892d26508516dd550837a6d5c8038512e8f8e899cddf1236f600 SHA512 b6a40675f0ea5b6e36fb47b56e08dc1ec7425ff8193dfd92aeccd3830da91b77410b9f5792b233b630bdd7422993d6d0f22b82761e29d17336357bb47c89bc48 +AUX libplacebo-5.229.1-python-executable.patch 400 BLAKE2B 1de79b031d4aa7c55e058db788d2ba3ed6a66e58dac325a091b40be58b95e6cbacf852a0f1e84465d2834ecd07aa920390b90a81e03c3e21825eb0ed56c2b68f SHA512 5b8c1f5856b1e0cf67a306fc7b3fce552f26c4e8d785a2a0570b1ea983d487cd235fb9bed10f86747597f19d2b2d9a920b19a88acf3e48d44aeaa999849cff76 +AUX libplacebo-5.229.1-shared-glslang.patch 678 BLAKE2B ff1dff5e3009f165091cc17e1cfbd7fb3ed90763e96a437b791486c27b75b8d5c308ab9d9704777071fc0483c2b0f6e48cc9a91c22b6296a12a184f6f6e0e27c SHA512 ec345ac50603d1b77dcc939e87534eaec735bd3dae81579e92c90b8dafa20970b14a1afc2785fe8f7121398f6b81b34bfe0d4d5c1a1727a131e0442c4f9e2da1 +DIST libplacebo-glad-2.0.2.tar.gz 581059 BLAKE2B ce7f63ac1f9a6263d3de3f9c56f4a47b8bbdd1ac7eba875c7ad807ae923c8a82d7f323725af8b64adbbc30c2e014c6a5ed8b3325b7f15984222075874a68c0cf SHA512 c719bcd7a0aaa56d89158c9f347410b9e66466fb957a5a5f201b4cce21a0c1589d6d2a866e12134ed43435a5567d842fbfd134559dea1ca59a34b079ff6f5d37 DIST libplacebo-v4.192.1.tar.gz 632762 BLAKE2B 19a3bee6f05632cde1739fe8c861c96035a7b1f5ed2af6bbc67776529551c88f5da63d49dede2d7ee2c8d96edd6faf733e0371714028b72eddcf4c4cf23b937f SHA512 780dff60a31a9c7fff47522385235077cc6b1a38be32bc0276c090d89ce25754dd0b910db5be631d0065337fe4700f68adabee06f48a4935d422f09f2e0e5525 -EBUILD libplacebo-4.192.1-r1.ebuild 1925 BLAKE2B 06454edc71bba48d1b074d4023d67faab3d03150b822ee2675ac1a837290bbf4cce686fb54f81ca0e98194e9b1e7d13730d4412ce6acd2faacee34445f978dcc SHA512 ca847e8c66e44acf97c27e27eed30005770bbe7cc2a0f585da314177fd8fe6c3be238d2748ed7bf1fa1a02a7108cb582fa038f5a9379a856c0ca3fff3e96ac23 -EBUILD libplacebo-9999.ebuild 1895 BLAKE2B 15b4a593deae2f103299def490173b2d2cd3a76dfacf37bc54492a12ddbf1873297b4b5ff8b8e6e895ba4f8fb568b5a435114c132568c9dd2a90bbfcd5229be0 SHA512 2de178da7be187146a9f6d6ba0854b43ac1917ef69e3ab4957284e89c6c1625d98279d01fa2e78dfa7236800b7d80b05c96838856312199c8184282bcd76133d +DIST libplacebo-v5.229.1.tar.gz 673121 BLAKE2B 0a59e16b4565b10b222c5a5a8e607670bd4010a2be9b99ebdc15638827fcaf21bbf3c16a3cd2b902bcef43041dec56441494a0f618094e14db8f99a9d314c621 SHA512 45efb252d5d44e5429790f9024b1b2a153051d6d604b07fcf3e4de7d49a2e91d20457be76e08b3b9ab43248c4a2e7268c9f8dc69837783e572f9b8735c955334 +EBUILD libplacebo-4.192.1-r2.ebuild 2333 BLAKE2B e3c2735e64a54f34c83b14d425e8c99170e9d8048bd02ae1b4fc44e676b8fe1e03d92bcfbc7d353186a98387c0609d767bfe118d2e64e54baba577fe58b7071f SHA512 49008898a94dd60fd96a9489dca9421c2d3d6a34bcc3a9b8dd953707a4f7a6a7534112a4cd4bc339b637317590c8329b210eb8310924f3bb945a806f884536b7 +EBUILD libplacebo-5.229.1.ebuild 2646 BLAKE2B 72410323371e7f3c6e1b389262d1e0c6f5e06a5b07ee58909b4e7db5a3793d8f6590585a9a24c5db14ab989d7a73b414a0622e93c0e50214f0956e2375e05d13 SHA512 a3307baf16783b55a91aec207461f88bfdfeb25d05454456213e22b9cc74a1bd4263d000288c98b260c8929ecb7e7cd667f3583e38b8be275b86748677e57ea5 +EBUILD libplacebo-9999.ebuild 2646 BLAKE2B 72410323371e7f3c6e1b389262d1e0c6f5e06a5b07ee58909b4e7db5a3793d8f6590585a9a24c5db14ab989d7a73b414a0622e93c0e50214f0956e2375e05d13 SHA512 a3307baf16783b55a91aec207461f88bfdfeb25d05454456213e22b9cc74a1bd4263d000288c98b260c8929ecb7e7cd667f3583e38b8be275b86748677e57ea5 MISC metadata.xml 678 BLAKE2B 7b4c70ba3d89a81182905365354eaac312888c492a33e2d7b410c79139af9680aeac65c2dc6b692410e601c9bba13c4ff16f80c48c2d9accc3d5d1f82be5395f SHA512 64cd5d5d2231ed1bf6298f074d56471bf158ea29fdac3c4d7f1e54b7259e4ce294b6c1ed31b1397fad952224e9211778bdb59dd33c429870fd58ab9931ab0677 diff --git a/media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch b/media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch new file mode 100644 index 000000000000..8fbad683e397 --- /dev/null +++ b/media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/731728 +--- a/src/meson.build ++++ b/src/meson.build +@@ -9,3 +9,3 @@ + # Dependencies +-prog_python = import('python').find_installation() ++prog_python = import('python').find_installation('python3') + libm = cc.find_library('m', required: false) diff --git a/media-libs/libplacebo/files/libplacebo-5.229.1-llvm-libunwind.patch b/media-libs/libplacebo/files/libplacebo-5.229.1-llvm-libunwind.patch new file mode 100644 index 000000000000..a1f0aaa2b806 --- /dev/null +++ b/media-libs/libplacebo/files/libplacebo-5.229.1-llvm-libunwind.patch @@ -0,0 +1,9 @@ +llvm-libunwind does not have cmake nor pkg-config files, not great +but switch to cc.find for simplicity with meson feature-type options +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,3 +1,3 @@ + ### Common dependencies +-unwind = dependency('libunwind', required: get_option('unwind')) ++unwind = cc.find_library('libunwind', required: get_option('unwind')) + libexecinfo = cc.find_library('execinfo', required: false) diff --git a/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch b/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch new file mode 100644 index 000000000000..35486262c992 --- /dev/null +++ b/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch @@ -0,0 +1,11 @@ +Upstream bundles python deps and uses same interpreter as meson, +but we don't and need this to use the eclass' python3 instead. + +https://bugs.gentoo.org/731728 +--- a/meson.build ++++ b/meson.build +@@ -323,3 +323,3 @@ + thirdparty = meson.project_source_root()/'3rdparty' +-python = import('python').find_installation() ++python = import('python').find_installation('python3') + python_env = environment() diff --git a/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch b/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch new file mode 100644 index 000000000000..14ce1f6972c0 --- /dev/null +++ b/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch @@ -0,0 +1,12 @@ +OSDependent and OGLCompiler are already included in the shared libglslang, +and glslang-1.3.231 normally does not install these with shared builds. +--- a/src/glsl/meson.build ++++ b/src/glsl/meson.build +@@ -21,5 +21,5 @@ + cxx.find_library('MachineIndependent', required: false), +- cxx.find_library('OSDependent', required: glslang_req), ++ cxx.find_library('OSDependent', required: false), + cxx.find_library('HLSL', required: glslang_req), +- cxx.find_library('OGLCompiler', required: glslang_req), ++ cxx.find_library('OGLCompiler', required: false), + cxx.find_library('GenericCodeGen', required: false), diff --git a/media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild b/media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild deleted file mode 100644 index c047cd32fdf8..000000000000 --- a/media-libs/libplacebo/libplacebo-4.192.1-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..10} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git" - inherit git-r3 -else - KEYWORDS="amd64 ppc64 x86" - SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz" - S="${WORKDIR}/${PN}-v${PV}" -fi - -inherit meson-multilib python-any-r1 - -DESCRIPTION="Reusable library for GPU-accelerated image processing primitives" -HOMEPAGE="https://code.videolan.org/videolan/libplacebo" - -LICENSE="LGPL-2.1+" -SLOT="0/$(ver_cut 2)" # libplacebo.so version -IUSE="glslang lcms +opengl +shaderc test unwind +vulkan" -REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" -RESTRICT="!test? ( test )" - -RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) - opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] ) - shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] ) - unwind? ( sys-libs/libunwind:= ) - vulkan? ( - dev-util/vulkan-headers - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND}" - -BDEPEND="virtual/pkgconfig - vulkan? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') - )" - -PATCHES=( "${FILESDIR}"/libplacebo-2.72.2-fix-vulkan-undeclared.patch ) - -python_check_deps() { - has_version -b "dev-python/mako[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use vulkan && python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=( - $(meson_feature glslang) - $(meson_feature lcms) - $(meson_feature opengl) - $(meson_feature shaderc) - $(meson_feature unwind) - $(meson_feature vulkan) - $(meson_use test tests) - # hard-code path from dev-util/vulkan-headers - -Dvulkan-registry=/usr/share/vulkan/registry/vk.xml - ) - meson_src_configure -} - -multilib_src_test() { - meson_src_test -t 10 -} diff --git a/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild new file mode 100644 index 000000000000..96e2470a8d31 --- /dev/null +++ b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{8..10} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git" + inherit git-r3 +else + KEYWORDS="amd64 ppc64 x86" + SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz" + S="${WORKDIR}/${PN}-v${PV}" +fi + +inherit meson-multilib python-any-r1 + +DESCRIPTION="Reusable library for GPU-accelerated image processing primitives" +HOMEPAGE="https://code.videolan.org/videolan/libplacebo" + +LICENSE="LGPL-2.1+" +SLOT="0/$(ver_cut 2)" # libplacebo.so version +IUSE="glslang lcms +opengl +shaderc test unwind +vulkan" +REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" +RESTRICT="!test? ( test )" + +# Build broken with newer glslang due to struct TBuiltInResource changes +# (also breaks ABI wrt https://github.com/KhronosGroup/glslang/issues/3052). +# Fixed in next libplacebo version, but this older one is needed for stable +# mpv. Note glslang can be disabled, shaderc provides same functionality. +RDEPEND="glslang? ( =media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] ) + unwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) + vulkan? ( + dev-util/vulkan-headers + media-libs/vulkan-loader[${MULTILIB_USEDEP}] + )" +DEPEND="${RDEPEND}" + +BDEPEND="virtual/pkgconfig + vulkan? ( + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') + )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.72.2-fix-vulkan-undeclared.patch + "${FILESDIR}"/${P}-python-executable.patch +) + +python_check_deps() { + has_version -b "dev-python/mako[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use vulkan && python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=( + -Ddemos=false #851927 + $(meson_feature glslang) + $(meson_feature lcms) + $(meson_feature opengl) + $(meson_feature shaderc) + $(meson_feature unwind) + $(meson_feature vulkan) + $(meson_use test tests) + # hard-code path from dev-util/vulkan-headers + -Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml + ) + meson_src_configure +} + +multilib_src_test() { + meson_src_test -t 10 +} diff --git a/media-libs/libplacebo/libplacebo-5.229.1.ebuild b/media-libs/libplacebo/libplacebo-5.229.1.ebuild new file mode 100644 index 000000000000..305607263956 --- /dev/null +++ b/media-libs/libplacebo/libplacebo-5.229.1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +inherit meson-multilib python-any-r1 + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git" + inherit git-r3 +else + GLAD_PV=2.0.2 + SRC_URI=" + https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz + opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz )" + S="${WORKDIR}/${PN}-v${PV}" + KEYWORDS="~amd64 ~ppc64 ~x86" +fi + +DESCRIPTION="Reusable library for GPU-accelerated image processing primitives" +HOMEPAGE="https://code.videolan.org/videolan/libplacebo/" + +LICENSE="LGPL-2.1+ opengl? ( MIT )" +SLOT="0/$(ver_cut 2 ${PV}.9999)" # soname +IUSE="glslang lcms llvm-libunwind +opengl +shaderc test unwind +vulkan" +RESTRICT="!test? ( test )" +REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" + +# libglvnd is used with dlopen() through glad (inc. egl/gles) +RDEPEND=" + lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) + opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP}] ) + shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) + !shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] ) + !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) + ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers )" +BDEPEND=" + virtual/pkgconfig + vulkan? ( $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )" + +PATCHES=( + "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch + "${FILESDIR}"/${PN}-5.229.1-python-executable.patch + "${FILESDIR}"/${PN}-5.229.1-shared-glslang.patch +) + +python_check_deps() { + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use vulkan && python-any-r1_pkg_setup +} + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + local EGIT_SUBMODULES=( $(usev opengl 3rdparty/glad) ) + git-r3_src_unpack + else + default + if use opengl; then + rmdir "${S}"/3rdparty/glad || die + mv glad-${GLAD_PV} "${S}"/3rdparty/glad || die + fi + fi +} + +multilib_src_configure() { + local emesonargs=( + -Ddemos=false #851927 + $(meson_use test tests) + $(meson_feature lcms) + $(meson_feature opengl) + $(meson_feature opengl gl-proc-addr) + $(meson_feature shaderc) + $(usex shaderc -Dglslang=disabled $(meson_feature glslang)) + $(meson_feature unwind) + $(meson_feature vulkan) + $(meson_feature vulkan vk-proc-addr) + -Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml + ) + + meson_src_configure +} diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild index 72d2114b55cb..305607263956 100644 --- a/media-libs/libplacebo/libplacebo-9999.ebuild +++ b/media-libs/libplacebo/libplacebo-9999.ebuild @@ -1,72 +1,91 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) +inherit meson-multilib python-any-r1 -if [[ "${PV}" == "9999" ]]; then +if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git" inherit git-r3 else - KEYWORDS="~amd64 ~ppc64 ~x86" - SRC_URI="https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz" + GLAD_PV=2.0.2 + SRC_URI=" + https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.gz + opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz )" S="${WORKDIR}/${PN}-v${PV}" + KEYWORDS="~amd64 ~ppc64 ~x86" fi -inherit meson-multilib python-any-r1 - DESCRIPTION="Reusable library for GPU-accelerated image processing primitives" -HOMEPAGE="https://code.videolan.org/videolan/libplacebo" +HOMEPAGE="https://code.videolan.org/videolan/libplacebo/" -LICENSE="LGPL-2.1+" -# Please add a sub-slot for releases depending on libplacebo.so version -SLOT="0/9999" -IUSE="glslang lcms +opengl +shaderc test unwind +vulkan" -REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" +LICENSE="LGPL-2.1+ opengl? ( MIT )" +SLOT="0/$(ver_cut 2 ${PV}.9999)" # soname +IUSE="glslang lcms llvm-libunwind +opengl +shaderc test unwind +vulkan" RESTRICT="!test? ( test )" +REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" -RDEPEND="glslang? ( dev-util/glslang[${MULTILIB_USEDEP}] ) +# libglvnd is used with dlopen() through glad (inc. egl/gles) +RDEPEND=" lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) - opengl? ( media-libs/libepoxy[${MULTILIB_USEDEP}] ) - shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] ) - unwind? ( sys-libs/libunwind:= ) - vulkan? ( - dev-util/vulkan-headers - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND}" + opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP}] ) + shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) + !shaderc? ( glslang? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) ) + unwind? ( + llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] ) + !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) + ) + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )" +DEPEND=" + ${RDEPEND} + vulkan? ( dev-util/vulkan-headers )" +BDEPEND=" + virtual/pkgconfig + vulkan? ( $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') )" -BDEPEND="virtual/pkgconfig - vulkan? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/mako[${PYTHON_USEDEP}]') - )" +PATCHES=( + "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch + "${FILESDIR}"/${PN}-5.229.1-python-executable.patch + "${FILESDIR}"/${PN}-5.229.1-shared-glslang.patch +) python_check_deps() { - has_version -b "dev-python/mako[${PYTHON_USEDEP}]" + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" } pkg_setup() { use vulkan && python-any-r1_pkg_setup } +src_unpack() { + if [[ ${PV} == 9999 ]]; then + local EGIT_SUBMODULES=( $(usev opengl 3rdparty/glad) ) + git-r3_src_unpack + else + default + if use opengl; then + rmdir "${S}"/3rdparty/glad || die + mv glad-${GLAD_PV} "${S}"/3rdparty/glad || die + fi + fi +} + multilib_src_configure() { local emesonargs=( - $(meson_feature glslang) + -Ddemos=false #851927 + $(meson_use test tests) $(meson_feature lcms) $(meson_feature opengl) + $(meson_feature opengl gl-proc-addr) $(meson_feature shaderc) + $(usex shaderc -Dglslang=disabled $(meson_feature glslang)) $(meson_feature unwind) $(meson_feature vulkan) - $(meson_use test tests) - # hard-code path from dev-util/vulkan-headers - -Dvulkan-registry=/usr/share/vulkan/registry/vk.xml + $(meson_feature vulkan vk-proc-addr) + -Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml ) - meson_src_configure -} -multilib_src_test() { - meson_src_test -t 10 + meson_src_configure } diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 224c8f930bea..3c40a5ff75db 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,6 +1,8 @@ DIST mesa-22.1.7.tar.xz 16109944 BLAKE2B 0d4724068eff0ad242e81808ff94b73e1b5da810d27706b5a594ad77875b54562db6d9f752b61bcfff773b26bbc64b751d4dd13cfa256106d3114377ea668d26 SHA512 447e87359445edce231761d94b316b2aa20e9ab58e4b59d75cbb1696dd0900e7164c32bebc3b75700b4070570b456f7a8cf0914181371754a52427d34e4b9120 DIST mesa-22.2.2.tar.xz 16424508 BLAKE2B 08ab46718a767a7771affb4b5b6164fbc5430fd5a657cdf4008f16a84892673824976ba84450afbbb3a9431868dddc7f3570c11ab319f1bc9b892f46327b2c59 SHA512 a1eb67e1ae4880c79b1fdc570f4389baba0b8ba796da7e695c9af19a7d92b6c06b95570e6c796548b61355989025fb7efbf9acac74cbd695f7e297dc913b933c +DIST mesa-22.2.3.tar.xz 16464020 BLAKE2B 8f1482983ff9de9565a7f48f22e315b022ea8a07d7157e0d202c4d027d13ad4563c40ea63e1d0a92675af7f23d5245be9ed137955c3a9dd85171a35d497a94b2 SHA512 08e9ce43392c46f9c0d122d70e118511eea81422d06f93ab6d330689b46feed3ac1c3bdcdcfd4a27cd5b9eaf26aab518d152a2c753f07b8ed19575d4ed892ad6 EBUILD mesa-22.1.7.ebuild 12037 BLAKE2B 36b57a2a4184e6788a4ccee1bab1b1281defbb1a26443266a6ede1d63fcac8f07994045b1dbcc725be4e4b1191603dc4ecf305159861fc3423799fb97652fa2e SHA512 e5b1099fc84179b3feaa4bdd94b01e286ab208cd2207bdbe61d951752b6e7f1ddc3942c260c8e24c5bd6019be2b8e0f7cb69685ef18e7271b065aba859cd5b36 EBUILD mesa-22.2.2.ebuild 12670 BLAKE2B 183cad628fc9b0f4af0dbc1306fb1b0d3c1abfd6d7278f04b407b5f1eee3906de0e646f21ad8c0351d233d214ee61b523dfb8e3553054465dc68bbeed8532c1b SHA512 ad642794372efcd0c3588ef198c8f81a4944e92c0f3b834cd833e1fca48d2b32e2422113999f3f1c807779d057498e6d304217b4028480ef9da045ec7beb160d +EBUILD mesa-22.2.3.ebuild 12670 BLAKE2B 183cad628fc9b0f4af0dbc1306fb1b0d3c1abfd6d7278f04b407b5f1eee3906de0e646f21ad8c0351d233d214ee61b523dfb8e3553054465dc68bbeed8532c1b SHA512 ad642794372efcd0c3588ef198c8f81a4944e92c0f3b834cd833e1fca48d2b32e2422113999f3f1c807779d057498e6d304217b4028480ef9da045ec7beb160d EBUILD mesa-9999.ebuild 12287 BLAKE2B 42b150a4980a9a4e27ef4f1a529ad156e60e0f1e59756f8b2b16e029e572746590db813f6d809143574e5a9cee616a3b53a4bed608195eff5e1a996249655dc8 SHA512 507f2e9bdc6e403fe1f54f2844deabd992a70de30b6631aaa0c23f39640ff83e4c6b2dade2c54bf0292c04d72e88f32aebfa5ec1c4ea01e1879fb17cfbaf8795 MISC metadata.xml 1705 BLAKE2B d00c5edf48d5fb9c7485958569d8be761b0a8a79b893d50347687d2fd1c4ffac1325bbc32254737f8249e8b2cef2e86ae7b06a3c6351f7a03844f48ce1df428d SHA512 5c67ebd046a486e5e45864f79233ce659e0fa1d4c30284e9f3908c73d2f3480af50dddcf0676b8ed0ffe60a991ed4b59ce199d7ea16d6520a191ad076c5a9ec0 diff --git a/media-libs/mesa/mesa-22.2.3.ebuild b/media-libs/mesa/mesa-22.2.3.ebuild new file mode 100644 index 000000000000..c0bc271552b9 --- /dev/null +++ b/media-libs/mesa/mesa-22.2.3.ebuild @@ -0,0 +1,476 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit llvm meson-multilib python-any-r1 linux-info + +MY_P="${P/_/-}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT="!test? ( test )" + +RADEON_CARDS="r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm + lm-sensors opencl osmesa +proprietary-codecs selinux + test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa xvmc zink +zstd" + +REQUIRED_USE=" + d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + vulkan? ( video_cards_radeonsi? ( llvm ) ) + vulkan-overlay? ( vulkan ) + video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_radeonsi? ( llvm ) + xa? ( X ) + xvmc? ( X ) + zink? ( vulkan ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + video_cards_radeonsi? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3[${MULTILIB_USEDEP}] + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + vaapi? ( + >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( + >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}] + ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + ) + zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_MAX_SLOT="15" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:15[${MULTILIB_USEDEP}] + sys-devel/llvm:14[${MULTILIB_USEDEP}] + sys-devel/llvm:13[${MULTILIB_USEDEP}] + ) + =dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + vulkan? ( video_cards_radeonsi? ( dev-util/glslang ) ) + vulkan-overlay? ( dev-util/glslang ) + wayland? ( dev-util/wayland-scanner ) +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.1.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +llvm_check_deps() { + local flags=${MULTILIB_USEDEP} + if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi + then + flags+=",llvm_targets_AMDGPU(-)" + fi + + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_radeonsi && + ! use video_cards_v3d; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d" + fi + fi + + if use opencl; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" + fi + fi + + if use vaapi; then + if ! use video_cards_d3d12 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_d3d12 && + ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if use xvmc; then + if ! use video_cards_r600 && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" + fi + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_intel || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + if use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=() + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use video_cards_intel || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_d3d12 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + if use video_cards_r600 || + use video_cards_nouveau; then + emesonargs+=($(meson_feature xvmc gallium-xvmc)) + else + emesonargs+=(-Dgallium-xvmc=disabled) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_v3d || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable -- swrast + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_intel crocus i915 iris + gallium_enable video_cards_lima lima + gallium_enable video_cards_d3d12 d3d12 + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_virgl virgl + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable zink zink + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) + + if use vulkan; then + vulkan_enable video_cards_freedreno freedreno + vulkan_enable video_cards_intel intel + vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dshared-glapi=enabled + -Ddri3=enabled + -Degl=enabled + -Dgbm=enabled + -Dglvnd=true + $(meson_feature gles1) + $(meson_feature gles2) + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature unwind libunwind) + $(meson_feature zstd) + $(meson_use cpu_flags_x86_sse2 sse2) + -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} -- cgit v1.2.3