1 |
commit: be43680da3d0c4fb7f31ed5740dd078d3428f072 |
2 |
Author: band-a-prend <torokhov-s-a <AT> yandex <DOT> ru> |
3 |
AuthorDate: Thu Jan 23 10:47:25 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 25 21:09:39 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be43680d |
7 |
|
8 |
media-libs/gegl: 0.4.20 version bump, 9999 deps update |
9 |
|
10 |
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-libs/gegl/Manifest | 1 + |
14 |
.../gegl/{gegl-9999.ebuild => gegl-0.4.20.ebuild} | 17 +++++++++++------ |
15 |
media-libs/gegl/gegl-9999.ebuild | 10 ++++------ |
16 |
3 files changed, 16 insertions(+), 12 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest |
19 |
index 9a9f3f3851c..38747b32436 100644 |
20 |
--- a/media-libs/gegl/Manifest |
21 |
+++ b/media-libs/gegl/Manifest |
22 |
@@ -4,3 +4,4 @@ DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350d |
23 |
DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b |
24 |
DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27 |
25 |
DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd |
26 |
+DIST gegl-0.4.20.tar.xz 4826340 BLAKE2B 0d1087ea983d7fbeb7ea1edb572bea97e9b4e01aaabd5225ba07ab5cee3b369f42fe39691209f38d4d2a87d56997d9756449cafdb6288eb0864b49fb13a6a8ef SHA512 140ac1543aa24a23aa685dbd7335f21bcbf3d95c41c1451b2383f6d278842bd9f0c8c980ed27c70c67b2fefe9ba01f2d4bd4b77a1cee38ec1332c12ab3fd718d |
27 |
|
28 |
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.20.ebuild |
29 |
similarity index 86% |
30 |
copy from media-libs/gegl/gegl-9999.ebuild |
31 |
copy to media-libs/gegl/gegl-0.4.20.ebuild |
32 |
index 98a250798f6..5623528869a 100644 |
33 |
--- a/media-libs/gegl/gegl-9999.ebuild |
34 |
+++ b/media-libs/gegl/gegl-0.4.20.ebuild |
35 |
@@ -2,8 +2,8 @@ |
36 |
# Distributed under the terms of the GNU General Public License v2 |
37 |
|
38 |
EAPI=7 |
39 |
-PYTHON_COMPAT=( python{2_7,3_{6,7}} ) |
40 |
|
41 |
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) |
42 |
# vala and introspection support is broken, bug #468208 |
43 |
VALA_USE_DEPEND=vapigen |
44 |
|
45 |
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then |
46 |
SRC_URI="" |
47 |
else |
48 |
SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" |
49 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
50 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
51 |
fi |
52 |
|
53 |
DESCRIPTION="A graph based image processing framework" |
54 |
@@ -39,7 +39,7 @@ RESTRICT="!test? ( test )" |
55 |
RDEPEND=" |
56 |
>=dev-libs/glib-2.44:2 |
57 |
>=dev-libs/json-glib-1.2.6 |
58 |
- >=media-libs/babl-0.1.72[introspection?] |
59 |
+ >=media-libs/babl-0.1.74[introspection?] |
60 |
media-libs/libnsgif |
61 |
>=media-libs/libpng-1.6.0:0= |
62 |
>=sys-libs/zlib-1.2.0 |
63 |
@@ -65,9 +65,7 @@ RDEPEND=" |
64 |
webp? ( >=media-libs/libwebp-0.5.0:= ) |
65 |
" |
66 |
|
67 |
-DEPEND=" |
68 |
- ${RDEPEND} |
69 |
-" |
70 |
+DEPEND="${RDEPEND}" |
71 |
|
72 |
BDEPEND=" |
73 |
dev-lang/perl |
74 |
@@ -84,6 +82,7 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) |
75 |
PATCHES=( |
76 |
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch |
77 |
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch |
78 |
+ "${FILESDIR}"/${PN}-0.4.18-cltostring_force_utf8.patch |
79 |
) |
80 |
|
81 |
python_check_deps() { |
82 |
@@ -107,6 +106,12 @@ src_prepare() { |
83 |
-e '/composite-transform.xml/d' \ |
84 |
-i tests/compositions/meson.build || die |
85 |
|
86 |
+ # fix skipping mipmap tests due to executable not found |
87 |
+ for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do |
88 |
+ sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die |
89 |
+ sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die |
90 |
+ done |
91 |
+ |
92 |
gnome2_environment_reset |
93 |
|
94 |
use vala && vala_src_prepare |
95 |
|
96 |
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild |
97 |
index 98a250798f6..25f257ba42c 100644 |
98 |
--- a/media-libs/gegl/gegl-9999.ebuild |
99 |
+++ b/media-libs/gegl/gegl-9999.ebuild |
100 |
@@ -2,8 +2,8 @@ |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
|
103 |
EAPI=7 |
104 |
-PYTHON_COMPAT=( python{2_7,3_{6,7}} ) |
105 |
|
106 |
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) |
107 |
# vala and introspection support is broken, bug #468208 |
108 |
VALA_USE_DEPEND=vapigen |
109 |
|
110 |
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then |
111 |
SRC_URI="" |
112 |
else |
113 |
SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" |
114 |
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
115 |
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
116 |
fi |
117 |
|
118 |
DESCRIPTION="A graph based image processing framework" |
119 |
@@ -39,7 +39,7 @@ RESTRICT="!test? ( test )" |
120 |
RDEPEND=" |
121 |
>=dev-libs/glib-2.44:2 |
122 |
>=dev-libs/json-glib-1.2.6 |
123 |
- >=media-libs/babl-0.1.72[introspection?] |
124 |
+ >=media-libs/babl-0.1.74[introspection?] |
125 |
media-libs/libnsgif |
126 |
>=media-libs/libpng-1.6.0:0= |
127 |
>=sys-libs/zlib-1.2.0 |
128 |
@@ -65,9 +65,7 @@ RDEPEND=" |
129 |
webp? ( >=media-libs/libwebp-0.5.0:= ) |
130 |
" |
131 |
|
132 |
-DEPEND=" |
133 |
- ${RDEPEND} |
134 |
-" |
135 |
+DEPEND="${RDEPEND}" |
136 |
|
137 |
BDEPEND=" |
138 |
dev-lang/perl |