commit: 5cca9ecd62112b3dc203677dd1b331922d1ad508 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Apr 24 03:20:40 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Apr 24 03:22:20 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cca9ecd
media-libs/libplacebo: drop 5.229.2 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-libs/libplacebo/Manifest | 2 - .../files/libplacebo-5.229.1-shared-glslang.patch | 13 --- media-libs/libplacebo/libplacebo-5.229.2.ebuild | 100 --------------------- 3 files changed, 115 deletions(-) diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest index 3e23696e8296..4e1009f5c1b8 100644 --- a/media-libs/libplacebo/Manifest +++ b/media-libs/libplacebo/Manifest @@ -1,4 +1,2 @@ -DIST libplacebo-glad-2.0.1.tar.gz 581028 BLAKE2B 9c1a6dfdec44b9d55af4f410172958d5630408cebbbc86d17e73d0aa042b2d9765b9be7875a21ec4870f5efde589b8112a8d9ed785b0e9847c38a7b85ff1b5c4 SHA512 c924728695d524090894a0eb81fa8aa531ffc8ba8b3f02069ad31432854becb849025fc4b800f4cef4e267b3123fa6e1b7bba38d6aea99e691578fb4432ff262 DIST libplacebo-glad-2.0.4.tar.gz 599932 BLAKE2B 788d2b70222fd09eea02515bdf3cbc147540631bf35fe39f12aa21fdbabf3d229f4234a430217dfaf3363934b8be12dd6a19871049a7b117deb8260ec69f8c67 SHA512 328d0dbe33e69f846d1c54226c6675694404f41e53c4762e6013c7bfe76b0700f0b28f4117a2018a09c9c23ccb6ad94d7b20882fefc2513941a4515686c9b9e7 -DIST libplacebo-v5.229.2.tar.gz 673795 BLAKE2B d828cf97713a9d46c983da111c5400487d02e9c3d8ec874de67d9f9d753508e7dc941cfdcdd024e78ea7e08e0f3d6a71b82f92e3478ed9d8a8cadbc86462b236 SHA512 56723bb3df4229ecaa61189080f108ac7c953b435b9969f7fe85835eeaca88ee8ec90ef9dfdd5e99e92d4cccea5b8e24c676d3b318ab8e22ead09c003b3c6165 DIST libplacebo-v5.264.1.tar.gz 725394 BLAKE2B 421de50ef5e2270e3ba32dd85d92d816a374257442b535face6cb8501d565652aae530b86a7d717c9352c6a82ca665ff7d91c2d9768365780cbbe4f48d1d3276 SHA512 305f43b71f078f4113def43c444df667dfbdd2a6a34d3b457b15da0b3499ca97ec9a8acbd151d58c8e1a593ace3d8aa61067b32556c6bae451efbb217d60a731 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 deleted file mode 100644 index 84c83031e031..000000000000 --- a/media-libs/libplacebo/files/libplacebo-5.229.1-shared-glslang.patch +++ /dev/null @@ -1,13 +0,0 @@ -OSDependent and OGLCompiler are already included in the shared libglslang, -and glslang-1.3.231 normally does not install these with shared builds. -https://code.videolan.org/videolan/libplacebo/-/issues/240 ---- 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-5.229.2.ebuild b/media-libs/libplacebo/libplacebo-5.229.2.ebuild deleted file mode 100644 index d89de1f37823..000000000000 --- a/media-libs/libplacebo/libplacebo-5.229.2.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..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.1 # verify bug #881999 before bumping - 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}] )" -# 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}] - dev-python/setuptools[${PYTHON_USEDEP}]') - virtual/pkgconfig" - -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() { - # note: setuptools can be removed when using >=glad-2.0.2 - python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" && - python_has_version "dev-python/setuptools[${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) - $(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 -}
