commit: d5bc26261489221eecaad59ab07588f270659ceb parent a1b3ad53734557996003730722841525e8527c22 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Sun, 14 Mar 2021 01:27:39 +0100 media-libs/libplacebo: Clean+bump to 3.104.0Diffstat:
| M | media-libs/libplacebo/Manifest | 4 | +--- |
| D | media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch | 59 | ----------------------------------------------------------- |
| D | media-libs/libplacebo/libplacebo-2.43.0.ebuild | 64 | ---------------------------------------------------------------- |
| D | media-libs/libplacebo/libplacebo-2.43.1.ebuild | 64 | ---------------------------------------------------------------- |
| R | media-libs/libplacebo/libplacebo-2.72.2.ebuild -> media-libs/libplacebo/libplacebo-3.104.0.ebuild | 0 | |
| D | media-libs/libplacebo/libplacebo-9999.ebuild | 78 | ------------------------------------------------------------------------------ |
| M | media-libs/libplacebo/metadata.xml | 8 | -------- |
7 files changed, 1 insertion(+), 276 deletions(-)
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest @@ -1,3 +1 @@ -DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab -DIST libplacebo-v2.43.1.tar.gz 356913 BLAKE2B 1fbda35bcdaf96ebfb20a05bcec35fc03168def2a5fbf3aa4861187a67409d3b9ae28169de2cb6fa9a78e40a1d073982e58c7e36ac9468b5c7c227ef0bb0f96c SHA512 62463dfee6e6fd450395e42d7af2b6e0caa0b183c0d00f5ba0c5ddc893a47cdd0371d37fc72a7361228324b0dc9c55dd0309a5a7210cf753618fde18a094abcb -DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135 +DIST libplacebo-v3.104.0.tar.gz 436346 BLAKE2B dfd743470eb679ddf14b517f856dec1a1df1df88788d8222aade4b31f8d625c66a6bfeb0ff95df2eec531fa6950d68b3ca578cb244104a2591090ad8dcbca6a8 SHA512 896ade7d87fe02924cbf5a0f2b39a2054c8b9eb7a5f0adf574d0ec3dc9239020f8c69450501775002f7697250da595bf24a7d2d7039eb396073411c6fce2edfb diff --git a/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch b/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch @@ -1,59 +0,0 @@ -From 45e19e7bbbbfceb197d8826c775e16ef536a4565 Mon Sep 17 00:00:00 2001 -From: Niklas Haas <git@haasn.xyz> -Date: Tue, 5 May 2020 00:13:49 +0200 -Subject: [PATCH] vulkan: get rid of deprecated enum members - -Maybe we should just get rid of the switch coverage check altogether. I -wish we could somehow differentiate between enums defined in our code -and enums defined externally. - -Fixes #71. ---- - src/vulkan/context.c | 4 +++- - src/vulkan/swapchain.c | 7 +------ - 2 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/vulkan/context.c b/src/vulkan/context.c -index 10928a9..14a57cf 100644 ---- a/src/vulkan/context.c -+++ b/src/vulkan/context.c -@@ -685,7 +685,6 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context *ctx, - [VK_PHYSICAL_DEVICE_TYPE_VIRTUAL_GPU] = {"virtual", 3}, - [VK_PHYSICAL_DEVICE_TYPE_CPU] = {"software", 2}, - [VK_PHYSICAL_DEVICE_TYPE_OTHER] = {"other", 1}, -- [VK_PHYSICAL_DEVICE_TYPE_END_RANGE+1] = {0}, - }; - - int best = 0; -@@ -693,6 +692,9 @@ VkPhysicalDevice pl_vulkan_choose_device(struct pl_context *ctx, - VkPhysicalDeviceProperties props = {0}; - GetPhysicalDeviceProperties(devices[i], &props); - VkPhysicalDeviceType t = props.deviceType; -+ if (t > PL_ARRAY_SIZE(types)) -+ continue; -+ - PL_INFO(vk, " GPU %d: %s (%s)", i, props.deviceName, types[t].name); - - if (params->surface) { -diff --git a/src/vulkan/swapchain.c b/src/vulkan/swapchain.c -index bf6fd54..6bf40dd 100644 ---- a/src/vulkan/swapchain.c -+++ b/src/vulkan/swapchain.c -@@ -138,13 +138,8 @@ static bool vk_map_color_space(VkColorSpaceKHR space, struct pl_color_space *out - return false; - #endif - -- // Included to satisfy the switch coverage check -- case VK_COLOR_SPACE_RANGE_SIZE_KHR: -- case VK_COLOR_SPACE_MAX_ENUM_KHR: -- break; -+ default: return false; - } -- -- return false; - } - - static bool pick_surf_format(const struct pl_gpu *gpu, const struct vk_ctx *vk, --- -2.27.0 - diff --git a/media-libs/libplacebo/libplacebo-2.43.0.ebuild b/media-libs/libplacebo/libplacebo-2.43.0.ebuild @@ -1,64 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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-minimal - -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 +vulkan" -REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" - -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}] ) - vulkan? ( - dev-util/vulkan-headers - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${P}-vulkan-headers-1.2.140-compatibility.patch -) - -multilib_src_configure() { - local emesonargs=( - $(meson_feature glslang) - $(meson_feature lcms) - $(meson_feature opengl) - $(meson_feature shaderc) - $(meson_feature vulkan) - $(meson_use test tests) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -t 10 -} - -multilib_src_install() { - meson_src_install -} diff --git a/media-libs/libplacebo/libplacebo-2.43.1.ebuild b/media-libs/libplacebo/libplacebo-2.43.1.ebuild @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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-minimal - -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 +vulkan" -REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" - -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}] ) - vulkan? ( - dev-util/vulkan-headers - media-libs/vulkan-loader[${MULTILIB_USEDEP}] - )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch -) - -multilib_src_configure() { - local emesonargs=( - $(meson_feature glslang) - $(meson_feature lcms) - $(meson_feature opengl) - $(meson_feature shaderc) - $(meson_feature vulkan) - $(meson_use test tests) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -t 10 -} - -multilib_src_install() { - meson_src_install -} diff --git a/media-libs/libplacebo/libplacebo-2.72.2.ebuild b/media-libs/libplacebo/libplacebo-3.104.0.ebuild diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_REQ_USE="xml" -PYTHON_COMPAT=( python3_{7,8,9} ) - -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-minimal python-any-r1 - -DESCRIPTION="Reusable library for GPU-accelerated image processing primitives" -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" -IUSE="glslang lcms +opengl +shaderc test +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}] ) - 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}]') - )" - -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 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_compile() { - meson_src_compile -} - -multilib_src_test() { - meson_src_test -t 10 -} - -multilib_src_install() { - meson_src_install -} diff --git a/media-libs/libplacebo/metadata.xml b/media-libs/libplacebo/metadata.xml @@ -1,14 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>gentoo@haasn.xyz</email> - <name>Niklas Haas</name> - </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Gentoo Proxy Maintainers Project</name> - </maintainer> <use> <flag name="glslang">Use <pkg>dev-util/glslang</pkg> to compile GLSL</flag> <flag name="lcms">Add support for color management via <pkg>media-libs/lcms</pkg></flag>