gentoo resync : 21.06.2020

7 files changed, 179 insertions, 13 deletions

diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 2a0fc7318d99..d21216308bf8 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,8 +1,11 @@
+AUX libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch 2047 BLAKE2B aa2ca755fb95c9a7d3f55992507ce62340897ad9419a875fac31c8e392b9eab1f896dc8feedef96e804f0c938fede16d78a31517ccf5599efbdcb6d6af2773a6 SHA512 d7bfdb158c9f4e263d1937cb400417174a996a3f116231531d8f8c9266a57adf24ca86fd5ebeebb534c9985e89618fc11ddfcf8a9621729eb741a3bbd74212e6
 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
-EBUILD libplacebo-1.21.0-r1.ebuild 1313 BLAKE2B 2acee78d091349c05b03b55b3d95139f9aa66415ba0552193e33bc4a17d5a733606658c5877b6a4531aab0c3d107399ce7369b9395c0fd49ff38a6cc8b7377dd SHA512 974c4f9bc20fdb4d5b6ba160bd2f5a14bb8bf66cbac6d47a9593b11da1bd08ec47f28f7ba8d6ea8fb73cbe001b7465029c1e6f3a127b1dcda5b1e6bd18b47ce5
-EBUILD libplacebo-1.29.1.ebuild 1359 BLAKE2B 0387bd7dee63195d87b83a3ef435b952c67817e82e1712dba4b1c385dffd5fa7d37eaf788a3fb5bc2b67c3a8523d26393766eb5032d7453ed5e2aa71a2453781 SHA512 cec08c69cf41b1c292ae4c6f9111e9fb76bec03260bbc0b0e3ecda008ff245b648a152188af0680b7bd98b79975e7ff15688f3dc84b54f9cf701087ed76a163d
-EBUILD libplacebo-2.43.0.ebuild 1452 BLAKE2B 1c2fe783ac484edf7745c80e895cc4a66a3de4ca91c46aee3828e7d485d38d12f6c144aefbaaa804832e5b3d265b90b3c50c6dedc6ddfbc1111d8d65df1b6d70 SHA512 10f72cf208b7eb9e7eab1c5a08465212368f0c8852d52a7e1c2bcda73c2d159df279d099ca2893cb0cb0156dfa6c82c458803b0e95687e01e7827f040916ccd2
-EBUILD libplacebo-9999.ebuild 1487 BLAKE2B f1eda76ea0dff6e38021b4b5090bc578faf314403e97497b3c0f625e5aae4197fd9c24234dcbbf9eccf150e210576518096f2d57172b9e0aabe60375637079aa SHA512 549efada3d0d68110ee0e0761b82da5ea733567b4724bb959a6df74929e79cb42a5cf575cd3bd054b1738343948d50577f1e986c658912ad2ee93e8b058602e4
+DIST libplacebo-v2.72.0.tar.gz 396124 BLAKE2B 8a9829add4cb8ffe94c0dc8e3c8f64e465992bb21aa8739086986b061e53fc2f0d00c5a512ad94f0b4998fe3e3bd784c0b8df3bef1ffc5ed92090a75c7e31ad7 SHA512 829d8805f8a52e082bf7c33f5be8a280480aa3cfbac73966cdf4ddaf0a01f25cc357b98a04fe85c82a53718b5d570a852edeafbb0cb12312c73cb23295fb9bd9
+EBUILD libplacebo-1.21.0-r1.ebuild 1323 BLAKE2B 6ecdd7d4492f64a25447be420154212b792ce79688c6551b6fc38eec39258d6946cd9701b4fa2ed032968619b876309375bccd52717b9ff7e3dc0730b7ad0319 SHA512 037369e0c9351435347946635cdd8aad4190bdd6faca193f98bc15a093099709105c8e469869bd2040aac3246adcb9c4eee1341f338ee24ab0dceaee44615a22
+EBUILD libplacebo-1.29.1.ebuild 1369 BLAKE2B 539cd7f857d41ae9e4881b9fd03136e08ff9cc0eea21891f49eb60f16637f42292bcccc7ccb60c1aa800d95467c56f3f8d74969423b44c3d810ee9c89ec65aa9 SHA512 717a952a19637c62d4f21585f47c675c545aec53a3579b209c4ecb5222bbdfd1c4c90b259a7f579cc82d1612aebd437dd744a62588b443456b543c16603a74ef
+EBUILD libplacebo-2.43.0.ebuild 1567 BLAKE2B 8ceafc1a60387029b217a0197676c1c7a227f33267ba13755e3f7a804f10140ea0c8b72820f66b08270c3ac873d3f360f70b2f8d1e331abe5a4770f16319c7c5 SHA512 23044ae8cea34b3d26e963ad4c48916898cb09d5d59e3602caa50fab03d73c9ccade741e1bc6b4e65ed1518e1123bb258f6aa3901398f03ae59c32a49526db99
+EBUILD libplacebo-2.72.0.ebuild 1889 BLAKE2B 6d0724bad61f28633b24a61782774d889ee13f33d0e0942b17651defadb19a9af77a0c8f430e746574bdd38d7b2f107ae9869ec1f3001b5f8fd76fdcda7f70ca SHA512 07d8dc86c3df956a34901bcf0e24a1f4455b1781d1357d636b8e18bfcadd37e3210a97e20f1ff7defbba767192d1bc5e03af735cf753ebbe97102a575a15c326
+EBUILD libplacebo-9999.ebuild 1924 BLAKE2B 5ed7fea860e50f3b0d568518ab853aaa6fe58576f9a2cd53efd5dd36c5d0968b0c927df2894ec8c5b9aabdee77a218d7f9578cfce5b07f601fcbc88da3699812 SHA512 d4d065dabde0e25e18f63afaee3086727667c27de2a510fee1420dcf36608da78864e74a3f4df58eddb72c9bc47b9f1b8e8ff54809a31657ff14d368f38eb8a3
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
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
new file mode 100644
index 000000000000..8fa64744fd05
--- /dev/null
+++ b/media-libs/libplacebo/files/libplacebo-2.43.0-vulkan-headers-1.2.140-compatibility.patch
@@ -0,0 +1,59 @@
+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-1.21.0-r1.ebuild b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
index a6faa8fb9ec6..d646a388cae0 100644
--- a/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
+++ b/media-libs/libplacebo/libplacebo-1.21.0-r1.ebuild
@@ -15,7 +15,7 @@ fi
 inherit meson multilib-minimal
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://github.com/haasn/libplacebo"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/media-libs/libplacebo/libplacebo-1.29.1.ebuild b/media-libs/libplacebo/libplacebo-1.29.1.ebuild
index c431e963d163..9dc0a873f27f 100644
--- a/media-libs/libplacebo/libplacebo-1.29.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-1.29.1.ebuild
@@ -15,7 +15,7 @@ fi
 inherit meson multilib-minimal
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://github.com/haasn/libplacebo"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/$(ver_cut 2)" # libplacebo.so version
diff --git a/media-libs/libplacebo/libplacebo-2.43.0.ebuild b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
index b0088dafa647..13e550979d0e 100644
--- a/media-libs/libplacebo/libplacebo-2.43.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
@@ -15,7 +15,7 @@ fi
 inherit meson multilib-minimal
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
-HOMEPAGE="https://github.com/haasn/libplacebo"
+HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/$(ver_cut 2)" # libplacebo.so version
@@ -26,12 +26,19 @@ 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 )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-vulkan-headers-1.2.140-compatibility.patch
+)
+
 multilib_src_configure() {
 	local emesonargs=(
 		$(meson_feature glslang)
diff --git a/media-libs/libplacebo/libplacebo-2.72.0.ebuild b/media-libs/libplacebo/libplacebo-2.72.0.ebuild
new file mode 100644
index 000000000000..9303b586426d
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-2.72.0.ebuild
@@ -0,0 +1,77 @@
+# 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_{6,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+"
+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? (
+		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/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 1c2ef2ff86ae..15f1430100f8 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,26 +15,41 @@ 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://github.com/haasn/libplacebo"
+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? ( 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
 }