From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1180559-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8D9641382C5
for <garchives@archives.gentoo.org>; Thu, 18 Jun 2020 15:44:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B45A9E089F;
Thu, 18 Jun 2020 15:44:32 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 85409E089F
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Jun 2020 15:44:32 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id CBD1B34F068
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Jun 2020 15:44:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 2724128F
for <gentoo-commits@lists.gentoo.org>; Thu, 18 Jun 2020 15:44:28 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1592494663.3df6cb26d8ce817a8ce4a67c0795854f6f051016.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libplacebo/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/libplacebo/Manifest media-libs/libplacebo/libplacebo-2.72.0.ebuild media-libs/libplacebo/libplacebo-9999.ebuild
X-VCS-Directories: media-libs/libplacebo/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 3df6cb26d8ce817a8ce4a67c0795854f6f051016
X-VCS-Branch: master
Date: Thu, 18 Jun 2020 15:44:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: bd60da0c-1e7f-4b58-90c0-7f30d608a2ba
X-Archives-Hash: 1236bde899eacdcc7ec6420edb19cb94
commit: 3df6cb26d8ce817a8ce4a67c0795854f6f051016
Author: Niklas Haas <gentoo <AT> haasn <DOT> xyz>
AuthorDate: Wed Jun 17 01:46:46 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 15:37:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3df6cb26
media-libs/libplacebo: update to v2.72.0
The notable change in this release is the switch to auto-generated code,
based on the vulkan registry XML provided by `vulkan-headers`. This
requires the use of python[xml] and python-mako at build time. We also
fix a missing dependency on vulkan-headers.
Also synchronized the live ebuild.
Signed-off-by: Niklas Haas <gentoo <AT> haasn.xyz>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/libplacebo/Manifest | 1 +
...lacebo-9999.ebuild => libplacebo-2.72.0.ebuild} | 31 +++++++++++++++++-----
media-libs/libplacebo/libplacebo-9999.ebuild | 28 ++++++++++++++++---
3 files changed, 50 insertions(+), 10 deletions(-)
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 08b8aa7b6d9..815af4e6f6b 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,3 +1,4 @@
DIST libplacebo-v1.21.0.tar.gz 326918 BLAKE2B fe9500de23487d7d5dfc51d9f94dd3d33d22bdac3005fc3334814c53a76a46cebd40655675b5172f058d02dd865385a993b3c52a863b9e9b32ac0bc4801e0126 SHA512 5de95b8cc48ba4ec9bc3afb8c8f2c4fae0d53ce6e69ffb53884c3a3ee2580998bae46b8934e462740b6c9c2e66e3c5d5f009f9b0f8ad2cb7b4fba829891cf333
DIST libplacebo-v1.29.1.tar.gz 330673 BLAKE2B 3094f167afb45097ef6e494d7f6f6d61b7ee4ed00bab9f1d33bfd27b032020489eb43005a30a44934416dc52577eb7fc66baf367fdfda71652e97214d87023df SHA512 9f09560832a88e670d6c31e9f5b9cbc03de437bfb19ceb0985140307b5cdf20e2050a1dab5d07f18258dfa3e5429a51f1d3d54532099be4bfc6a0dafe3ffd516
DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf023dea2974fe355d29a6c835efa67b6f50ec500fa3ce50b932fef5d035a470f0adc8377cd274c5904fb4ffc303bb0c SHA512 c57463a9fcde1b259620fcb7ce6470b0d06e45ed837b4eca35ff0931e4c440ef613590485119ed21237f9cf3c3cdb617253f17699d9d252070f30d5dcbc233ab
+DIST libplacebo-v2.72.0.tar.gz 396124 BLAKE2B 8a9829add4cb8ffe94c0dc8e3c8f64e465992bb21aa8739086986b061e53fc2f0d00c5a512ad94f0b4998fe3e3bd784c0b8df3bef1ffc5ed92090a75c7e31ad7 SHA512 829d8805f8a52e082bf7c33f5be8a280480aa3cfbac73966cdf4ddaf0a01f25cc357b98a04fe85c82a53718b5d570a852edeafbb0cb12312c73cb23295fb9bd9
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-2.72.0.ebuild
similarity index 68%
copy from media-libs/libplacebo/libplacebo-9999.ebuild
copy to media-libs/libplacebo/libplacebo-2.72.0.ebuild
index 3da7505d8c1..9303b586426 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.72.0.ebuild
@@ -3,6 +3,9 @@
EAPI=7
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
inherit git-r3
@@ -12,26 +15,40 @@ else
S="${WORKDIR}/${PN}-v${PV}"
fi
-inherit meson multilib-minimal
+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"
+SLOT="0/$(ver_cut 2)" # libplacebo.so version
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? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+ vulkan? (
+ dev-util/vulkan-headers
+ media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+ )"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-RESTRICT="!test? ( test )"
+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=(
@@ -41,6 +58,8 @@ multilib_src_configure() {
$(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
}
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 3da7505d8c1..15f1430100f 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -3,6 +3,9 @@
EAPI=7
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
inherit git-r3
@@ -12,7 +15,7 @@ else
S="${WORKDIR}/${PN}-v${PV}"
fi
-inherit meson multilib-minimal
+inherit meson multilib-minimal python-any-r1
DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
@@ -22,16 +25,31 @@ LICENSE="LGPL-2.1+"
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? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+ vulkan? (
+ dev-util/vulkan-headers
+ media-libs/vulkan-loader[${MULTILIB_USEDEP}]
+ )"
DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-RESTRICT="!test? ( test )"
+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=(
@@ -41,6 +59,8 @@ multilib_src_configure() {
$(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
}