From f71e91f3fbcdebf01a5ecf58164716586daeaa5b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 Aug 2023 03:16:33 +0100 Subject: gentoo auto-resync : 04:08:2023 - 03:16:33 --- media-libs/Manifest.gz | Bin 68529 -> 68528 bytes media-libs/libplacebo/Manifest | 6 +- .../libplacebo-5.229.1-python-executable.patch | 8 +- media-libs/libplacebo/libplacebo-6.292.1.ebuild | 103 +++++++++++++++++++++ media-libs/libplacebo/libplacebo-9999.ebuild | 15 ++- 5 files changed, 123 insertions(+), 9 deletions(-) create mode 100644 media-libs/libplacebo/libplacebo-6.292.1.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index c8a4e2ddb4af..ac626c82db1f 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 98b1518d6d53..6e4289e2516a 100644 --- a/media-libs/libplacebo/Manifest +++ b/media-libs/libplacebo/Manifest @@ -1,9 +1,11 @@ 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-python-executable.patch 475 BLAKE2B 5ef42b9526c94a4d76caf5bbdc5370457e3b6a66cd38244235184e8e276445951973821fb9a1eeb3331b3071280d8917d52588212f9a49dce4f4e0bb08561bd6 SHA512 ad13ced0b2e2d214278750b2ad3116b4a62e023c023051afb4399489c1bd03378a056f1d189c238c7aeafd35e5fbf46204eccbc1c55eadee6034f230ff888191 DIST libplacebo-glad-2.0.4.tar.gz 599932 BLAKE2B 788d2b70222fd09eea02515bdf3cbc147540631bf35fe39f12aa21fdbabf3d229f4234a430217dfaf3363934b8be12dd6a19871049a7b117deb8260ec69f8c67 SHA512 328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7 DIST libplacebo-v5.264.1.tar.gz 725394 BLAKE2B 421de50ef5e2270e3ba32dd85d92d816a374257442b535face6cb8501d565652aae530b86a7d717c9352c6a82ca665ff7d91c2d9768365780cbbe4f48d1d3276 SHA512 305f43b71f078f4113def43c444df667dfbdd2a6a34d3b457b15da0b3499ca97ec9a8acbd151d58c8e1a593ace3d8aa61067b32556c6bae451efbb217d60a731 DIST libplacebo-v6.292.0.tar.bz2 623292 BLAKE2B 6ae5c0aaadf88e3e4ba2e4a95d0ac939d7a64ae65bef0c6fd3dbc294e9eb953d3114ab718e1b58476971bf24ec2632e8176bc4346ff59bfe7b24537c833a4f21 SHA512 30a7990e9aee5f18e0517a281017fb69be521390972bdb38c0db09ef83144673b1f59dd4c1f42c3f4ee298544ba032a74c5e672ef028fbbf20e178a059270864 +DIST libplacebo-v6.292.1.tar.bz2 702879 BLAKE2B 74319bdffb141d4ab50c04312dbcce8fe7926d28b59b2c088a975fec30b86b38bb99afc375de5d421f8f633524deb4a74bb30cd60ffb69b16caceccd0f4f13d9 SHA512 a519d540e5063905c7125ca90334471a21868e2795d3e2da502fe12adfa69555de5369b14d1d45f9d2b0ac589379ad687488896c6dbe22f1dbd7cc6f9eef544f EBUILD libplacebo-5.264.1.ebuild 2886 BLAKE2B 664ed4fefd05bb7eaa7a8bcf1154bb69b7214aec182997899d9262e7a4cd1ae3c927eca2f8ce27809c1de4ec33f094c6e6dbf5926216dd5d1f0389a269c91749 SHA512 c2a190f7cf65dfb3b63c4f2b47a34298d50200f56980e293f2aab93cc2d21aa978b112184894b6c14c4e060d744d094efabf54918f4141083468734cad998095 EBUILD libplacebo-6.292.0.ebuild 2890 BLAKE2B fae34108d3dabbcaffe13be6edb7d4766d890ad221c66489e23796d047e34b6a16da70d01ed7cc010f7440b3fcb5661e633327b491e11dd750157871044f41c6 SHA512 65f7e7f901857ba717973a218ed03b170d97775e9c5e5621731ad547d9c00a139daa81379e5e0e519cf097ba4a97588f1b31648ff06708510f435a015275d1ba -EBUILD libplacebo-9999.ebuild 2890 BLAKE2B fae34108d3dabbcaffe13be6edb7d4766d890ad221c66489e23796d047e34b6a16da70d01ed7cc010f7440b3fcb5661e633327b491e11dd750157871044f41c6 SHA512 65f7e7f901857ba717973a218ed03b170d97775e9c5e5621731ad547d9c00a139daa81379e5e0e519cf097ba4a97588f1b31648ff06708510f435a015275d1ba +EBUILD libplacebo-6.292.1.ebuild 2904 BLAKE2B 0af299739a87a491d646b8c64069265c6a8f0b7f115a9b961877133333fbaeec668b9c5a001ec476452a540143e42b5b0b4ae90a162fb391831b559f42c42046 SHA512 afe742980e22482b57ed909ca718aa33c5557ad534f0182117281c1133d6a4bdec494bc6ea20bf15f7ddc90e9fff6230aac1929fbc8d11ca3bc1db6b29ffe1c2 +EBUILD libplacebo-9999.ebuild 2904 BLAKE2B 0af299739a87a491d646b8c64069265c6a8f0b7f115a9b961877133333fbaeec668b9c5a001ec476452a540143e42b5b0b4ae90a162fb391831b559f42c42046 SHA512 afe742980e22482b57ed909ca718aa33c5557ad534f0182117281c1133d6a4bdec494bc6ea20bf15f7ddc90e9fff6230aac1929fbc8d11ca3bc1db6b29ffe1c2 MISC metadata.xml 611 BLAKE2B 1b145c5a74eee8669c69ec016d3553a381c523eb11450ff07f7e9b26eb49b8a0be0990dd51e3037a16243442bff4c7d9c2f99ab17a3d5ff16b20971adcbb8667 SHA512 9d0bc70cf3ed8e9f24ce3cbb350d536f600d7967bb1d2237092d9b11297abda3e055b68560dcee6a35438815f040d4d7ef483bc35a93c0425fff36e5f318ad43 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 index 35486262c992..181e281bfde1 100644 --- a/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch +++ b/media-libs/libplacebo/files/libplacebo-5.229.1-python-executable.patch @@ -1,5 +1,7 @@ -Upstream bundles python deps and uses same interpreter as meson, -but we don't and need this to use the eclass' python3 instead. +Ensure we get the interpreter from python-any-r1 rather than same +as meson. Plus find_program() is quicker than find_installation(), +and the latter also needs distutils that is unavailable with +python3_12 without setuptools. https://bugs.gentoo.org/731728 --- a/meson.build @@ -7,5 +9,5 @@ https://bugs.gentoo.org/731728 @@ -323,3 +323,3 @@ thirdparty = meson.project_source_root()/'3rdparty' -python = import('python').find_installation() -+python = import('python').find_installation('python3') ++python = find_program('python3') python_env = environment() diff --git a/media-libs/libplacebo/libplacebo-6.292.1.ebuild b/media-libs/libplacebo/libplacebo-6.292.1.ebuild new file mode 100644 index 000000000000..b3287dc6b4f4 --- /dev/null +++ b/media-libs/libplacebo/libplacebo-6.292.1.ebuild @@ -0,0 +1,103 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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.4 + SRC_URI=" + https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.bz2 + 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}] ) +" +# vulkan-headers is required even with USE=-vulkan (bug #882065) +DEPEND=" + ${RDEPEND} + dev-util/vulkan-headers +" +BDEPEND=" + $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch + "${FILESDIR}"/${PN}-5.229.1-python-executable.patch +) + +python_check_deps() { + python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" +} + +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 +} + +src_prepare() { + default + + # typically auto-skipped, but may assume usable opengl/vulkan then hang + sed -i "/tests += 'opengl_surfaceless.c'/d" src/opengl/meson.build || die + sed -i "/tests += 'vulkan.c'/d" src/vulkan/meson.build || die +} + +multilib_src_configure() { + local emesonargs=( + -Ddemos=false #851927 + $(meson_use test tests) + $(meson_feature lcms) + -Dlibdovi=disabled # TODO: package libdovi, ask if you need this + $(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 98e20244f513..b3287dc6b4f4 100644 --- a/media-libs/libplacebo/libplacebo-9999.ebuild +++ b/media-libs/libplacebo/libplacebo-9999.ebuild @@ -13,7 +13,11 @@ else GLAD_PV=2.0.4 SRC_URI=" https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.bz2 - opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_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 @@ -37,14 +41,17 @@ RDEPEND=" llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] ) !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) ) - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )" + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) +" # vulkan-headers is required even with USE=-vulkan (bug #882065) DEPEND=" ${RDEPEND} - dev-util/vulkan-headers" + dev-util/vulkan-headers +" BDEPEND=" $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - virtual/pkgconfig" + virtual/pkgconfig +" PATCHES=( "${FILESDIR}"/${PN}-5.229.1-llvm-libunwind.patch -- cgit v1.2.3