From d4733e199ea249838392ac8e7e58878f50b6b6b1 Mon Sep 17 00:00:00 2001 From: Sergey Torokhov Date: Mon, 2 Dec 2019 00:40:03 +0300 Subject: [PATCH] media-libs/gegl: {0.4.18,9999} fix USE="introspection" dependencies USE="test ffmpeg" don't require media-libs/gexiv2 as there is internal test check of presence of this package in system while there is no USE flag to handle gexiv2 build option. USE="introspection" now handles oly the meson "introspection" option without switchon "pygobject" meson option (used now only for tests) so dev-python/pygobject:3 dependency is moved to DEPEND test?(). Dependencies and build options are sorted. pkg_setup() is removed as unesseccery. Closes: https://bugs.gentoo.org/699522 Signed-off-by: Sergey Torokhov Signed-off-by: Joonas Niilola --- media-libs/gegl/gegl-0.4.18.ebuild | 66 ++++++++++++++--------------- media-libs/gegl/gegl-9999.ebuild | 68 +++++++++++++++--------------- media-libs/gegl/metadata.xml | 9 +++- 3 files changed, 73 insertions(+), 70 deletions(-) diff --git a/media-libs/gegl/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild index 2ee30f33a600..24ffd8e23d7a 100644 --- a/media-libs/gegl/gegl-0.4.18.ebuild +++ b/media-libs/gegl/gegl-0.4.18.ebuild @@ -7,7 +7,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 +inherit meson gnome2-utils python-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -24,21 +24,27 @@ 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" +IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} svg? ( cairo ) + test? ( introspection ) vala? ( introspection ) " +RESTRICT="!test? ( test )" + # 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=" + ${PYTHON_DEPS} >=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= + >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 @@ -59,19 +65,16 @@ RDEPEND=" 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} + +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}]') - ) - ) + virtual/pkgconfig + test? ( >=dev-python/pygobject-3.2[${PYTHON_USEDEP}] ) vala? ( $(vala_depend) ) " @@ -83,10 +86,6 @@ PATCHES=( "${FILESDIR}"/${P}-meson_cpu_detection.patch ) -pkg_setup() { - use test && use introspection && python-any-r1_pkg_setup -} - src_prepare() { default @@ -107,13 +106,9 @@ src_prepare() { src_configure() { local emesonargs=( - # disable documentation as the generating is bit automagic + # - 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 @@ -121,32 +116,35 @@ src_configure() { # 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 + # - 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 + -Dsdl2=disabled + # - Parameter -Dworkshop=false disables any use of Lua, effectivly + -Dworkshop=false + $(meson_feature cairo) $(meson_feature cairo pangocairo) - $(meson_feature introspection pygobject) + $(meson_feature ffmpeg libav) + $(meson_feature lcms) + $(meson_feature lensfun) + $(meson_feature openexr) + $(meson_feature raw libraw) $(meson_feature sdl sdl1) - -Dsdl2=disabled + $(meson_feature svg librsvg) + $(meson_feature test pygobject) + $(meson_feature tiff libtiff) $(meson_feature umfpack) + # - 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) $(meson_feature vala vapigen) $(meson_feature webp) + $(meson_use introspection) ) meson_src_configure } diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index 015343c90de2..ea450170416a 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -7,7 +7,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 +inherit meson gnome2-utils python-r1 vala if [[ ${PV} == *9999* ]]; then inherit git-r3 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then 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" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" @@ -24,21 +24,27 @@ 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" +IUSE="cairo debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} svg? ( cairo ) + test? ( introspection ) vala? ( introspection ) " +RESTRICT="!test? ( test )" + # 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=" + ${PYTHON_DEPS} >=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= + >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 @@ -59,19 +65,16 @@ RDEPEND=" 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} + +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}]') - ) - ) + virtual/pkgconfig + test? ( >=dev-python/pygobject-3.2[${PYTHON_USEDEP}] ) vala? ( $(vala_depend) ) " @@ -82,10 +85,6 @@ PATCHES=( "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch ) -pkg_setup() { - use test && use introspection && python-any-r1_pkg_setup -} - src_prepare() { default @@ -106,13 +105,9 @@ src_prepare() { src_configure() { local emesonargs=( - # disable documentation as the generating is bit automagic + # - 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 @@ -120,32 +115,35 @@ src_configure() { # 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 + # - 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 + -Dsdl2=disabled + # - Parameter -Dworkshop=false disables any use of Lua, effectivly + -Dworkshop=false + $(meson_feature cairo) $(meson_feature cairo pangocairo) - $(meson_feature introspection pygobject) + $(meson_feature ffmpeg libav) + $(meson_feature lcms) + $(meson_feature lensfun) + $(meson_feature openexr) + $(meson_feature raw libraw) $(meson_feature sdl sdl1) - -Dsdl2=disabled + $(meson_feature svg librsvg) + $(meson_feature test pygobject) + $(meson_feature tiff libtiff) $(meson_feature umfpack) + # - 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) $(meson_feature vala vapigen) $(meson_feature webp) + $(meson_use introspection) ) meson_src_configure } diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml index edfb95da5b0c..3aa9cb9ab8d7 100644 --- a/media-libs/gegl/metadata.xml +++ b/media-libs/gegl/metadata.xml @@ -1,7 +1,14 @@ - + + torokhov-s-a@yandex.ru + Sergey Torokhov + + + proxy-maint@gentoo.org + Proxy Maintainers + Enable support for media-libs/lensfun. Enable sparse solving via sci-libs/umfpack. -- 2.26.2