gentoo resync : 15.06.2021

5 files changed, 115 insertions, 33 deletions

diff --git a/gui-apps/waypipe/Manifest b/gui-apps/waypipe/Manifest
index 287375a6ceea..2ba1c7dca3bf 100644
--- a/gui-apps/waypipe/Manifest
+++ b/gui-apps/waypipe/Manifest
@@ -1,6 +1,8 @@
 AUX waypipe-0.7.2-no-simd.patch 2593 BLAKE2B e3af5ec9cafe957c68e2694e79a957bd90718c7f3c0926c1da125498f8c2e101ac41881cc800f80e931c2d2ec1f5b0fa34de82b50d085780e8c9d853aa15dc30 SHA512 26078c8d48a9e87f3ce37791e41cbfdf79ab96639264dfc63666e5c45e6728ddb2cfe76b6b90322b4a80a3e755b7b053213dead884fb270c59ab97f717c6e872
 AUX waypipe-0.7.2-werror.patch 235 BLAKE2B e96c58d034ee9358f76ae7b8b182df645046af137a98d8d799694b33b19001806b1d977febf1cf9d9d02575b5a6231a1e69079c2547156202821532ee3b3f49b SHA512 9c7989cfa320fb3f8140b7a7e7259d1cbf7e00baf3db0d4b31c7c4059185dca3418b53ec5678402ab42c58e2a3cf5aecf63a4f453a25a84c76bc5968cda28d68
 DIST waypipe-0.7.2.tar.gz 202601 BLAKE2B bc8a03c8b47ee65a158ca45047f1989761c36b7b6fb5196784637f4e937fa2e5076497079f8368daf20592351e60a12fda5f4500b7220320b4c4a73ca9e5b1e0 SHA512 b126ea9d30864ecba67447793f39dbbe8bc73ab33c79879ac243023c64930e9aae887f13c0fdcc4cdf307b0ca6766b1012915dc88c596b7c250e3b35f6ba9190
-EBUILD waypipe-0.7.2.ebuild 1754 BLAKE2B d84d254f740deff87bbade6bb9cacbf307de6f8e6d80c2ca42fd1f20f5484036d915dc2ce035f1a499455d42a4d51704bd22a788875e435b6face096a03ec276 SHA512 dbf799b5a91af8d1cec2e153884e673b99c53658cc481da209215dc5e50d385a491edb504b174b488f2f33701a249606dce0908c9beaa2830d5542348008d71f
-EBUILD waypipe-9999.ebuild 1732 BLAKE2B f62fdd096b7a58ed5ae2f5446c53cdbb04936d6fceeb237825a48b646b17078540fe0a42192dd9f3213d216c61b248e7fe7aecf86158cc47668a612861a6634c SHA512 93b9a9134037ed60c219da42ba98b57410b4d8852895d57196b18eb099340713a6541826c95e606f97b2595245c4590e7d01fe2c97122284a2781a29e80f18d2
-MISC metadata.xml 902 BLAKE2B ab8d0b0794353478dc93e26672b4f026ed62edb53e2bb2b7bdee7a0af95bb5d7cfa96de58d6495bb8bfbf115e88621d7cf7c81501aa10cda9ce480d8eaf1a2bd SHA512 e28db13c5b7b0815207cc90f136ca093915713ead32450bbaac2af89dd972f5209f8c80ee94baed691ea5b4d28a774605196fa0ae58980377fc911242f005f68
+DIST waypipe-0.8.0.tar.gz 217533 BLAKE2B a2aebb9939acafae3eb693aa8fe344ab775e8d3e9a071e7291ab15a0f9869b681156b5730e42c04401648a32ad2a67d7a3bf95ff5f38e909e9309e00b1c69381 SHA512 853d36a9779e2fcb5ac7bcca6575d456685beadd8d918ec430a57b8359867849bdcb5d9c1edcd19eb8505f06a7758e8f53ba5354daa05f99491d5a45c330eeb2
+EBUILD waypipe-0.7.2.ebuild 1933 BLAKE2B 4ab3e6b3f8a18d52faa9477006ad304e765e018f9aa7e1b4af6783485571edd5cd93d4b3df07b05ee34e68579b1498c1d652a166126c7efda1dceaf12cdac244 SHA512 4760f6d71ee3472ef84e8f19575fd1c9b71c2062d03ce1cd0d716f68e57c3718ffb271b447cae28533f78a960c5f838fa4c7f7e5bac21ba41be166786aafc422
+EBUILD waypipe-0.8.0.ebuild 1877 BLAKE2B 0eec1e9df13454af322b145d4a844a7035a5ad6835ae577a9205e2c443d8402b84bfa350baf4095574da61aa441cc2e9d6d4ce84e824d906a4af1bf37294bcf8 SHA512 d764d91fc0c9e562a9526ab5e63cfb73181d070482049f22688e61a1cc3f89812efa0a553d4be87458b863d66b007f0b18ef995c22826a8b0d1e741aea381ac3
+EBUILD waypipe-9999.ebuild 1877 BLAKE2B 0eec1e9df13454af322b145d4a844a7035a5ad6835ae577a9205e2c443d8402b84bfa350baf4095574da61aa441cc2e9d6d4ce84e824d906a4af1bf37294bcf8 SHA512 d764d91fc0c9e562a9526ab5e63cfb73181d070482049f22688e61a1cc3f89812efa0a553d4be87458b863d66b007f0b18ef995c22826a8b0d1e741aea381ac3
+MISC metadata.xml 918 BLAKE2B 771e9c268b9090cc5129ccd720c02db3be9a2db7ef2bafddb0db185040731495f014da77e27d035c4131b5d408f0ef86c7f9631ae9b0cbe2a9c01840c799a7d3 SHA512 ea9ef61025ffaedcd3f1b2b10e1e65fb927d5b63374fddf42fd65df8d0ef06445808b2ab15e4641281521853f65b00b20947c1c3bd8eed6d8854a91f7e50c585
diff --git a/gui-apps/waypipe/metadata.xml b/gui-apps/waypipe/metadata.xml
index 34f0e3f23fbc..dc98924933d3 100644
--- a/gui-apps/waypipe/metadata.xml
+++ b/gui-apps/waypipe/metadata.xml
@@ -10,14 +10,14 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<longdescription>
-		waypipe is a proxy for wayland clients to allow streaming.
-		sessions over tcp. It forwards Wayland messages and
-		serializes changes to shared memory buffers over a single socket.
-		This makes application forwarding similar to ssh -X feasible.
+		Waypipe is a proxy for all Wayland clients to allow streaming
+		sessions over tcp. It forwards Wayland messages and serializes
+		changes to shared memory buffers over a single socket, to allow
+		application forwarding similar to ssh -X.
 	</longdescription>
 	<use>
-		<flag name="dmabuf">Use dmabuf for data exchange and hardware decoding</flag>
-		<flag name="ffmpeg">Link with ffmpeg for software decoding</flag>
+		<flag name="dmabuf">Use DMABUFs for data exchange and hardware decoding</flag>
+		<flag name="ffmpeg">Link with ffmpeg to allow buffer displays using video streams</flag>
 		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
 	</use>
 </pkgmetadata>
diff --git a/gui-apps/waypipe/waypipe-0.7.2.ebuild b/gui-apps/waypipe/waypipe-0.7.2.ebuild
index 2fa4101e0696..07a5a221492a 100644
--- a/gui-apps/waypipe/waypipe-0.7.2.ebuild
+++ b/gui-apps/waypipe/waypipe-0.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 inherit meson python-any-r1
 
-DESCRIPTION="network transparency with Wayland"
+DESCRIPTION="Transparent network proxy for Wayland compositors"
 HOMEPAGE="https://gitlab.freedesktop.org/mstoeckl/waypipe"
 
 if [[ ${PV} == 9999 ]]; then
@@ -16,14 +16,20 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-v${PV}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 
-CPU_FLAGS_X86=( "avx2" "avx512f" "sse3" )
-IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${CPU_FLAGS_X86[@]/#/cpu_flags_x86_}"
+WAYPIPE_FLAG_MAP_X86=( avx2:with_avx2 avx512f:with_avx512f sse3:with_sse3 )
+WAYPIPE_FLAG_MAP_ARM=( neon:with_neon_opts )
+WAYPIPE_FLAG_MAP=(
+	"${WAYPIPE_FLAG_MAP_X86[@]/#/cpu_flags_x86_}"
+	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
+)
+
+IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
 REQUIRED_USE="vaapi? ( ffmpeg )"
 RESTRICT="!test? ( test )"
 
@@ -45,18 +51,17 @@ BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	man? ( app-text/scdoc )
-	test? ( dev-libs/weston[wayland-compositor,screen-sharing] )
+	test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] )
 "
 
 PATCHES=(
-	"${FILESDIR}"/waypipe-0.7.2-werror.patch
 	"${FILESDIR}"/waypipe-0.7.2-no-simd.patch
 )
 
 src_configure() {
-	local mymesonargs=(
+	local emesonargs=(
+		-Dwerror=false
 		$(meson_use systemtap with_systemtap)
-		$(meson_use neon with_neon_opts)
 		$(meson_feature dmabuf with_dmabuf)
 		$(meson_feature ffmpeg with_video)
 		$(meson_feature lz4 with_lz4)
@@ -65,8 +70,8 @@ src_configure() {
 		$(meson_feature zstd with_zstd)
 	)
 	local fl
-	for fl in "${CPU_FLAGS_X86[@]}"; do
-		mymesonargs+=( $(meson_use cpu_flags_x86_$fl with_$fl ) )
+	for fl in "${WAYPIPE_FLAG_MAP[@]}"; do
+		emesonargs+=( $(meson_use "${fl%:*}" "${fl#*:}") )
 	done
 	meson_src_configure
 }
diff --git a/gui-apps/waypipe/waypipe-0.8.0.ebuild b/gui-apps/waypipe/waypipe-0.8.0.ebuild
new file mode 100644
index 000000000000..a105c5722610
--- /dev/null
+++ b/gui-apps/waypipe/waypipe-0.8.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-any-r1
+
+DESCRIPTION="Transparent network proxy for Wayland compositors"
+HOMEPAGE="https://gitlab.freedesktop.org/mstoeckl/waypipe"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe"
+else
+	SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-v${PV}
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+WAYPIPE_FLAG_MAP_X86=( avx2:with_avx2 avx512f:with_avx512f sse3:with_sse3 )
+WAYPIPE_FLAG_MAP_ARM=( neon:with_neon_opts )
+WAYPIPE_FLAG_MAP=(
+	"${WAYPIPE_FLAG_MAP_X86[@]/#/cpu_flags_x86_}"
+	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
+)
+
+IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
+REQUIRED_USE="vaapi? ( ffmpeg )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dmabuf? (
+		media-libs/mesa[gbm,vaapi?,wayland]
+		x11-libs/libdrm
+	)
+	lz4? ( app-arch/lz4 )
+	systemtap? ( dev-util/systemtap )
+	vaapi? ( x11-libs/libva[drm,wayland] )
+	ffmpeg? (
+		media-video/ffmpeg[x264,vaapi?]
+	)
+	zstd? ( app-arch/zstd )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+	test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dwerror=false
+		$(meson_use systemtap with_systemtap)
+		$(meson_feature dmabuf with_dmabuf)
+		$(meson_feature ffmpeg with_video)
+		$(meson_feature lz4 with_lz4)
+		$(meson_feature man man-pages)
+		$(meson_feature vaapi with_vaapi)
+		$(meson_feature zstd with_zstd)
+	)
+	local fl
+	for fl in "${WAYPIPE_FLAG_MAP[@]}"; do
+		emesonargs+=( $(meson_use "${fl%:*}" "${fl#*:}") )
+	done
+	meson_src_configure
+}
diff --git a/gui-apps/waypipe/waypipe-9999.ebuild b/gui-apps/waypipe/waypipe-9999.ebuild
index 53231be9f678..a105c5722610 100644
--- a/gui-apps/waypipe/waypipe-9999.ebuild
+++ b/gui-apps/waypipe/waypipe-9999.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 
 inherit meson python-any-r1
 
-DESCRIPTION="transparent network proxy for Wayland compositors"
+DESCRIPTION="Transparent network proxy for Wayland compositors"
 HOMEPAGE="https://gitlab.freedesktop.org/mstoeckl/waypipe"
 
 if [[ ${PV} == 9999 ]]; then
@@ -16,14 +16,20 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/${PN}-v${PV}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
 
-CPU_FLAGS_X86=( "avx2" "avx512f" "sse3" )
-IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${CPU_FLAGS_X86[@]/#/cpu_flags_x86_}"
+WAYPIPE_FLAG_MAP_X86=( avx2:with_avx2 avx512f:with_avx512f sse3:with_sse3 )
+WAYPIPE_FLAG_MAP_ARM=( neon:with_neon_opts )
+WAYPIPE_FLAG_MAP=(
+	"${WAYPIPE_FLAG_MAP_X86[@]/#/cpu_flags_x86_}"
+	"${WAYPIPE_FLAG_MAP_ARM[@]/#/cpu_flags_arm_}"
+)
+
+IUSE="dmabuf ffmpeg lz4 man neon systemtap test vaapi zstd ${WAYPIPE_FLAG_MAP[@]%:*}"
 REQUIRED_USE="vaapi? ( ffmpeg )"
 RESTRICT="!test? ( test )"
 
@@ -45,17 +51,13 @@ BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	man? ( app-text/scdoc )
-	test? ( dev-libs/weston[wayland-compositor,screen-sharing] )
+	test? ( dev-libs/weston[examples,headless,remoting,screen-sharing,wayland-compositor] )
 "
 
-PATCHES=(
-	"${FILESDIR}"/waypipe-0.7.2-werror.patch
-)
-
 src_configure() {
-	local mymesonargs=(
+	local emesonargs=(
+		-Dwerror=false
 		$(meson_use systemtap with_systemtap)
-		$(meson_use neon with_neon_opts)
 		$(meson_feature dmabuf with_dmabuf)
 		$(meson_feature ffmpeg with_video)
 		$(meson_feature lz4 with_lz4)
@@ -64,8 +66,8 @@ src_configure() {
 		$(meson_feature zstd with_zstd)
 	)
 	local fl
-	for fl in "${CPU_FLAGS_X86[@]}"; do
-		mymesonargs+=( $(meson_use cpu_flags_x86_$fl with_$fl ) )
+	for fl in "${WAYPIPE_FLAG_MAP[@]}"; do
+		emesonargs+=( $(meson_use "${fl%:*}" "${fl#*:}") )
 	done
 	meson_src_configure
 }