diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
| commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
| tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-gfx/imv | |
| parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) | |
gentoo resync : 25.08.2020
Diffstat (limited to 'media-gfx/imv')
| -rw-r--r-- | media-gfx/imv/Manifest | 4 | ||||
| -rw-r--r-- | media-gfx/imv/imv-9999.ebuild | 61 | ||||
| -rw-r--r-- | media-gfx/imv/metadata.xml | 1 |
3 files changed, 31 insertions, 35 deletions
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest index 44567ea6e508..693d9bd7d3a0 100644 --- a/media-gfx/imv/Manifest +++ b/media-gfx/imv/Manifest @@ -2,5 +2,5 @@ DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12d DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a EBUILD imv-4.0.1-r2.ebuild 1668 BLAKE2B 15349164bbf9db90387a806b7a93546321865f1b0ab9afceae73cb8a19f5c3c91868000babc6ecc07ebd799b09f43f3392937b53b9a7ee587d5591a74cf140ae SHA512 2d35ea2a80e63dea404172db166ff394afc052ed063d88fd3d5b35e592bffd6d2154461caab979104a414a39b908e6dd5e362d7f99146f683ba3c3fa8b445e2b EBUILD imv-4.1.0-r1.ebuild 1767 BLAKE2B fe2541d3bce172e6fc1c559ed0593a4c52b1536b907459d2e5842db5c14ec356e7523cf3d91225ab6b5d3261b8ff3fa4ab9724c8d95979e88078b5b7617d897f SHA512 7484d434a44818bd131ccecd484bd88e6ed8867eacf48f94e863b9dc480f197005a5f8bc519207afd82f3fca7d02416dbd7fc7ff966520b7a57c726317af4cdd -EBUILD imv-9999.ebuild 1727 BLAKE2B 5526bd1ee82f4afa84f43752cd03f3809187d7b1c20e47d821b353dfa4dff1b20a718f7e8d1dddd6c41fdf16459db84a7763f6c192a0062b94f090938d31ffdd SHA512 4ab7602d3941b9de703bc0e0dff3c2510b1cde4e143baba19640805638565559e6bcc78b62ef06841fa8afbd51d9dc1a6f94f8bc0bd4d8f11aca402ad2a636c5 -MISC metadata.xml 456 BLAKE2B 90f9ddfeb2d7135d1cd5bf96cf234f1f56db6581d60340df16b33fcc640bd700d0425156b18755cf41c00ad127802d822933e10220bd4a857cac8d88b3a8691e SHA512 e926970f4155a6d9759bf37f43f91e616de74fa2f276144947b632f07bde0c94dcc17ddb4b079ea6c3535461c3ad682a83746083749ea1a5aaa4c9503ffe0fd8 +EBUILD imv-9999.ebuild 1798 BLAKE2B a1c931a83c7b2444d33341e74fa50c4fa532ec3b215e3010eb250a1cae7c2f0f439068d725d3e3bc17eb4cc2cc97fe0e96924d606225cf783d7c009938ca0832 SHA512 c35f9417fe15cce3947ff334aaadae2c76fa9c4084e321bf903bda5cb9e3c9d6341fe709e9b8dcf2cdad84c48e7b848463c75a508ee8fbcce66261533dcf77cd +MISC metadata.xml 532 BLAKE2B 425eed771fcdee28d9ef37c21fdca5b7f4450f565fff15f647a94de9e9e220b97df1efb517a6daa752ed628332f81b49eb429f6bd9a558094ae7d0e71d359cbf SHA512 f4fc42098f9ae4e48add68134e70ca61dc20fa408b4e2b46fb6072bfa2543ae1d928033ed2dba2dd34f79d3e12f4ad1c98bf5bab600b842f97d99fd8c4a3bdb6 diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild index 986d27dd3255..65f50d9221c2 100644 --- a/media-gfx/imv/imv-9999.ebuild +++ b/media-gfx/imv/imv-9999.ebuild @@ -2,16 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit git-r3 toolchain-funcs xdg-utils +inherit git-r3 meson xdg-utils DESCRIPTION="Minimal image viewer designed for tiling window manager users" +LICENSE="MIT-with-advertising" HOMEPAGE="https://github.com/eXeC64/imv" EGIT_REPO_URI="https://github.com/eXeC64/imv" -LICENSE="MIT-with-advertising" -SLOT="0" KEYWORDS="" -IUSE="X +freeimage jpeg libnsgif png +svg test tiff wayland" +SLOT="0" +IUSE="X +freeimage +png jpeg svg gif heif test tiff wayland" RESTRICT="!test? ( test )" REQUIRED_USE=" || ( X wayland ) @@ -27,15 +27,18 @@ RDEPEND=" virtual/glu x11-libs/libX11 x11-libs/libxcb - x11-libs/libxkbcommon + x11-libs/libxkbcommon[X] x11-libs/pango ) - freeimage? ( media-libs/freeimage ) - jpeg? ( media-libs/libjpeg-turbo ) - libnsgif? ( media-libs/libnsgif ) - png? ( media-libs/libpng ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff ) + freeimage? ( media-libs/freeimage[png?,jpeg?,tiff?] ) + !freeimage? ( + jpeg? ( media-libs/libjpeg-turbo ) + png? ( media-libs/libpng ) + tiff? ( media-libs/tiff ) + ) + gif? ( media-libs/libnsgif ) + heif? ( media-libs/libheif ) + svg? ( >=gnome-base/librsvg-2.44 ) wayland? ( dev-libs/wayland ) " BDEPEND=" @@ -46,13 +49,7 @@ DEPEND=" ${RDEPEND} " -src_prepare() { - default - sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die -} - src_configure() { - tc-export PKG_CONFIG local WINDOWS if use X; then if ! use wayland; then @@ -66,23 +63,21 @@ src_configure() { fi fi - BACKENDS=( - BACKEND_FREEIMAGE=$(usex freeimage) - BACKEND_JPEG=$(usex jpeg) - BACKEND_LIBNSGIF=$(usex libnsgif) - BACKEND_LIBPNG=$(usex png) - BACKEND_LIBRSVG=$(usex svg) - BACKEND_LIBTIFF=$(usex tiff) - WINDOWS=${WINDOWS} - ) -} - -src_compile() { - emake ${BACKENDS[@]} -} + if ! use test; then + sed -i -e '/^dep_cmocka/,/^endforeach$/d' meson.build || die + fi -src_install() { - emake ${BACKENDS[@]} DESTDIR="${D}" install + local emesonargs=( + $(meson_feature freeimage) + $(meson_feature gif libnsgif) + $(meson_feature heif libheif) + $(meson_feature svg librsvg) + $(usex freeimage -Dlibjpeg=disabled -Dlibjpeg=enabled) + $(usex freeimage -Dlibpng=disabled -Dlibjpeg=enabled) + $(usex freeimage -Dlibtiff=disabled -Dlibjpeg=enabled) + -Dwindows=$WINDOWS + ) + meson_src_configure } pkg_postinst() { diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml index 39258bf23daf..e61730462a7b 100644 --- a/media-gfx/imv/metadata.xml +++ b/media-gfx/imv/metadata.xml @@ -4,6 +4,7 @@ <maintainer type='person'><email>jer@gentoo.org</email></maintainer> <use> <flag name='freeimage'>Use <pkg>media-libs/freeimage</pkg> as image library</flag> +<flag name='heif'>Use <pkg>media-libs/libheif</pkg> as image library</flag> <flag name='libnsgif'>Use <pkg>media-libs/libnsgif</pkg> as image library</flag> </use> <upstream> |