From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- media-libs/gegl/Manifest | 11 +- media-libs/gegl/files/gegl-0.4.18-arch.patch | 11 ++ .../files/gegl-0.4.18-drop-failing-tests.patch | 43 ++++++ .../gegl/files/gegl-0.4.18-program-suffix.patch | 39 ++++++ media-libs/gegl/gegl-0.4.16.ebuild | 2 +- media-libs/gegl/gegl-0.4.18.ebuild | 152 +++++++++++++++++++++ media-libs/gegl/gegl-9999.ebuild | 125 ++++++++--------- media-libs/gegl/metadata.xml | 4 +- 8 files changed, 309 insertions(+), 78 deletions(-) create mode 100644 media-libs/gegl/files/gegl-0.4.18-arch.patch create mode 100644 media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch create mode 100644 media-libs/gegl/files/gegl-0.4.18-program-suffix.patch create mode 100644 media-libs/gegl/gegl-0.4.18.ebuild (limited to 'media-libs/gegl') diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index 2dcfeaa977e5..015d3df5d65a 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -11,16 +11,21 @@ AUX gegl-0.2.0-underlinking.patch 1638 BLAKE2B c8118a47b9d83d9737a2ec1deb25d23b9 AUX gegl-0.3.12-failing-tests.patch 888 BLAKE2B 548933991347ac397b98ac044d5524d0ae8e5307d52e8b48eb0168d30eda8b73350cec57bc5233abde708184c152ee94ec5c2b3213161ffff93b2a6494a2d36f SHA512 a7b8f58ff9057e086412ec5b12694ffc4e30e2a7b3a8bfa72ef34bc230d0d91c80aa45de94f8e48496844c96e257cee6d3791db0e520abc7cbcc2691d1a5ce84 AUX gegl-0.4.0-ffmpeg-4-0-compat-1.patch 2181 BLAKE2B 8bf1c46395ee4981fad7c5518c9091043374b54c9c4a684e6decc376e8b57e2a60b7ff5c5b21e07f24d7835f92f62a7aebf976122391d206450cc1d5a52bcb30 SHA512 1edf86549a0a91b7e66ad1b59373b141c20e7f63fff981aaa5a0ba535b38e89b593c60a4a4573cf6fa723181cb38a10c6ac4a0838fc947bb54713a3bde299e4f AUX gegl-0.4.0-ffmpeg-4-0-compat-2.patch 786 BLAKE2B c2ee0da954aa16c755f76058c54ca9d19ceb70667aff40e126d52bb10b7ecaa6e346667fa9cf7f96605b87a1d41e511d4787a33b004409708d8e3496de391745 SHA512 1084d1cd802eebdeacc536115d4808ce310a85063110bfc06627c8836b86e65396d175a4c3bc6b2083a9a486b7fb21d0210e42fcc8ef3c404b6b930797ecc83a +AUX gegl-0.4.18-arch.patch 282 BLAKE2B 110c1bfec14a27c1d5fab8021673ee981769f4ad301bf5fe5bfa23bd95fee5610765e4e0e491d05a84586457612e7014202642e86ad6cfb71ca5091060679c5f SHA512 85244dc8747c52ed7135bceef3f12cb9c27dc9f801aa564d80feb0705972b782ce153e762648ebe777abfe42e8e0be079a88f34c1ae38f8fc195350d8e9cdafd +AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5 +AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417 DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8 DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6cdf39dae4374d2749823f3a1af62995382a1247427dde1921e0b11304adb800a2157ca6e7e773fdd97fee47f5 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6 DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02 DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27 +DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd EBUILD gegl-0.2.0-r2.ebuild 4703 BLAKE2B e9dcbc55e332b3484435f1739b305f672f1af489c2b7bae9801529b765c8f12feabef63d64f828c059bc3510b792a6f5a2561c1517e79c6819860dfd7ec3a87d SHA512 443632d54bb065e465e9ff2b3b693cac33c49d4c6c9d14dbb4c45b1fade07adf79cac3841d1b63120912e6cc863e5f7eae9403c71bac3c973e4fca980fb1bbf9 EBUILD gegl-0.2.0-r6.ebuild 4965 BLAKE2B 12066b7a2edc729653570a433bad8993d30dc24cd820ae24c6b3bc4f734f79a1206f29f3a1190883f094ed46c5516e6d976005cde91ff6050c90dcb90ede0216 SHA512 72bf6368f6e046a591956f65d249331d539902e6cba90c12e2f8939ec6910c869d1638f918820c68d92bbc8e0d1b7e72543a908cf4dbc6626cf78c7556f69285 EBUILD gegl-0.3.0.ebuild 5228 BLAKE2B 04a228c189e9fdf2619cfc1467eae37ecd01ef35ad8c9a1a87c0e7a93a9e493c0aad4dbf2a7a8053bb47dbd6965f41c3ab032171c013ebca6405f543abcb0f12 SHA512 7cac050e006f38082e3093b3553774d70837ed632bfed6a5f2f1dd97297e8dc603256ec967e8fd898a0dfd0108ea23773e1f0d516c08f4b371b16b3a02cd427d EBUILD gegl-0.3.34.ebuild 5295 BLAKE2B f468df5f492a5cb4079ab021d10833a6d75ab97c28bb03a8091df0bb80f284171fe04476e522632264a795ae4f198d7a69d412eb378d25225b7f345a5bfd013b SHA512 376186430d951aced6ef210eee6f7ff7dc8f7f1fb7087083bb86ee6b12d46170df6293db136acfb3f696348b33e84c2657d0679f968b1dbca79291a232d6e1b0 EBUILD gegl-0.4.14.ebuild 4963 BLAKE2B 155fd64e71878d62960a1beaf50b8e2b4fec41a8884b916319b498adc6393449d41f6a2fbff128e68eebcf688046bcca540c9e10382f805e8df536d28fa04244 SHA512 ed2796b93ef55352f51a8eace6ccb97e5352a203d6fa33d178307c0f215279d337efabd9aa2c0d41faa6757c5a0f34dda1f1907eced0712979413d03980b9de0 -EBUILD gegl-0.4.16.ebuild 4850 BLAKE2B 66b4108f521bc2e40f1789802ea618eab0dab0addae3dfdddd39b1b5b1d9fd845bd28df7e1d9d1bce7c45773a9e93b695cdaf6dd9b456da3e47de6f63278998c SHA512 c4bb2821ffcdddd8d8a42b11018e25873b622719eb94c0e8f12a949d1836d4921bc63817a6431f4a51655485021bdfaa24b09f0993c37feff954d3d961c4aca6 -EBUILD gegl-9999.ebuild 4789 BLAKE2B cdff77d21246229c50e307138c9de6883cdc801625fa65eeb57cbae2ea911c8b98c339f580e7dcc7787bb132b935a536b100399712bd392e0d3be6b14b2371e6 SHA512 948cf9c4eb70b506d6990f30d4c4a6aef8c030be937dfd4adc9c12ebb6f3ae42896d53d75415c4bb3d921543d016c850bf40da6c06d66e9fc7e60281ab0aaa1b -MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a +EBUILD gegl-0.4.16.ebuild 4849 BLAKE2B 0ddc711066dc3430b2dfdd3f97edf9accca4feda969ed3534a9f5ce62e8470780f6cb488582b3d7c18edb9d3888df234ef0aeac218a5be08ed5d1182ca4aa1ba SHA512 2bec113e795760a92f09b481f5220fa3b2db96fb3239fb7d3b7db83e5f06319f9ffd9220d0ef509c5cf4fa77315e9600521a7beb63d069e27b0c6726f3aca967 +EBUILD gegl-0.4.18.ebuild 4416 BLAKE2B 117874fa6d9abc38104b93e73e7a225b21b647a52fc78c0599adfb77a4645adf3cfa6fb254880c42a523e3a121a71bdeb3c3ca13cc5dac7b2650e32383686d71 SHA512 c1fcfba56c0cdb9aa500886017d45bececbea9d2ac2f808bd52ec75399de11b8918283525c48516fdc0e37977e9368d03d1f52aea215efa25b624acc123f9fe6 +EBUILD gegl-9999.ebuild 4377 BLAKE2B 340ec7416904d1273b193b5449ea97b1104121ae0f6c2b11d39f92bc77adfe231b06101307af8948925c952bbb6db67958b54f68dbf25d775019b09ce66e2608 SHA512 0bfed5bf968d6d7bd5b111a8fd7f51ee27a9c500a5fd49ec40242558fe0c98c42387c28f8259ea7b5bede089b08553e5f16e26bbb4ecb69feedaf46c2dc43173 +MISC metadata.xml 347 BLAKE2B 3cf9993960788f9caef109afbc99045affa49f771e4b5c1afc8d7f1ad438eaa3ffaf062e6c3056f8228ea4d745a807517875bc82ae13a8f2dc776f7bee01f465 SHA512 c893f262197b33a5ce7c4df6da4f0b761bae4a12082b1f263ed3878eadb388a4c785a1117033d52854a7bbcc102f505946f6e7bfb7449126634d8730ef7d61b2 diff --git a/media-libs/gegl/files/gegl-0.4.18-arch.patch b/media-libs/gegl/files/gegl-0.4.18-arch.patch new file mode 100644 index 000000000000..57bfaf4a6c73 --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.18-arch.patch @@ -0,0 +1,11 @@ +--- a/meson.build ++++ b/meson.build +@@ -88,8 +88,6 @@ + have_ppc = true + config.set10('ARCH_PPC', true) + config.set10('ARCH_PPC64', true) +-else +- error('Unknown host architecture') + endif + + ################################################################################ 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 new file mode 100644 index 000000000000..4be09057d896 --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch @@ -0,0 +1,43 @@ +From a1dd28e7e7c022c4e887006311c916fe5d9e4c0e Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Sun, 27 Oct 2019 21:55:03 +0100 +Subject: [PATCH] Drop failing tests + +--- + tests/compositions/meson.build | 2 ++ + tests/python/meson.build | 2 -- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/compositions/meson.build b/tests/compositions/meson.build +index 8699e7c..5e76e8c 100644 +--- a/tests/compositions/meson.build ++++ b/tests/compositions/meson.build +@@ -87,6 +87,7 @@ test('compositions_with_opencl', + ) + endif + ++if false + test('compositions_without_opencl', + python, + args: [ +@@ -100,3 +101,4 @@ test('compositions_without_opencl', + suite: 'compositions', + is_parallel: false, + ) ++endif +diff --git a/tests/python/meson.build b/tests/python/meson.build +index c6782e6..47a160b 100644 +--- a/tests/python/meson.build ++++ b/tests/python/meson.build +@@ -2,8 +2,6 @@ + testnames = [ + 'gegl-buffer', + 'gegl-color', +- 'gegl-format', +- 'gegl-node', + 'gegl', + ] + +-- +2.23.0 + 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 new file mode 100644 index 000000000000..be4498ccee4a --- /dev/null +++ b/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch @@ -0,0 +1,39 @@ +From eeecf286efb312709e43341eaadc64eb006bc6bf Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +Date: Sun, 27 Oct 2019 22:05:58 +0100 +Subject: [PATCH] Add suffix "-0.4" to installed programs + +--- + bin/meson.build | 2 +- + tools/meson.build | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/bin/meson.build b/bin/meson.build +index 4daf6cb..b77b692 100644 +--- a/bin/meson.build ++++ b/bin/meson.build +@@ -42,7 +42,7 @@ if libspiro.found() + gegl_deps += [ libspiro, ] + endif + +-gegl_bin = executable('gegl', ++gegl_bin = executable('gegl-0.4', + gegl_sources, + include_directories: [ rootInclude, geglInclude, ], + dependencies: gegl_deps, +diff --git a/tools/meson.build b/tools/meson.build +index 43c5495..c1b0d63 100644 +--- a/tools/meson.build ++++ b/tools/meson.build +@@ -19,7 +19,7 @@ detect_opencl = executable( + install: false, + ) + gegl_imgcmp = executable( +- 'gegl-imgcmp', ++ 'gegl-imgcmp-0.4', + 'gegl-imgcmp.c', + include_directories: [ rootInclude, geglInclude, ], + dependencies: [ tools_deps, ], +-- +2.23.0 + diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild index 12651446e600..c76de89fa31b 100644 --- a/media-libs/gegl/gegl-0.4.16.ebuild +++ b/media-libs/gegl/gegl-0.4.16.ebuild @@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/" LICENSE="|| ( GPL-3+ LGPL-3 )" SLOT="0.4" -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" +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" REQUIRED_USE=" svg? ( cairo ) vala? ( introspection ) diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild new file mode 100644 index 000000000000..7de01528fc40 --- /dev/null +++ b/media-libs/gegl/gegl-0.4.18.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) + +# vala and introspection support is broken, bug #468208 +VALA_USE_DEPEND=vapigen + +inherit meson gnome2-utils python-any-r1 vala + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" + SRC_URI="" +else + SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +fi + +DESCRIPTION="A graph based image processing framework" +HOMEPAGE="http://www.gegl.org/" + +LICENSE="|| ( GPL-3+ LGPL-3 )" +SLOT="0.4" + +IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" +REQUIRED_USE=" + svg? ( cairo ) + vala? ( introspection ) +" + +# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE +# so there is no chance to support libav right now (Gentoo bug #567638) +# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! +RDEPEND=" + >=dev-libs/glib-2.44:2 + >=dev-libs/json-glib-1.2.6 + >=media-libs/babl-0.1.72[introspection?] + media-libs/libnsgif + >=media-libs/libpng-1.6.0:0= + virtual/jpeg:0= + >=x11-libs/gdk-pixbuf-2.32:2 + >=x11-libs/pango-1.38.0 + cairo? ( >=x11-libs/cairo-1.12.2 ) + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) + ) + introspection? ( >=dev-libs/gobject-introspection-1.32:= ) + lcms? ( >=media-libs/lcms-2.8:2 ) + lensfun? ( >=media-libs/lensfun-0.2.5 ) + openexr? ( >=media-libs/openexr-1.6.1:= ) + pdf? ( >=app-text/poppler-0.71.0[cairo] ) + raw? ( >=media-libs/libraw-0.15.4:0= ) + sdl? ( >=media-libs/libsdl-1.2.0 ) + svg? ( >=gnome-base/librsvg-2.40.6:2 ) + tiff? ( >=media-libs/tiff-4:0 ) + umfpack? ( sci-libs/umfpack ) + v4l? ( >=media-libs/libv4l-1.0.1 ) + webp? ( >=media-libs/libwebp-0.5.0:= ) + >=sys-libs/zlib-1.2.0 +" +DEPEND="${RDEPEND} + dev-lang/perl + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + >=sys-devel/libtool-2.2 + test? ( ffmpeg? ( media-libs/gexiv2 ) + introspection? ( + $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') + ) + ) + vala? ( $(vala_depend) ) +" + +DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch + "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch + "${FILESDIR}"/${PN}-0.4.18-arch.patch +) + +pkg_setup() { + use test && use introspection && python-any-r1_pkg_setup +} + +src_prepare() { + default + + # don't require Apple's OpenCL on versions of OSX that don't have it + if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then + sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die + fi + + # commit 7c78497b : tests that use gegl.png are broken on non-amd64 + sed -e '/clones.xml/d' \ + -e '/composite-transform.xml/d' \ + -i tests/compositions/meson.build || die + + gnome2_environment_reset + + use vala && vala_src_prepare +} + +src_configure() { + local emesonargs=( + # disable documentation as the generating is bit automagic + # if anyone wants to work on it just create bug with patch + -Ddocs=false + # - Parameter -Dworkshop=false disables any use of Lua, effectivly + -Dworkshop=false + $(meson_use introspection) + + -Dexiv2=disabled + -Dgdk-pixbuf=enabled + -Dgexiv2=disabled + # - There are two checks for dot, one controllable by --with(out)-graphviz + # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. + -Dgraphviz=disabled + -Djasper=disabled + $(meson_feature lcms) + $(meson_feature lensfun) + $(meson_feature ffmpeg libav) + -Dlibjpeg=enabled + -Dlibpng=enabled + $(meson_feature raw libraw) + $(meson_feature svg librsvg) + # libspiro: not in portage main tree + -Dlibspiro=disabled + $(meson_feature tiff libtiff) + # - v4l support does not work with our media-libs/libv4l-0.8.9, + # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 + $(meson_feature v4l libv4l) + $(meson_feature v4l libv4l2) + -Dlua=disabled + -Dmrg=disabled + $(meson_feature openexr) + $(meson_feature cairo) + -Dpango=enabled + $(meson_feature cairo pangocairo) + $(meson_feature introspection pygobject) + $(meson_feature sdl sdl1) + -Dsdl2=disabled + $(meson_feature umfpack) + $(meson_feature vala vapigen) + $(meson_feature webp) + ) + meson_src_configure +} diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index ec1e63cf3a00..015343c90de2 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -2,20 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit autotools gnome2-utils python-any-r1 vala +inherit meson gnome2-utils python-any-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git" SRC_URI="" else - SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - 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" + SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" @@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/" LICENSE="|| ( GPL-3+ LGPL-3 )" SLOT="0.4" -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" +IUSE="cairo debug ffmpeg introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" REQUIRED_USE=" svg? ( cairo ) vala? ( introspection ) @@ -35,12 +35,13 @@ REQUIRED_USE=" # If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks! RDEPEND=" >=dev-libs/glib-2.44:2 - dev-libs/json-glib - >=media-libs/babl-0.1.62 + >=dev-libs/json-glib-1.2.6 + >=media-libs/babl-0.1.72[introspection?] + media-libs/libnsgif >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 - x11-libs/pango + >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( libav? ( media-video/libav:0= ) @@ -49,7 +50,7 @@ RDEPEND=" introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) - openexr? ( >=media-libs/openexr-2.2.0:= ) + openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) @@ -58,7 +59,7 @@ RDEPEND=" umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) - zlib? ( >=sys-libs/zlib-1.2.0 ) + >=sys-libs/zlib-1.2.0 " DEPEND="${RDEPEND} dev-lang/perl @@ -74,6 +75,13 @@ DEPEND="${RDEPEND} vala? ( $(vala_depend) ) " +DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch + "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch +) + pkg_setup() { use test && use introspection && python-any-r1_pkg_setup } @@ -81,9 +89,6 @@ pkg_setup() { src_prepare() { default - # FIXME: the following should be proper patch sent to upstream - # fix OSX loadable module filename extension - sed -i -e 's/\.dylib/.bundle/' configure.ac || die # don't require Apple's OpenCL on versions of OSX that don't have it if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die @@ -92,9 +97,7 @@ src_prepare() { # commit 7c78497b : tests that use gegl.png are broken on non-amd64 sed -e '/clones.xml/d' \ -e '/composite-transform.xml/d' \ - -i tests/compositions/Makefile.am || die - - eautoreconf + -i tests/compositions/meson.build || die gnome2_environment_reset @@ -102,67 +105,47 @@ src_prepare() { } src_configure() { - local myeconfargs=( + local emesonargs=( # disable documentation as the generating is bit automagic # if anyone wants to work on it just create bug with patch - --disable-docs - # never enable altering of CFLAGS via profile option - --disable-profile - --disable-silent-rules - # - Parameter --disable-workshop disables any use of Lua, effectivly - --disable-workshop - --program-suffix=-${SLOT} - --with-gdk-pixbuf - --with-pango + -Ddocs=false + # - Parameter -Dworkshop=false disables any use of Lua, effectivly + -Dworkshop=false + $(meson_use introspection) + + -Dexiv2=disabled + -Dgdk-pixbuf=enabled + -Dgexiv2=disabled # - There are two checks for dot, one controllable by --with(out)-graphviz # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes. - --without-graphviz + -Dgraphviz=disabled + -Djasper=disabled + $(meson_feature lcms) + $(meson_feature lensfun) + $(meson_feature ffmpeg libav) + -Dlibjpeg=enabled + -Dlibpng=enabled + $(meson_feature raw libraw) + $(meson_feature svg librsvg) # libspiro: not in portage main tree - --without-libspiro - --without-lua - --without-mrg - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable debug) - $(use_enable introspection) - $(use_with cairo) - $(use_with cairo pangocairo) - $(use_with ffmpeg libavformat) - --without-jasper - $(use_with lcms) - $(use_with lensfun) - $(use_with openexr) - $(use_with pdf popplerglib) - $(use_with raw libraw) - $(use_with sdl) - $(use_with svg librsvg) - $(use_with tiff libtiff) - $(use_with umfpack) + -Dlibspiro=disabled + $(meson_feature tiff libtiff) # - v4l support does not work with our media-libs/libv4l-0.8.9, # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675 - $(use_with v4l libv4l) - $(use_with v4l libv4l2) - $(use_with vala) - $(use_with webp) - $(use_with zlib) + $(meson_feature v4l libv4l) + $(meson_feature v4l libv4l2) + -Dlua=disabled + -Dmrg=disabled + $(meson_feature openexr) + $(meson_feature cairo) + -Dpango=enabled + $(meson_feature cairo pangocairo) + $(meson_feature introspection pygobject) + $(meson_feature sdl sdl1) + -Dsdl2=disabled + $(meson_feature umfpack) + $(meson_feature vala vapigen) + $(meson_feature webp) ) - - if use test; then - myeconfargs+=( $(use_with ffmpeg gexiv2) ) - else - myeconfargs+=( --without-gexiv2 ) - fi - - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped." -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die + meson_src_configure } diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml index dd62df7fdb4d..edfb95da5b0c 100644 --- a/media-libs/gegl/metadata.xml +++ b/media-libs/gegl/metadata.xml @@ -1,9 +1,7 @@ - - sping@gentoo.org - + Enable support for media-libs/lensfun. Enable sparse solving via sci-libs/umfpack. -- cgit v1.2.3