gentoo resync : 18.05.2019

3 files changed, 71 insertions, 10 deletions

diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index 20484f698334..c9d95a7ac25a 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -1,4 +1,6 @@
+DIST libplacebo-v1.18.0.tar.gz 322963 BLAKE2B 640accaa64b1a5abdcc60f89c1b80ccc880ed060799a48cb9d41c7b891648913b05d06c62fa6dd21ccce07ac61b7c89e1702ac26013c596dc4a4d71c7b10721f SHA512 a2ca4a8b2bf9e5242c39c704e579575ccbfd0a7dadc4f73fe1994abb6e3f132d19f6d95415704a62e285e3f94e7b0ab8aeed14b4fce466df1ba34952f7127686
 DIST libplacebo-v1.7.0.tar.gz 312154 BLAKE2B 46a807e323cce5da6362828d931daeca3eaff8475a7318dfc756c097e2edc98f064a90b36e0f6d882f95f6bb077e72127fb6f8d7643dd992c7432a13b6fdbe64 SHA512 337662e538b1d6b3d063ec18db2627619e1bd72cff6017ac19027527b07a74b0f196a428b572c9f4e3c3856c32a123b70049d7938458fb4301fdd319d756ab27
+EBUILD libplacebo-1.18.0.ebuild 1288 BLAKE2B 283c89aeebb758473d5c9db5d84e774e6962a80b0cc625c08d3d0b4a07a459bc415c291e541b2cea07510268661336667f2a37cb6710f12e9d78d564e7a4746e SHA512 ed38e53a0d8f7ae09aa543f8a600047958f0cd1c716e75352c2a7e12a1db83db30e3687fc669c2df357b0a26f2c241bd9f756ed02aea614bc4e9c654e40d44a4
 EBUILD libplacebo-1.7.0.ebuild 1269 BLAKE2B eb4e3db0e4f23a76bb570d5a3c59727d5b882dbbf5e6d85ede981cfcfd8d82f3f1cd8ce8649380b3011050c00039c460bf1d8df8ea2507bef82c02c708f57ba2 SHA512 126c643abb16a95c173681d7626b47d805e1858408211b60cfaf0c2914beed3d50ecb270904df3a4ee61cfc7bec7c0c06ecca40108c9e52858e38dc46861c56e
-EBUILD libplacebo-9999.ebuild 1269 BLAKE2B eb4e3db0e4f23a76bb570d5a3c59727d5b882dbbf5e6d85ede981cfcfd8d82f3f1cd8ce8649380b3011050c00039c460bf1d8df8ea2507bef82c02c708f57ba2 SHA512 126c643abb16a95c173681d7626b47d805e1858408211b60cfaf0c2914beed3d50ecb270904df3a4ee61cfc7bec7c0c06ecca40108c9e52858e38dc46861c56e
+EBUILD libplacebo-9999.ebuild 1288 BLAKE2B 283c89aeebb758473d5c9db5d84e774e6962a80b0cc625c08d3d0b4a07a459bc415c291e541b2cea07510268661336667f2a37cb6710f12e9d78d564e7a4746e SHA512 ed38e53a0d8f7ae09aa543f8a600047958f0cd1c716e75352c2a7e12a1db83db30e3687fc669c2df357b0a26f2c241bd9f756ed02aea614bc4e9c654e40d44a4
 MISC metadata.xml 807 BLAKE2B f04df70a40523ad668bfa7dda7c841ce098f2105d2bc94ab6291bb194bf1fec18445b779952db33614d685ee0964c7ac6b7666b3d8cf89f8bd9391b1ccd2c553 SHA512 48d5e93ca7e964d80dc579789c6f626f9590d102b451c4f0fced538aed1301e0cb7f93fce4d03deaddb72dcad22489aa3846d8fa8ac443fcdbc4fcb90ef19040
diff --git a/media-libs/libplacebo/libplacebo-1.18.0.ebuild b/media-libs/libplacebo/libplacebo-1.18.0.ebuild
new file mode 100644
index 000000000000..eda8818f5919
--- /dev/null
+++ b/media-libs/libplacebo/libplacebo-1.18.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 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"
+	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://github.com/haasn/libplacebo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="glslang lcms +shaderc test +vulkan"
+REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
+
+RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
+	lcms? ( media-libs/lcms:2[${MULTILIB_USEDEP}] )
+	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
+	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+	local emesonargs=(
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(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
+}
+
+multilib_src_install() {
+	meson_src_install
+}
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index d564dd10f444..eda8818f5919 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
@@ -12,14 +12,14 @@ else
 	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
-inherit meson ninja-utils multilib-minimal
+inherit meson multilib-minimal
 
 DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
 HOMEPAGE="https://github.com/haasn/libplacebo"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-IUSE="glslang lcms +shaderc +vulkan"
+IUSE="glslang lcms +shaderc test +vulkan"
 REQUIRED_USE="vulkan? ( || ( glslang shaderc ) )"
 
 RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
@@ -27,21 +27,27 @@ RDEPEND="glslang? ( <dev-util/glslang-7.10[${MULTILIB_USEDEP}] )
 	shaderc? ( >=media-libs/shaderc-2017.2[${MULTILIB_USEDEP}] )
 	vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 multilib_src_configure() {
 	local emesonargs=(
-		-Dglslang=$(usex glslang enabled disabled)
-		-Dlcms=$(usex lcms enabled disabled)
-		-Dshaderc=$(usex shaderc enabled disabled)
-		-Dvulkan=$(usex vulkan enabled disabled)
+		$(meson_feature glslang)
+		$(meson_feature lcms)
+		$(meson_feature shaderc)
+		$(meson_feature vulkan)
+		$(meson_use test tests)
 	)
 	meson_src_configure
 }
 
 multilib_src_compile() {
-	eninja
+	meson_src_compile
+}
+
+multilib_src_test() {
+	meson_src_test
 }
 
 multilib_src_install() {
-	DESTDIR="${D}" eninja install
+	meson_src_install
 }