1 |
commit: c65f3122b5e0996bdb9c143d3d6393d3dddb9ffa |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 29 17:46:46 2018 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 29 17:50:44 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65f3122 |
7 |
|
8 |
media-libs/gegl: 0.4.0 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/654240 |
11 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
12 |
|
13 |
media-libs/gegl/Manifest | 1 + |
14 |
.../gegl/{gegl-9999.ebuild => gegl-0.4.0.ebuild} | 36 +++++++++++++--------- |
15 |
media-libs/gegl/gegl-9999.ebuild | 2 +- |
16 |
3 files changed, 23 insertions(+), 16 deletions(-) |
17 |
|
18 |
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest |
19 |
index c1a611b21c5..928eec7d381 100644 |
20 |
--- a/media-libs/gegl/Manifest |
21 |
+++ b/media-libs/gegl/Manifest |
22 |
@@ -7,3 +7,4 @@ DIST gegl-0.3.28.tar.bz2 6530569 BLAKE2B ac802c312a0fa44bec8ec4c41454fc9aabebdb1 |
23 |
DIST gegl-0.3.30.tar.bz2 6675564 BLAKE2B 177db85f8225f9cbb04774d270e0d71db598099be814157ad46ca7a9ceee2d60efde2e02ec2f81ef5c8bcc14e06c5d1d03718f6cc0005c576aa47a1f233a07c2 SHA512 4506eed9980e2a455b43b643d50b3a89d12b605ee4584fc7dd5c63be60acae64eda88f580ecb82891a4b0d69af10730a0d1525de7cc468afccdf2cf78f85b2eb |
24 |
DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02 |
25 |
DIST gegl-0.3.8.tar.bz2 5876259 BLAKE2B 24199148ffbef6454ea460d126c29f1cc8581e5430bc3e341a8ab48fff701a0d63c4cf8864d04219455feaeb7e03808e8de06cc8ae0a500eb4154f2ec9ba25fe SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb |
26 |
+DIST gegl-0.4.0.tar.bz2 6762190 BLAKE2B c138ee79806178f60eab2fae492fcf441dc49b54364abcf023f6ade0cb08d216200ae14a289af8b6da2f0eec97dc81d376469245d0aa6d6cabf269d42c0a83c0 SHA512 4e319e861f6a27f52d0d4920942abe3734e6015eaa76491ab55179d8c677ccf8eb7f4296ef43f55a5e77ae9e99bb2ba6f5bd20aa08f194e9d42a1159fae20c6e |
27 |
|
28 |
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.0.ebuild |
29 |
similarity index 81% |
30 |
copy from media-libs/gegl/gegl-9999.ebuild |
31 |
copy to media-libs/gegl/gegl-0.4.0.ebuild |
32 |
index 927662caeff..a247b71cd60 100644 |
33 |
--- a/media-libs/gegl/gegl-9999.ebuild |
34 |
+++ b/media-libs/gegl/gegl-0.4.0.ebuild |
35 |
@@ -1,4 +1,4 @@ |
36 |
-# Copyright 1999-2017 Gentoo Foundation |
37 |
+# Copyright 1999-2018 Gentoo Foundation |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
EAPI=6 |
41 |
@@ -15,52 +15,54 @@ if [[ ${PV} == *9999* ]]; then |
42 |
SRC_URI="" |
43 |
else |
44 |
SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" |
45 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
46 |
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
47 |
fi |
48 |
|
49 |
DESCRIPTION="A graph based image processing framework" |
50 |
HOMEPAGE="http://www.gegl.org/" |
51 |
|
52 |
LICENSE="|| ( GPL-3 LGPL-3 )" |
53 |
-SLOT="0.3" |
54 |
+SLOT="0.4" |
55 |
|
56 |
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp" |
57 |
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp" |
58 |
REQUIRED_USE=" |
59 |
svg? ( cairo ) |
60 |
vala? ( introspection ) |
61 |
" |
62 |
|
63 |
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE |
64 |
+# so there is no chance to support libav right now (Gentoo bug #567638) |
65 |
+# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! |
66 |
RDEPEND=" |
67 |
>=dev-libs/glib-2.44:2 |
68 |
dev-libs/json-glib |
69 |
- >=media-libs/babl-0.1.30 |
70 |
+ >=media-libs/babl-0.1.46 |
71 |
sys-libs/zlib |
72 |
>=x11-libs/gdk-pixbuf-2.32:2 |
73 |
x11-libs/pango |
74 |
|
75 |
- cairo? ( x11-libs/cairo ) |
76 |
+ cairo? ( >=x11-libs/cairo-1.12.2 ) |
77 |
ffmpeg? ( |
78 |
- libav? ( media-video/libav:0= ) |
79 |
- !libav? ( media-video/ffmpeg:0= ) |
80 |
+ >=media-video/ffmpeg-2.8:0= |
81 |
) |
82 |
introspection? ( >=dev-libs/gobject-introspection-1.32:= ) |
83 |
virtual/jpeg:0= |
84 |
jpeg2k? ( >=media-libs/jasper-1.900.1:= ) |
85 |
- lcms? ( >=media-libs/lcms-2.2:2 ) |
86 |
+ lcms? ( >=media-libs/lcms-2.8:2 ) |
87 |
lensfun? ( >=media-libs/lensfun-0.2.5 ) |
88 |
- openexr? ( media-libs/openexr:= ) |
89 |
- media-libs/libpng:0= |
90 |
+ openexr? ( >=media-libs/openexr-1.6.1:= ) |
91 |
+ >=media-libs/libpng-1.6.0:0= |
92 |
raw? ( >=media-libs/libraw-0.15.4:0= ) |
93 |
- sdl? ( media-libs/libsdl ) |
94 |
- svg? ( >=gnome-base/librsvg-2.14:2 ) |
95 |
+ sdl? ( >=media-libs/libsdl-1.2.0 ) |
96 |
+ svg? ( >=gnome-base/librsvg-2.40.6:2 ) |
97 |
tiff? ( >=media-libs/tiff-4:0 ) |
98 |
umfpack? ( sci-libs/umfpack ) |
99 |
v4l? ( >=media-libs/libv4l-1.0.1 ) |
100 |
- webp? ( media-libs/libwebp ) |
101 |
+ webp? ( >=media-libs/libwebp-0.5.0:= ) |
102 |
" |
103 |
DEPEND="${RDEPEND} |
104 |
>=dev-util/gtk-doc-am-1 |
105 |
- >=dev-util/intltool-0.40.1 |
106 |
+ >=sys-devel/gettext-0.19.8 |
107 |
dev-lang/perl |
108 |
virtual/pkgconfig |
109 |
>=sys-devel/libtool-2.2 |
110 |
@@ -73,6 +75,10 @@ pkg_setup() { |
111 |
use test && use introspection && python-any-r1_pkg_setup |
112 |
} |
113 |
|
114 |
+PATCHES=( |
115 |
+ "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch |
116 |
+) |
117 |
+ |
118 |
src_prepare() { |
119 |
default |
120 |
|
121 |
|
122 |
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild |
123 |
index 927662caeff..5fe47759f34 100644 |
124 |
--- a/media-libs/gegl/gegl-9999.ebuild |
125 |
+++ b/media-libs/gegl/gegl-9999.ebuild |
126 |
@@ -22,7 +22,7 @@ DESCRIPTION="A graph based image processing framework" |
127 |
HOMEPAGE="http://www.gegl.org/" |
128 |
|
129 |
LICENSE="|| ( GPL-3 LGPL-3 )" |
130 |
-SLOT="0.3" |
131 |
+SLOT="0.4" |
132 |
|
133 |
IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr raw sdl svg test tiff umfpack vala v4l webp" |
134 |
REQUIRED_USE=" |