From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 883AC139368 for ; Fri, 6 Aug 2021 01:36:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58D79E0872; Fri, 6 Aug 2021 01:36:07 +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 3E68BE0872 for ; Fri, 6 Aug 2021 01:36:07 +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 928A0342A8A for ; Fri, 6 Aug 2021 01:36:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23789842 for ; Fri, 6 Aug 2021 01:36:04 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1628213427.dc14c6d5f341e1c0ff25522df2c3dd73e46b58c6.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/imv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/imv/imv-9999.ebuild X-VCS-Directories: media-gfx/imv/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: dc14c6d5f341e1c0ff25522df2c3dd73e46b58c6 X-VCS-Branch: master Date: Fri, 6 Aug 2021 01:36:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 915a14cc-62d4-4fe8-913e-40f8af80b04e X-Archives-Hash: feb95c65d29b17fffe0fb91a42781231 commit: dc14c6d5f341e1c0ff25522df2c3dd73e46b58c6 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Aug 6 01:28:57 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Aug 6 01:30:27 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc14c6d5 media-gfx/imv: sync live Signed-off-by: Ionen Wolkens gentoo.org> media-gfx/imv/imv-9999.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild index 9b3b3c026ab..73b075d4566 100644 --- a/media-gfx/imv/imv-9999.ebuild +++ b/media-gfx/imv/imv-9999.ebuild @@ -14,7 +14,7 @@ else fi DESCRIPTION="Minimal image viewer designed for tiling window manager users" -HOMEPAGE="https://github.com/eXeC64/imv" +HOMEPAGE="https://github.com/eXeC64/imv/" LICENSE="MIT-with-advertising" SLOT="0" @@ -23,9 +23,11 @@ REQUIRED_USE="|| ( X wayland )" RESTRICT="!test? ( test )" RDEPEND=" + dev-libs/glib:2 dev-libs/icu:= dev-libs/inih media-libs/libglvnd[X?] + x11-libs/cairo x11-libs/libxkbcommon[X?] x11-libs/pango X? ( @@ -43,6 +45,7 @@ RDEPEND=" !sys-apps/renameutils" DEPEND=" ${RDEPEND} + X? ( x11-base/xorg-proto ) test? ( dev-util/cmocka )" BDEPEND=" app-text/asciidoc @@ -51,9 +54,9 @@ BDEPEND=" src_prepare() { default - # allow building with libglvnd[-X] + # if wayland-only, don't automagic on libGL and force libOpenGL if ! use X; then - sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die + sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die fi # glu isn't used by anything @@ -61,10 +64,6 @@ src_prepare() { } src_configure() { - local windows=all - use X || windows=wayland - use wayland || windows=x11 - local emesonargs=( $(meson_feature freeimage) $(meson_feature gif libnsgif) @@ -74,7 +73,8 @@ src_configure() { $(meson_feature svg librsvg) $(meson_feature test) $(meson_feature tiff libtiff) - -Dwindows=${windows} + -Dwindows=$(usex X $(usex wayland all x11) wayland) ) + meson_src_configure }