From 71e206c31e948709a88fafc342bd2d8695942aa5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Mar 2023 00:03:27 +0000 Subject: gentoo auto-resync : 10:03:2023 - 00:03:27 --- media-libs/libplacebo/Manifest | 4 -- .../libplacebo-2.72.2-fix-vulkan-undeclared.patch | 26 ------- .../libplacebo-4.192.1-python-executable.patch | 8 --- media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild | 81 ---------------------- 4 files changed, 119 deletions(-) delete mode 100644 media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch delete mode 100644 media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch delete mode 100644 media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild (limited to 'media-libs/libplacebo') diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest index 53c67b6f2561..e9c413310dbf 100644 --- a/media-libs/libplacebo/Manifest +++ b/media-libs/libplacebo/Manifest @@ -1,12 +1,8 @@ -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 737 BLAKE2B b2a17ad66de37414790a1a4a5360def84326867e5f63959156daeb4aa9ead676279f730912e6c98e40d6322637178408d68d9a08ad542a40b1fb6b02c242b9b7 SHA512 902feb8e0752a9ce5b50dd040015368a1ed3eb90fb78713093c43a66eb881b2f2c8872fab60d695e9cdd4821b84f6e75e5e5a3416c592d86e1a70ff5a2667b61 DIST libplacebo-glad-2.0.1.tar.gz 581028 BLAKE2B 9c1a6dfdec44b9d55af4f410172958d5630408cebbbc86d17e73d0aa042b2d9765b9be7875a21ec4870f5efde589b8112a8d9ed785b0e9847c38a7b85ff1b5c4 SHA512 c924728695d524090894a0eb81fa8aa531ffc8ba8b3f02069ad31432854becb849025fc4b800f4cef4e267b3123fa6e1b7bba38d6aea99e691578fb4432ff262 -DIST libplacebo-v4.192.1.tar.gz 632762 BLAKE2B 19a3bee6f05632cde1739fe8c861c96035a7b1f5ed2af6bbc67776529551c88f5da63d49dede2d7ee2c8d96edd6faf733e0371714028b72eddcf4c4cf23b937f SHA512 780dff60a31a9c7fff47522385235077cc6b1a38be32bc0276c090d89ce25754dd0b910db5be631d0065337fe4700f68adabee06f48a4935d422f09f2e0e5525 DIST libplacebo-v5.229.2.tar.gz 673795 BLAKE2B d828cf97713a9d46c983da111c5400487d02e9c3d8ec874de67d9f9d753508e7dc941cfdcdd024e78ea7e08e0f3d6a71b82f92e3478ed9d8a8cadbc86462b236 SHA512 56723bb3df4229ecaa61189080f108ac7c953b435b9969f7fe85835eeaca88ee8ec90ef9dfdd5e99e92d4cccea5b8e24c676d3b318ab8e22ead09c003b3c6165 -EBUILD libplacebo-4.192.1-r2.ebuild 2337 BLAKE2B 59df7348e231e55cc96037ccfb9084fe66f053ea72fc7f34a2e77597cd7187b744e060bdb031ba3a482a7511a0ff3a1ff76c00153d12f8b1287287def74c61b6 SHA512 b179a958d850445108d755b5a8c9770ba87c9554584654e34a684cf80ea8eb20172b562ad817245218075b07d860881b0ab8a90c1758633815fcf55e5edacac5 EBUILD libplacebo-5.229.2.ebuild 3073 BLAKE2B 88d52ee2c99e9343d11605e0ac0fd978f961fe4e54af8dbb9b76ec90a789cee3fc0ac32ab57bb05905e61d987af5d2796c32e61505dc87d08f9e4181c3aac1db SHA512 a777977ffec07fe99707cf3d73207e618f81f8f3704a89e6834558e21e4c65ee6326c0c6e283fd68621e75bcbede050edc3a697f2838395f23c14d88e8438ca4 EBUILD libplacebo-9999.ebuild 3026 BLAKE2B 2d205e1fdcd490e1def24c7ece6b64f5ffc5bd22b7ffe50fb3ee2087644f23df3f29f777a672bbdb00b6beaa12a3617ab836dc4485f68b062e4bb163d8478b59 SHA512 2b6798bded10aee7802425bd8b8c249cd4449cb3d909dd93dffbda5ce8226e71002ef5843a25bbdee5af30fdbdd46b9a80ec38485f1c0def667bc880bc5fc6e7 MISC metadata.xml 680 BLAKE2B fd6f94475e6c177de61aa3e6d4444d721f86b535424a59801eddc869c518342bb0dfab13651a31a32d32190d8785f4a15727ad37c6aa30a677d100b94b5ecfd4 SHA512 f64eba1549b22452247867e3a50cb1a59d7e5aa51121741dcf4cb50dc688bb18b648e06f5e851dee4c64008f2cfd5da11c22f3d960ce36ebc5c5fce38ce0b3f8 diff --git a/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch b/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch deleted file mode 100644 index beb40dcf7895..000000000000 --- a/media-libs/libplacebo/files/libplacebo-2.72.2-fix-vulkan-undeclared.patch +++ /dev/null @@ -1,26 +0,0 @@ -From db794a2fcc8214624c950752b04f6c23f8fc567d Mon Sep 17 00:00:00 2001 -From: Niklas Haas -Date: Thu, 9 Jun 2022 21:32:36 +0200 -Subject: [PATCH] vulkan: blacklist metal structs from utils_gen.py - -Fixes https://code.videolan.org/videolan/libplacebo/-/issues/201 ---- - src/vulkan/utils_gen.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py -index da565d45..7c0dad37 100644 ---- a/src/vulkan/utils_gen.py -+++ b/src/vulkan/utils_gen.py -@@ -158,7 +158,7 @@ def get_vkstructs(registry): - # Strings for platform-specific crap we want to blacklist as they will - # most likely cause build failures - blacklist_strs = [ -- 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA', -+ 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA', 'Metal', - ] - - if any([ str in e.attrib['name'] for str in blacklist_strs ]): --- -GitLab - 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 deleted file mode 100644 index 8fbad683e397..000000000000 --- a/media-libs/libplacebo/files/libplacebo-4.192.1-python-executable.patch +++ /dev/null @@ -1,8 +0,0 @@ -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/libplacebo-4.192.1-r2.ebuild b/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild deleted file mode 100644 index 6f8a4dbea00f..000000000000 --- a/media-libs/libplacebo/libplacebo-4.192.1-r2.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{9..11} ) - -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() { - python_has_version "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 -} -- cgit v1.2.3