| 1 |
commit: b09793443c40700a4503be856a21696b4793aa91 |
| 2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 27 22:54:44 2019 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 27 23:01:36 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0979344 |
| 7 |
|
| 8 |
media-libs/gegl: 0.4.18 with meson + sync 9999 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/694506 |
| 11 |
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org> |
| 12 |
Package-Manager: Portage-2.3.78, Repoman-2.3.16 |
| 13 |
|
| 14 |
media-libs/gegl/Manifest | 1 + |
| 15 |
.../files/gegl-0.4.18-drop-failing-tests.patch | 43 +++++++ |
| 16 |
.../gegl/files/gegl-0.4.18-program-suffix.patch | 39 +++++++ |
| 17 |
.../gegl/{gegl-9999.ebuild => gegl-0.4.18.ebuild} | 125 +++++++++------------ |
| 18 |
media-libs/gegl/gegl-9999.ebuild | 125 +++++++++------------ |
| 19 |
5 files changed, 191 insertions(+), 142 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest |
| 22 |
index 3966857bd80..9a9f3f3851c 100644 |
| 23 |
--- a/media-libs/gegl/Manifest |
| 24 |
+++ b/media-libs/gegl/Manifest |
| 25 |
@@ -3,3 +3,4 @@ DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6c |
| 26 |
DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02 |
| 27 |
DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b |
| 28 |
DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27 |
| 29 |
+DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd |
| 30 |
|
| 31 |
diff --git a/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch |
| 32 |
new file mode 100644 |
| 33 |
index 00000000000..4be09057d89 |
| 34 |
--- /dev/null |
| 35 |
+++ b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch |
| 36 |
@@ -0,0 +1,43 @@ |
| 37 |
+From a1dd28e7e7c022c4e887006311c916fe5d9e4c0e Mon Sep 17 00:00:00 2001 |
| 38 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
| 39 |
+Date: Sun, 27 Oct 2019 21:55:03 +0100 |
| 40 |
+Subject: [PATCH] Drop failing tests |
| 41 |
+ |
| 42 |
+--- |
| 43 |
+ tests/compositions/meson.build | 2 ++ |
| 44 |
+ tests/python/meson.build | 2 -- |
| 45 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
| 46 |
+ |
| 47 |
+diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build |
| 48 |
+index 8699e7c..5e76e8c 100644 |
| 49 |
+--- a/tests/compositions/meson.build |
| 50 |
++++ b/tests/compositions/meson.build |
| 51 |
+@@ -87,6 +87,7 @@ test('compositions_with_opencl', |
| 52 |
+ ) |
| 53 |
+ endif |
| 54 |
+ |
| 55 |
++if false |
| 56 |
+ test('compositions_without_opencl', |
| 57 |
+ python, |
| 58 |
+ args: [ |
| 59 |
+@@ -100,3 +101,4 @@ test('compositions_without_opencl', |
| 60 |
+ suite: 'compositions', |
| 61 |
+ is_parallel: false, |
| 62 |
+ ) |
| 63 |
++endif |
| 64 |
+diff --git a/tests/python/meson.build b/tests/python/meson.build |
| 65 |
+index c6782e6..47a160b 100644 |
| 66 |
+--- a/tests/python/meson.build |
| 67 |
++++ b/tests/python/meson.build |
| 68 |
+@@ -2,8 +2,6 @@ |
| 69 |
+ testnames = [ |
| 70 |
+ 'gegl-buffer', |
| 71 |
+ 'gegl-color', |
| 72 |
+- 'gegl-format', |
| 73 |
+- 'gegl-node', |
| 74 |
+ 'gegl', |
| 75 |
+ ] |
| 76 |
+ |
| 77 |
+-- |
| 78 |
+2.23.0 |
| 79 |
+ |
| 80 |
|
| 81 |
diff --git a/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch |
| 82 |
new file mode 100644 |
| 83 |
index 00000000000..be4498ccee4 |
| 84 |
--- /dev/null |
| 85 |
+++ b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch |
| 86 |
@@ -0,0 +1,39 @@ |
| 87 |
+From eeecf286efb312709e43341eaadc64eb006bc6bf Mon Sep 17 00:00:00 2001 |
| 88 |
+From: Sebastian Pipping <sebastian@×××××××.org> |
| 89 |
+Date: Sun, 27 Oct 2019 22:05:58 +0100 |
| 90 |
+Subject: [PATCH] Add suffix "-0.4" to installed programs |
| 91 |
+ |
| 92 |
+--- |
| 93 |
+ bin/meson.build | 2 +- |
| 94 |
+ tools/meson.build | 2 +- |
| 95 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
| 96 |
+ |
| 97 |
+diff --git a/bin/meson.build b/bin/meson.build |
| 98 |
+index 4daf6cb..b77b692 100644 |
| 99 |
+--- a/bin/meson.build |
| 100 |
++++ b/bin/meson.build |
| 101 |
+@@ -42,7 +42,7 @@ if libspiro.found() |
| 102 |
+ gegl_deps += [ libspiro, ] |
| 103 |
+ endif |
| 104 |
+ |
| 105 |
+-gegl_bin = executable('gegl', |
| 106 |
++gegl_bin = executable('gegl-0.4', |
| 107 |
+ gegl_sources, |
| 108 |
+ include_directories: [ rootInclude, geglInclude, ], |
| 109 |
+ dependencies: gegl_deps, |
| 110 |
+diff --git a/tools/meson.build b/tools/meson.build |
| 111 |
+index 43c5495..c1b0d63 100644 |
| 112 |
+--- a/tools/meson.build |
| 113 |
++++ b/tools/meson.build |
| 114 |
+@@ -19,7 +19,7 @@ detect_opencl = executable( |
| 115 |
+ install: false, |
| 116 |
+ ) |
| 117 |
+ gegl_imgcmp = executable( |
| 118 |
+- 'gegl-imgcmp', |
| 119 |
++ 'gegl-imgcmp-0.4', |
| 120 |
+ 'gegl-imgcmp.c', |
| 121 |
+ include_directories: [ rootInclude, geglInclude, ], |
| 122 |
+ dependencies: [ tools_deps, ], |
| 123 |
+-- |
| 124 |
+2.23.0 |
| 125 |
+ |
| 126 |
|
| 127 |
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild |
| 128 |
similarity index 57% |
| 129 |
copy from media-libs/gegl/gegl-9999.ebuild |
| 130 |
copy to media-libs/gegl/gegl-0.4.18.ebuild |
| 131 |
index ec1e63cf3a0..9083a3b08f6 100644 |
| 132 |
--- a/media-libs/gegl/gegl-9999.ebuild |
| 133 |
+++ b/media-libs/gegl/gegl-0.4.18.ebuild |
| 134 |
@@ -2,20 +2,20 @@ |
| 135 |
# Distributed under the terms of the GNU General Public License v2 |
| 136 |
|
| 137 |
EAPI=7 |
| 138 |
-PYTHON_COMPAT=( python2_7 ) |
| 139 |
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 140 |
|
| 141 |
# vala and introspection support is broken, bug #468208 |
| 142 |
VALA_USE_DEPEND=vapigen |
| 143 |
|
| 144 |
-inherit autotools gnome2-utils python-any-r1 vala |
| 145 |
+inherit meson gnome2-utils python-any-r1 vala |
| 146 |
|
| 147 |
if [[ ${PV} == *9999* ]]; then |
| 148 |
inherit git-r3 |
| 149 |
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" |
| 150 |
SRC_URI="" |
| 151 |
else |
| 152 |
- SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" |
| 153 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 154 |
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" |
| 155 |
+ KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 156 |
fi |
| 157 |
|
| 158 |
DESCRIPTION="A graph based image processing framework" |
| 159 |
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/" |
| 160 |
LICENSE="|| ( GPL-3+ LGPL-3 )" |
| 161 |
SLOT="0.4" |
| 162 |
|
| 163 |
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib" |
| 164 |
+IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" |
| 165 |
REQUIRED_USE=" |
| 166 |
svg? ( cairo ) |
| 167 |
vala? ( introspection ) |
| 168 |
@@ -35,12 +35,13 @@ REQUIRED_USE=" |
| 169 |
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! |
| 170 |
RDEPEND=" |
| 171 |
>=dev-libs/glib-2.44:2 |
| 172 |
- dev-libs/json-glib |
| 173 |
- >=media-libs/babl-0.1.62 |
| 174 |
+ >=dev-libs/json-glib-1.2.6 |
| 175 |
+ >=media-libs/babl-0.1.72[introspection?] |
| 176 |
+ media-libs/libnsgif |
| 177 |
>=media-libs/libpng-1.6.0:0= |
| 178 |
virtual/jpeg:0= |
| 179 |
>=x11-libs/gdk-pixbuf-2.32:2 |
| 180 |
- x11-libs/pango |
| 181 |
+ >=x11-libs/pango-1.38.0 |
| 182 |
cairo? ( >=x11-libs/cairo-1.12.2 ) |
| 183 |
ffmpeg? ( |
| 184 |
libav? ( media-video/libav:0= ) |
| 185 |
@@ -49,7 +50,7 @@ RDEPEND=" |
| 186 |
introspection? ( >=dev-libs/gobject-introspection-1.32:= ) |
| 187 |
lcms? ( >=media-libs/lcms-2.8:2 ) |
| 188 |
lensfun? ( >=media-libs/lensfun-0.2.5 ) |
| 189 |
- openexr? ( >=media-libs/openexr-2.2.0:= ) |
| 190 |
+ openexr? ( >=media-libs/openexr-1.6.1:= ) |
| 191 |
pdf? ( >=app-text/poppler-0.71.0[cairo] ) |
| 192 |
raw? ( >=media-libs/libraw-0.15.4:0= ) |
| 193 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 194 |
@@ -58,7 +59,7 @@ RDEPEND=" |
| 195 |
umfpack? ( sci-libs/umfpack ) |
| 196 |
v4l? ( >=media-libs/libv4l-1.0.1 ) |
| 197 |
webp? ( >=media-libs/libwebp-0.5.0:= ) |
| 198 |
- zlib? ( >=sys-libs/zlib-1.2.0 ) |
| 199 |
+ >=sys-libs/zlib-1.2.0 |
| 200 |
" |
| 201 |
DEPEND="${RDEPEND} |
| 202 |
dev-lang/perl |
| 203 |
@@ -74,6 +75,13 @@ DEPEND="${RDEPEND} |
| 204 |
vala? ( $(vala_depend) ) |
| 205 |
" |
| 206 |
|
| 207 |
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) |
| 208 |
+ |
| 209 |
+PATCHES=( |
| 210 |
+ "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch |
| 211 |
+ "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch |
| 212 |
+) |
| 213 |
+ |
| 214 |
pkg_setup() { |
| 215 |
use test && use introspection && python-any-r1_pkg_setup |
| 216 |
} |
| 217 |
@@ -81,9 +89,6 @@ pkg_setup() { |
| 218 |
src_prepare() { |
| 219 |
default |
| 220 |
|
| 221 |
- # FIXME: the following should be proper patch sent to upstream |
| 222 |
- # fix OSX loadable module filename extension |
| 223 |
- sed -i -e 's/\.dylib/.bundle/' configure.ac || die |
| 224 |
# don't require Apple's OpenCL on versions of OSX that don't have it |
| 225 |
if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then |
| 226 |
sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die |
| 227 |
@@ -92,9 +97,7 @@ src_prepare() { |
| 228 |
# commit 7c78497b : tests that use gegl.png are broken on non-amd64 |
| 229 |
sed -e '/clones.xml/d' \ |
| 230 |
-e '/composite-transform.xml/d' \ |
| 231 |
- -i tests/compositions/Makefile.am || die |
| 232 |
- |
| 233 |
- eautoreconf |
| 234 |
+ -i tests/compositions/meson.build || die |
| 235 |
|
| 236 |
gnome2_environment_reset |
| 237 |
|
| 238 |
@@ -102,67 +105,47 @@ src_prepare() { |
| 239 |
} |
| 240 |
|
| 241 |
src_configure() { |
| 242 |
- local myeconfargs=( |
| 243 |
+ local emesonargs=( |
| 244 |
# disable documentation as the generating is bit automagic |
| 245 |
# if anyone wants to work on it just create bug with patch |
| 246 |
- --disable-docs |
| 247 |
- # never enable altering of CFLAGS via profile option |
| 248 |
- --disable-profile |
| 249 |
- --disable-silent-rules |
| 250 |
- # - Parameter --disable-workshop disables any use of Lua, effectivly |
| 251 |
- --disable-workshop |
| 252 |
- --program-suffix=-${SLOT} |
| 253 |
- --with-gdk-pixbuf |
| 254 |
- --with-pango |
| 255 |
+ -Ddocs=false |
| 256 |
+ # - Parameter -Dworkshop=false disables any use of Lua, effectivly |
| 257 |
+ -Dworkshop=false |
| 258 |
+ $(meson_use introspection) |
| 259 |
+ |
| 260 |
+ -Dexiv2=disabled |
| 261 |
+ -Dgdk-pixbuf=enabled |
| 262 |
+ -Dgexiv2=disabled |
| 263 |
# - There are two checks for dot, one controllable by --with(out)-graphviz |
| 264 |
# which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. |
| 265 |
- --without-graphviz |
| 266 |
+ -Dgraphviz=disabled |
| 267 |
+ -Djasper=disabled |
| 268 |
+ $(meson_feature lcms) |
| 269 |
+ $(meson_feature lensfun) |
| 270 |
+ $(meson_feature ffmpeg libav) |
| 271 |
+ -Dlibjpeg=enabled |
| 272 |
+ -Dlibpng=enabled |
| 273 |
+ $(meson_feature raw libraw) |
| 274 |
+ $(meson_feature svg librsvg) |
| 275 |
# libspiro: not in portage main tree |
| 276 |
- --without-libspiro |
| 277 |
- --without-lua |
| 278 |
- --without-mrg |
| 279 |
- $(use_enable cpu_flags_x86_mmx mmx) |
| 280 |
- $(use_enable cpu_flags_x86_sse sse) |
| 281 |
- $(use_enable debug) |
| 282 |
- $(use_enable introspection) |
| 283 |
- $(use_with cairo) |
| 284 |
- $(use_with cairo pangocairo) |
| 285 |
- $(use_with ffmpeg libavformat) |
| 286 |
- --without-jasper |
| 287 |
- $(use_with lcms) |
| 288 |
- $(use_with lensfun) |
| 289 |
- $(use_with openexr) |
| 290 |
- $(use_with pdf popplerglib) |
| 291 |
- $(use_with raw libraw) |
| 292 |
- $(use_with sdl) |
| 293 |
- $(use_with svg librsvg) |
| 294 |
- $(use_with tiff libtiff) |
| 295 |
- $(use_with umfpack) |
| 296 |
+ -Dlibspiro=disabled |
| 297 |
+ $(meson_feature tiff libtiff) |
| 298 |
# - v4l support does not work with our media-libs/libv4l-0.8.9, |
| 299 |
# upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 |
| 300 |
- $(use_with v4l libv4l) |
| 301 |
- $(use_with v4l libv4l2) |
| 302 |
- $(use_with vala) |
| 303 |
- $(use_with webp) |
| 304 |
- $(use_with zlib) |
| 305 |
+ $(meson_feature v4l libv4l) |
| 306 |
+ $(meson_feature v4l libv4l2) |
| 307 |
+ -Dlua=disabled |
| 308 |
+ -Dmrg=disabled |
| 309 |
+ $(meson_feature openexr) |
| 310 |
+ $(meson_feature cairo) |
| 311 |
+ -Dpango=enabled |
| 312 |
+ $(meson_feature cairo pangocairo) |
| 313 |
+ $(meson_feature introspection pygobject) |
| 314 |
+ $(meson_feature sdl sdl1) |
| 315 |
+ -Dsdl2=disabled |
| 316 |
+ $(meson_feature umfpack) |
| 317 |
+ $(meson_feature vala vapigen) |
| 318 |
+ $(meson_feature webp) |
| 319 |
) |
| 320 |
- |
| 321 |
- if use test; then |
| 322 |
- myeconfargs+=( $(use_with ffmpeg gexiv2) ) |
| 323 |
- else |
| 324 |
- myeconfargs+=( --without-gexiv2 ) |
| 325 |
- fi |
| 326 |
- |
| 327 |
- econf "${myeconfargs[@]}" |
| 328 |
-} |
| 329 |
- |
| 330 |
-src_compile() { |
| 331 |
- default |
| 332 |
- |
| 333 |
- [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." |
| 334 |
-} |
| 335 |
- |
| 336 |
-src_install() { |
| 337 |
- default |
| 338 |
- find "${ED}" -name '*.la' -delete || die |
| 339 |
+ meson_src_configure |
| 340 |
} |
| 341 |
|
| 342 |
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild |
| 343 |
index ec1e63cf3a0..9083a3b08f6 100644 |
| 344 |
--- a/media-libs/gegl/gegl-9999.ebuild |
| 345 |
+++ b/media-libs/gegl/gegl-9999.ebuild |
| 346 |
@@ -2,20 +2,20 @@ |
| 347 |
# Distributed under the terms of the GNU General Public License v2 |
| 348 |
|
| 349 |
EAPI=7 |
| 350 |
-PYTHON_COMPAT=( python2_7 ) |
| 351 |
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) |
| 352 |
|
| 353 |
# vala and introspection support is broken, bug #468208 |
| 354 |
VALA_USE_DEPEND=vapigen |
| 355 |
|
| 356 |
-inherit autotools gnome2-utils python-any-r1 vala |
| 357 |
+inherit meson gnome2-utils python-any-r1 vala |
| 358 |
|
| 359 |
if [[ ${PV} == *9999* ]]; then |
| 360 |
inherit git-r3 |
| 361 |
EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" |
| 362 |
SRC_URI="" |
| 363 |
else |
| 364 |
- SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" |
| 365 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 366 |
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" |
| 367 |
+ KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 368 |
fi |
| 369 |
|
| 370 |
DESCRIPTION="A graph based image processing framework" |
| 371 |
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/" |
| 372 |
LICENSE="|| ( GPL-3+ LGPL-3 )" |
| 373 |
SLOT="0.4" |
| 374 |
|
| 375 |
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib" |
| 376 |
+IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" |
| 377 |
REQUIRED_USE=" |
| 378 |
svg? ( cairo ) |
| 379 |
vala? ( introspection ) |
| 380 |
@@ -35,12 +35,13 @@ REQUIRED_USE=" |
| 381 |
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! |
| 382 |
RDEPEND=" |
| 383 |
>=dev-libs/glib-2.44:2 |
| 384 |
- dev-libs/json-glib |
| 385 |
- >=media-libs/babl-0.1.62 |
| 386 |
+ >=dev-libs/json-glib-1.2.6 |
| 387 |
+ >=media-libs/babl-0.1.72[introspection?] |
| 388 |
+ media-libs/libnsgif |
| 389 |
>=media-libs/libpng-1.6.0:0= |
| 390 |
virtual/jpeg:0= |
| 391 |
>=x11-libs/gdk-pixbuf-2.32:2 |
| 392 |
- x11-libs/pango |
| 393 |
+ >=x11-libs/pango-1.38.0 |
| 394 |
cairo? ( >=x11-libs/cairo-1.12.2 ) |
| 395 |
ffmpeg? ( |
| 396 |
libav? ( media-video/libav:0= ) |
| 397 |
@@ -49,7 +50,7 @@ RDEPEND=" |
| 398 |
introspection? ( >=dev-libs/gobject-introspection-1.32:= ) |
| 399 |
lcms? ( >=media-libs/lcms-2.8:2 ) |
| 400 |
lensfun? ( >=media-libs/lensfun-0.2.5 ) |
| 401 |
- openexr? ( >=media-libs/openexr-2.2.0:= ) |
| 402 |
+ openexr? ( >=media-libs/openexr-1.6.1:= ) |
| 403 |
pdf? ( >=app-text/poppler-0.71.0[cairo] ) |
| 404 |
raw? ( >=media-libs/libraw-0.15.4:0= ) |
| 405 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 406 |
@@ -58,7 +59,7 @@ RDEPEND=" |
| 407 |
umfpack? ( sci-libs/umfpack ) |
| 408 |
v4l? ( >=media-libs/libv4l-1.0.1 ) |
| 409 |
webp? ( >=media-libs/libwebp-0.5.0:= ) |
| 410 |
- zlib? ( >=sys-libs/zlib-1.2.0 ) |
| 411 |
+ >=sys-libs/zlib-1.2.0 |
| 412 |
" |
| 413 |
DEPEND="${RDEPEND} |
| 414 |
dev-lang/perl |
| 415 |
@@ -74,6 +75,13 @@ DEPEND="${RDEPEND} |
| 416 |
vala? ( $(vala_depend) ) |
| 417 |
" |
| 418 |
|
| 419 |
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) |
| 420 |
+ |
| 421 |
+PATCHES=( |
| 422 |
+ "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch |
| 423 |
+ "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch |
| 424 |
+) |
| 425 |
+ |
| 426 |
pkg_setup() { |
| 427 |
use test && use introspection && python-any-r1_pkg_setup |
| 428 |
} |
| 429 |
@@ -81,9 +89,6 @@ pkg_setup() { |
| 430 |
src_prepare() { |
| 431 |
default |
| 432 |
|
| 433 |
- # FIXME: the following should be proper patch sent to upstream |
| 434 |
- # fix OSX loadable module filename extension |
| 435 |
- sed -i -e 's/\.dylib/.bundle/' configure.ac || die |
| 436 |
# don't require Apple's OpenCL on versions of OSX that don't have it |
| 437 |
if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then |
| 438 |
sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die |
| 439 |
@@ -92,9 +97,7 @@ src_prepare() { |
| 440 |
# commit 7c78497b : tests that use gegl.png are broken on non-amd64 |
| 441 |
sed -e '/clones.xml/d' \ |
| 442 |
-e '/composite-transform.xml/d' \ |
| 443 |
- -i tests/compositions/Makefile.am || die |
| 444 |
- |
| 445 |
- eautoreconf |
| 446 |
+ -i tests/compositions/meson.build || die |
| 447 |
|
| 448 |
gnome2_environment_reset |
| 449 |
|
| 450 |
@@ -102,67 +105,47 @@ src_prepare() { |
| 451 |
} |
| 452 |
|
| 453 |
src_configure() { |
| 454 |
- local myeconfargs=( |
| 455 |
+ local emesonargs=( |
| 456 |
# disable documentation as the generating is bit automagic |
| 457 |
# if anyone wants to work on it just create bug with patch |
| 458 |
- --disable-docs |
| 459 |
- # never enable altering of CFLAGS via profile option |
| 460 |
- --disable-profile |
| 461 |
- --disable-silent-rules |
| 462 |
- # - Parameter --disable-workshop disables any use of Lua, effectivly |
| 463 |
- --disable-workshop |
| 464 |
- --program-suffix=-${SLOT} |
| 465 |
- --with-gdk-pixbuf |
| 466 |
- --with-pango |
| 467 |
+ -Ddocs=false |
| 468 |
+ # - Parameter -Dworkshop=false disables any use of Lua, effectivly |
| 469 |
+ -Dworkshop=false |
| 470 |
+ $(meson_use introspection) |
| 471 |
+ |
| 472 |
+ -Dexiv2=disabled |
| 473 |
+ -Dgdk-pixbuf=enabled |
| 474 |
+ -Dgexiv2=disabled |
| 475 |
# - There are two checks for dot, one controllable by --with(out)-graphviz |
| 476 |
# which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. |
| 477 |
- --without-graphviz |
| 478 |
+ -Dgraphviz=disabled |
| 479 |
+ -Djasper=disabled |
| 480 |
+ $(meson_feature lcms) |
| 481 |
+ $(meson_feature lensfun) |
| 482 |
+ $(meson_feature ffmpeg libav) |
| 483 |
+ -Dlibjpeg=enabled |
| 484 |
+ -Dlibpng=enabled |
| 485 |
+ $(meson_feature raw libraw) |
| 486 |
+ $(meson_feature svg librsvg) |
| 487 |
# libspiro: not in portage main tree |
| 488 |
- --without-libspiro |
| 489 |
- --without-lua |
| 490 |
- --without-mrg |
| 491 |
- $(use_enable cpu_flags_x86_mmx mmx) |
| 492 |
- $(use_enable cpu_flags_x86_sse sse) |
| 493 |
- $(use_enable debug) |
| 494 |
- $(use_enable introspection) |
| 495 |
- $(use_with cairo) |
| 496 |
- $(use_with cairo pangocairo) |
| 497 |
- $(use_with ffmpeg libavformat) |
| 498 |
- --without-jasper |
| 499 |
- $(use_with lcms) |
| 500 |
- $(use_with lensfun) |
| 501 |
- $(use_with openexr) |
| 502 |
- $(use_with pdf popplerglib) |
| 503 |
- $(use_with raw libraw) |
| 504 |
- $(use_with sdl) |
| 505 |
- $(use_with svg librsvg) |
| 506 |
- $(use_with tiff libtiff) |
| 507 |
- $(use_with umfpack) |
| 508 |
+ -Dlibspiro=disabled |
| 509 |
+ $(meson_feature tiff libtiff) |
| 510 |
# - v4l support does not work with our media-libs/libv4l-0.8.9, |
| 511 |
# upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 |
| 512 |
- $(use_with v4l libv4l) |
| 513 |
- $(use_with v4l libv4l2) |
| 514 |
- $(use_with vala) |
| 515 |
- $(use_with webp) |
| 516 |
- $(use_with zlib) |
| 517 |
+ $(meson_feature v4l libv4l) |
| 518 |
+ $(meson_feature v4l libv4l2) |
| 519 |
+ -Dlua=disabled |
| 520 |
+ -Dmrg=disabled |
| 521 |
+ $(meson_feature openexr) |
| 522 |
+ $(meson_feature cairo) |
| 523 |
+ -Dpango=enabled |
| 524 |
+ $(meson_feature cairo pangocairo) |
| 525 |
+ $(meson_feature introspection pygobject) |
| 526 |
+ $(meson_feature sdl sdl1) |
| 527 |
+ -Dsdl2=disabled |
| 528 |
+ $(meson_feature umfpack) |
| 529 |
+ $(meson_feature vala vapigen) |
| 530 |
+ $(meson_feature webp) |
| 531 |
) |
| 532 |
- |
| 533 |
- if use test; then |
| 534 |
- myeconfargs+=( $(use_with ffmpeg gexiv2) ) |
| 535 |
- else |
| 536 |
- myeconfargs+=( --without-gexiv2 ) |
| 537 |
- fi |
| 538 |
- |
| 539 |
- econf "${myeconfargs[@]}" |
| 540 |
-} |
| 541 |
- |
| 542 |
-src_compile() { |
| 543 |
- default |
| 544 |
- |
| 545 |
- [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." |
| 546 |
-} |
| 547 |
- |
| 548 |
-src_install() { |
| 549 |
- default |
| 550 |
- find "${ED}" -name '*.la' -delete || die |
| 551 |
+ meson_src_configure |
| 552 |
} |
Archives