diff options
author | Aisha Tammy <gentoo@aisha.cc> | 2021-03-01 19:08:00 -0500 |
---|---|---|
committer | Joonas Niilola <juippis@gentoo.org> | 2021-06-03 10:01:13 +0300 |
commit | f2d80ef84fa04fba88f9afc74a900c2748dc545d (patch) | |
tree | aa8390bce01145816f0d1724db2b32a21f149630 /gui-apps/waypipe/waypipe-9999.ebuild | |
parent | media-sound/whipper: version bump to 0.10.0 (diff) | |
download | gentoo-f2d80ef84fa04fba88f9afc74a900c2748dc545d.tar.gz gentoo-f2d80ef84fa04fba88f9afc74a900c2748dc545d.tar.bz2 gentoo-f2d80ef84fa04fba88f9afc74a900c2748dc545d.zip |
gui-apps/waypipe: fix emesonargs and move to CPU_FLAGS_ARM
Closes: https://bugs.gentoo.org/782745
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Aisha Tammy <gentoo@aisha.cc>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'gui-apps/waypipe/waypipe-9999.ebuild')
-rw-r--r-- | gui-apps/waypipe/waypipe-9999.ebuild | 28 |
1 files changed, 15 insertions, 13 deletions
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 } |