From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 81257158089 for ; Wed, 13 Sep 2023 21:05:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1348A2BC01D; Wed, 13 Sep 2023 21:05:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C81412BC019 for ; Wed, 13 Sep 2023 21:05:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04013335CEC for ; Wed, 13 Sep 2023 21:05:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E64511A7 for ; Wed, 13 Sep 2023 21:05:30 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1694638936.93021c325d1bcf404f695c482f3124ed174f6133.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libplacebo/libplacebo-9999.ebuild media-libs/libplacebo/metadata.xml X-VCS-Directories: media-libs/libplacebo/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 93021c325d1bcf404f695c482f3124ed174f6133 X-VCS-Branch: master Date: Wed, 13 Sep 2023 21:05:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6e842619-2a8c-4025-b2e6-34dda3bc664a X-Archives-Hash: 4cb13a892835375cd7f9aec53641690f commit: 93021c325d1bcf404f695c482f3124ed174f6133 Author: Ionen Wolkens gentoo org> AuthorDate: Wed Sep 13 19:04:15 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Sep 13 21:02:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93021c32 media-libs/libplacebo: update live xxhash usage is technically header-only, but causes all sort of pkg-config headaches if not multilib and also if not in RDEPEND (aka mpv will fail to find libplacebo if xxhash was removed, and libplacebo won't find the header without multilib .pc). Signed-off-by: Ionen Wolkens gentoo.org> media-libs/libplacebo/libplacebo-9999.ebuild | 13 +++++++++++-- media-libs/libplacebo/metadata.xml | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild index feec155b736d..a4a83776c5b8 100644 --- a/media-libs/libplacebo/libplacebo-9999.ebuild +++ b/media-libs/libplacebo/libplacebo-9999.ebuild @@ -11,8 +11,11 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else GLAD_PV=2.0.4 + FASTFLOAT_PV=5.2.0 SRC_URI=" https://code.videolan.org/videolan/libplacebo/-/archive/v${PV}/libplacebo-v${PV}.tar.bz2 + https://github.com/fastfloat/fast_float/archive/refs/tags/v${FASTFLOAT_PV}.tar.gz + -> fast_float-${FASTFLOAT_PV}.tar.gz opengl? ( https://github.com/Dav1dde/glad/archive/refs/tags/v${GLAD_PV}.tar.gz -> ${PN}-glad-${GLAD_PV}.tar.gz @@ -34,11 +37,11 @@ LICENSE=" opengl? ( MIT ) " SLOT="0/$(ver_cut 2 ${PV}.9999)" # soname -IUSE="glslang lcms llvm-libunwind +opengl +shaderc test unwind +vulkan" +IUSE="glslang lcms llvm-libunwind +opengl +shaderc test unwind +vulkan +xxhash" RESTRICT="!test? ( test )" REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )" -# libglvnd is used with dlopen() through glad (inc. egl/gles) +# dlopen: libglvnd (glad) RDEPEND=" lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] ) opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP}] ) @@ -49,6 +52,7 @@ RDEPEND=" !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) + xxhash? ( dev-libs/xxhash[${MULTILIB_USEDEP}] ) " # vulkan-headers is required even with USE=-vulkan (bug #882065) DEPEND=" @@ -78,6 +82,10 @@ src_unpack() { git-r3_src_unpack else default + + rmdir "${S}"/3rdparty/fast_float || die + mv fast_float-${FASTFLOAT_PV} "${S}"/3rdparty/fast_float || die + if use opengl; then rmdir "${S}"/3rdparty/glad || die mv glad-${GLAD_PV} "${S}"/3rdparty/glad || die @@ -107,6 +115,7 @@ multilib_src_configure() { $(meson_feature vulkan) $(meson_feature vulkan vk-proc-addr) -Dvulkan-registry="${ESYSROOT}"/usr/share/vulkan/registry/vk.xml + $(meson_feature xxhash) ) meson_src_configure diff --git a/media-libs/libplacebo/metadata.xml b/media-libs/libplacebo/metadata.xml index cbe5ba3fb8de..d9fc439df028 100644 --- a/media-libs/libplacebo/metadata.xml +++ b/media-libs/libplacebo/metadata.xml @@ -9,6 +9,7 @@ Use dev-util/glslang to compile GLSL Add support for color management via media-libs/lcms Use media-libs/shaderc to compile GLSL + Use dev-libs/xxhash to speed up internal hashing https://code.videolan.org/videolan/libplacebo/-/issues