Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
Date: Mon, 04 Dec 2017 20:30:39
Message-Id: 1512419405.6acac429273b8072a1db1c57a02c8e389e6536c0.sping@gentoo
1 commit: 6acac429273b8072a1db1c57a02c8e389e6536c0
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 4 20:29:00 2017 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 4 20:30:05 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6acac429
7
8 media-libs/gegl: libopenraw-0.1 (bug 639834)
9
10 Package-Manager: Portage-2.3.16, Repoman-2.3.6
11
12 .../gegl/files/gegl-0.2.0-libopenraw-0.1.patch | 48 +++++++
13 media-libs/gegl/gegl-0.2.0-r3.ebuild | 160 +++++++++++++++++++++
14 2 files changed, 208 insertions(+)
15
16 diff --git a/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch b/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
17 new file mode 100644
18 index 00000000000..ec122703955
19 --- /dev/null
20 +++ b/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
21 @@ -0,0 +1,48 @@
22 +From 1ad5d7656891f53b76efd6783d75d14b9cbb4daa Mon Sep 17 00:00:00 2001
23 +From: Sebastian Pipping <sebastian@×××××××.org>
24 +Date: Mon, 4 Dec 2017 21:18:56 +0100
25 +Subject: [PATCH] Support (and require) libopenraw 0.1.0+
26 +
27 +---
28 + configure.ac | 4 ++--
29 + operations/external/openraw.c | 2 +-
30 + 2 files changed, 3 insertions(+), 3 deletions(-)
31 +
32 +diff --git a/configure.ac b/configure.ac
33 +index 30d306e..febdddb 100644
34 +--- a/configure.ac
35 ++++ b/configure.ac
36 +@@ -47,7 +47,7 @@ m4_define([lensfun_required_version], [0.2.5])
37 + m4_define([librsvg_required_version], [2.14.0])
38 + m4_define([lua_required_version], [5.1.0])
39 + m4_define([openexr_required_version], [0.0.0])
40 +-m4_define([openraw_required_version], [0.0.5])
41 ++m4_define([openraw_required_version], [0.1.0])
42 + m4_define([pango_required_version], [0.0.0])
43 + m4_define([pangocairo_required_version], [0.0.0])
44 + m4_define([png_required_version], [0.0.0])
45 +@@ -790,7 +790,7 @@ AC_ARG_WITH(libopenraw, [ --without-libopenraw build without openraw support
46 +
47 + have_libopenraw="no"
48 + if test "x$with_libopenraw" != "xno"; then
49 +- PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= openraw_required_version,
50 ++ PKG_CHECK_MODULES(OPENRAW, libopenraw-0.1 >= openraw_required_version,
51 + have_libopenraw="yes",
52 + have_libopenraw="no (openraw library not found)")
53 + fi
54 +diff --git a/operations/external/openraw.c b/operations/external/openraw.c
55 +index 9fc1e95..b4b4a13 100644
56 +--- a/operations/external/openraw.c
57 ++++ b/operations/external/openraw.c
58 +@@ -116,7 +116,7 @@ load_buffer (GeglOperation *operation)
59 + goto clean_file;
60 + }
61 +
62 +- if(or_rawdata_format (rawdata) != OR_DATA_TYPE_CFA)
63 ++ if(or_rawdata_format (rawdata) != OR_DATA_TYPE_RAW)
64 + {
65 + goto clean_file;
66 + }
67 +--
68 +2.15.0
69 +
70
71 diff --git a/media-libs/gegl/gegl-0.2.0-r3.ebuild b/media-libs/gegl/gegl-0.2.0-r3.ebuild
72 new file mode 100644
73 index 00000000000..9f74b026acd
74 --- /dev/null
75 +++ b/media-libs/gegl/gegl-0.2.0-r3.ebuild
76 @@ -0,0 +1,160 @@
77 +# Copyright 1999-2017 Gentoo Foundation
78 +# Distributed under the terms of the GNU General Public License v2
79 +
80 +EAPI=6
81 +
82 +WANT_AUTOMAKE=1.11 # see bug 471990, comment 3
83 +# vala and introspection support is broken, bug #468208
84 +#VALA_MIN_API_VERSION=0.14
85 +#VALA_USE_DEPEND=vapigen
86 +
87 +inherit versionator gnome2-utils eutils autotools #vala
88 +
89 +DESCRIPTION="A graph based image processing framework"
90 +HOMEPAGE="http://www.gegl.org/"
91 +SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
92 +
93 +LICENSE="|| ( GPL-3 LGPL-3 )"
94 +SLOT="0"
95 +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"
96 +
97 +IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
98 +
99 +RDEPEND="
100 + >=media-libs/babl-0.1.10
101 + >=dev-libs/glib-2.28:2
102 + >=x11-libs/gdk-pixbuf-2.18:2
103 + x11-libs/pango
104 + sys-libs/zlib
105 + cairo? ( x11-libs/cairo )
106 + ffmpeg? (
107 + libav? ( media-video/libav:0= )
108 + !libav? ( media-video/ffmpeg:0= )
109 + )
110 + jpeg? ( virtual/jpeg:0 )
111 + jpeg2k? ( >=media-libs/jasper-1.900.1:= )
112 + openexr? ( media-libs/openexr )
113 + png? ( media-libs/libpng:0= )
114 + raw? ( >=media-libs/libopenraw-0.1 )
115 + sdl? ( media-libs/libsdl )
116 + svg? ( >=gnome-base/librsvg-2.14:2 )
117 + umfpack? ( sci-libs/umfpack )
118 + lensfun? ( >=media-libs/lensfun-0.2.5 )
119 +"
120 +# >=media-libs/babl-0.1.10[introspection?]
121 +# introspection? ( >=dev-libs/gobject-introspection-0.10
122 +# >=dev-python/pygobject-2.26:2 )
123 +DEPEND="${RDEPEND}
124 + >=dev-util/intltool-0.40.1
125 + dev-lang/perl
126 + virtual/pkgconfig
127 + >=sys-devel/libtool-2.2
128 +"
129 +# vala? ( $(vala_depend) )"
130 +
131 +DOCS=( ChangeLog INSTALL README NEWS )
132 +
133 +src_prepare() {
134 + # https://bugs.gentoo.org/show_bug.cgi?id=442016
135 + epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
136 + epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
137 +
138 + # https://bugs.gentoo.org/show_bug.cgi?id=416587
139 + epatch "${FILESDIR}/${P}-introspection-version.patch"
140 +
141 + epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
142 + # fix OSX loadable module filename extension
143 + sed -i -e 's/\.dylib/.bundle/' configure.ac || die
144 + # don't require Apple's OpenCL on versions of OSX that don't have it
145 + if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
146 + sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
147 + fi
148 +
149 + epatch "${FILESDIR}"/${P}-g_log_domain.patch
150 +
151 + # https://bugs.gentoo.org/show_bug.cgi?id=605216
152 + # https://bugs.gentoo.org/show_bug.cgi?id=617430
153 + epatch "${FILESDIR}"/${P}-underlinking.patch
154 + epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834
155 +
156 + eapply_user
157 + eautoreconf
158 +
159 + # https://bugs.gentoo.org/show_bug.cgi?id=468248
160 + local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
161 + [[ -f "${deps_file}" ]] || touch "${deps_file}"
162 +
163 +# use vala && vala_src_prepare
164 +}
165 +
166 +src_configure() {
167 + # never enable altering of CFLAGS via profile option
168 + # libspiro: not in portage main tree
169 + # disable documentation as the generating is bit automagic
170 + # if anyone wants to work on it just create bug with patch
171 +
172 + # Also please note that:
173 + #
174 + # - Some auto-detections are not patched away since the docs are
175 + # not built (--disable-docs, lack of --enable-gtk-doc) and these
176 + # tools affect re-generation of docs, only
177 + # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
178 + #
179 + # - Parameter --with-exiv2 compiles a noinst-app only, no use
180 + #
181 + # - Parameter --disable-workshop disables any use of Lua, effectivly
182 + #
183 + # - v4l support does not work with our media-libs/libv4l-0.8.9,
184 + # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
185 + #
186 + # - There are two checks for dot, one controllable by --with(out)-graphviz
187 + # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
188 + #
189 + # So that's why USE="exif graphviz lua v4l" got resolved. More at:
190 + # https://bugs.gentoo.org/show_bug.cgi?id=451136
191 + #
192 + econf \
193 + --disable-silent-rules \
194 + --disable-profile \
195 + --without-libspiro \
196 + --disable-docs --disable-workshop \
197 + --with-pango --with-gdk-pixbuf \
198 + $(use_enable cpu_flags_x86_mmx mmx) \
199 + $(use_enable cpu_flags_x86_sse sse) \
200 + $(use_enable debug) \
201 + $(use_with cairo) \
202 + $(use_with cairo pangocairo) \
203 + --without-exiv2 \
204 + $(use_with ffmpeg libavformat) \
205 + --without-graphviz \
206 + $(use_with jpeg libjpeg) \
207 + $(use_with jpeg2k jasper) \
208 + --without-lua \
209 + $(use_with openexr) \
210 + $(use_with png libpng) \
211 + $(use_with raw libopenraw) \
212 + $(use_with sdl) \
213 + $(use_with svg librsvg) \
214 + $(use_with umfpack) \
215 + --without-libv4l \
216 + $(use_with lensfun) \
217 + --disable-introspection \
218 + --without-vala
219 +# $(use_enable introspection) \
220 +# $(use_with vala)
221 +}
222 +
223 +src_test() {
224 + gnome2_environment_reset # sandbox issues
225 + default
226 +}
227 +
228 +src_compile() {
229 + gnome2_environment_reset # sandbox issues (bug #396687)
230 + default
231 +}
232 +
233 +src_install() {
234 + default
235 + find "${ED}" -name '*.la' -delete
236 +}