commit: 1e0535a5d55c69796ef3fe0d077a649c4adc2df7 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Mar 9 18:34:16 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Mar 9 20:12:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0535a5
media-libs/libplacebo: drop 4.192.1-r2 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-libs/libplacebo/Manifest | 1 - .../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, 116 deletions(-) diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest index abeba86da87b..37d8adbc5695 100644 --- a/media-libs/libplacebo/Manifest +++ b/media-libs/libplacebo/Manifest @@ -1,3 +1,2 @@ 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 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 <[email protected]> -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? ( <dev-util/glslang-1.3.231:=[${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:=[${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 -}
