1 |
commit: b3953d9995275aad3f34d2c389aade2ab61b9b7c |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 16 18:00:19 2020 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 16 18:01:44 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3953d99 |
7 |
|
8 |
media-gfx/imv: Add USE=heif, use meson.eclass |
9 |
|
10 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
11 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=710344 |
12 |
Closes: https://bugs.gentoo.org/713682 |
13 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
14 |
|
15 |
media-gfx/imv/imv-9999.ebuild | 61 ++++++++++++++++++++----------------------- |
16 |
media-gfx/imv/metadata.xml | 1 + |
17 |
2 files changed, 29 insertions(+), 33 deletions(-) |
18 |
|
19 |
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild |
20 |
index 986d27dd325..65f50d9221c 100644 |
21 |
--- a/media-gfx/imv/imv-9999.ebuild |
22 |
+++ b/media-gfx/imv/imv-9999.ebuild |
23 |
@@ -2,16 +2,16 @@ |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
|
26 |
EAPI=7 |
27 |
-inherit git-r3 toolchain-funcs xdg-utils |
28 |
+inherit git-r3 meson xdg-utils |
29 |
|
30 |
DESCRIPTION="Minimal image viewer designed for tiling window manager users" |
31 |
+LICENSE="MIT-with-advertising" |
32 |
HOMEPAGE="https://github.com/eXeC64/imv" |
33 |
EGIT_REPO_URI="https://github.com/eXeC64/imv" |
34 |
|
35 |
-LICENSE="MIT-with-advertising" |
36 |
-SLOT="0" |
37 |
KEYWORDS="" |
38 |
-IUSE="X +freeimage jpeg libnsgif png +svg test tiff wayland" |
39 |
+SLOT="0" |
40 |
+IUSE="X +freeimage +png jpeg svg gif heif test tiff wayland" |
41 |
RESTRICT="!test? ( test )" |
42 |
REQUIRED_USE=" |
43 |
|| ( X wayland ) |
44 |
@@ -27,15 +27,18 @@ RDEPEND=" |
45 |
virtual/glu |
46 |
x11-libs/libX11 |
47 |
x11-libs/libxcb |
48 |
- x11-libs/libxkbcommon |
49 |
+ x11-libs/libxkbcommon[X] |
50 |
x11-libs/pango |
51 |
) |
52 |
- freeimage? ( media-libs/freeimage ) |
53 |
- jpeg? ( media-libs/libjpeg-turbo ) |
54 |
- libnsgif? ( media-libs/libnsgif ) |
55 |
- png? ( media-libs/libpng ) |
56 |
- svg? ( gnome-base/librsvg ) |
57 |
- tiff? ( media-libs/tiff ) |
58 |
+ freeimage? ( media-libs/freeimage[png?,jpeg?,tiff?] ) |
59 |
+ !freeimage? ( |
60 |
+ jpeg? ( media-libs/libjpeg-turbo ) |
61 |
+ png? ( media-libs/libpng ) |
62 |
+ tiff? ( media-libs/tiff ) |
63 |
+ ) |
64 |
+ gif? ( media-libs/libnsgif ) |
65 |
+ heif? ( media-libs/libheif ) |
66 |
+ svg? ( >=gnome-base/librsvg-2.44 ) |
67 |
wayland? ( dev-libs/wayland ) |
68 |
" |
69 |
BDEPEND=" |
70 |
@@ -46,13 +49,7 @@ DEPEND=" |
71 |
${RDEPEND} |
72 |
" |
73 |
|
74 |
-src_prepare() { |
75 |
- default |
76 |
- sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die |
77 |
-} |
78 |
- |
79 |
src_configure() { |
80 |
- tc-export PKG_CONFIG |
81 |
local WINDOWS |
82 |
if use X; then |
83 |
if ! use wayland; then |
84 |
@@ -66,23 +63,21 @@ src_configure() { |
85 |
fi |
86 |
fi |
87 |
|
88 |
- BACKENDS=( |
89 |
- BACKEND_FREEIMAGE=$(usex freeimage) |
90 |
- BACKEND_JPEG=$(usex jpeg) |
91 |
- BACKEND_LIBNSGIF=$(usex libnsgif) |
92 |
- BACKEND_LIBPNG=$(usex png) |
93 |
- BACKEND_LIBRSVG=$(usex svg) |
94 |
- BACKEND_LIBTIFF=$(usex tiff) |
95 |
- WINDOWS=${WINDOWS} |
96 |
- ) |
97 |
-} |
98 |
- |
99 |
-src_compile() { |
100 |
- emake ${BACKENDS[@]} |
101 |
-} |
102 |
+ if ! use test; then |
103 |
+ sed -i -e '/^dep_cmocka/,/^endforeach$/d' meson.build || die |
104 |
+ fi |
105 |
|
106 |
-src_install() { |
107 |
- emake ${BACKENDS[@]} DESTDIR="${D}" install |
108 |
+ local emesonargs=( |
109 |
+ $(meson_feature freeimage) |
110 |
+ $(meson_feature gif libnsgif) |
111 |
+ $(meson_feature heif libheif) |
112 |
+ $(meson_feature svg librsvg) |
113 |
+ $(usex freeimage -Dlibjpeg=disabled -Dlibjpeg=enabled) |
114 |
+ $(usex freeimage -Dlibpng=disabled -Dlibjpeg=enabled) |
115 |
+ $(usex freeimage -Dlibtiff=disabled -Dlibjpeg=enabled) |
116 |
+ -Dwindows=$WINDOWS |
117 |
+ ) |
118 |
+ meson_src_configure |
119 |
} |
120 |
|
121 |
pkg_postinst() { |
122 |
|
123 |
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml |
124 |
index 39258bf23da..e61730462a7 100644 |
125 |
--- a/media-gfx/imv/metadata.xml |
126 |
+++ b/media-gfx/imv/metadata.xml |
127 |
@@ -4,6 +4,7 @@ |
128 |
<maintainer type='person'><email>jer@g.o</email></maintainer> |
129 |
<use> |
130 |
<flag name='freeimage'>Use <pkg>media-libs/freeimage</pkg> as image library</flag> |
131 |
+<flag name='heif'>Use <pkg>media-libs/libheif</pkg> as image library</flag> |
132 |
<flag name='libnsgif'>Use <pkg>media-libs/libnsgif</pkg> as image library</flag> |
133 |
</use> |
134 |
<upstream> |