commit: cd308a7a9a295111592cb697aff8aeb52308176a Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru> AuthorDate: Mon May 25 01:49:29 2020 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Thu Jun 25 08:07:42 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd308a7a
media-libs/babl: fix missed dependencies Fix missed lcms and gobject-introspection explicit dependencies Closes: https://bugs.gentoo.org/723474 Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../{babl-9999.ebuild => babl-0.1.66-r1.ebuild} | 47 ++++--- .../{babl-9999.ebuild => babl-0.1.74-r1.ebuild} | 5 +- media-libs/babl/babl-9999.ebuild | 5 +- media-libs/gegl/gegl-0.3.34-r1.ebuild | 2 +- .../{gegl-9999.ebuild => gegl-0.4.16-r1.ebuild} | 137 ++++++++++++--------- .../{gegl-9999.ebuild => gegl-0.4.18-r1.ebuild} | 22 ++-- .../{gegl-9999.ebuild => gegl-0.4.22-r1.ebuild} | 13 +- media-libs/gegl/gegl-9999.ebuild | 5 +- 8 files changed, 139 insertions(+), 97 deletions(-) diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-0.1.66-r1.ebuild similarity index 50% copy from media-libs/babl/babl-9999.ebuild copy to media-libs/babl/babl-0.1.66-r1.ebuild index e31e4dbc6a4..5f6ba2b9f66 100644 --- a/media-libs/babl/babl-9999.ebuild +++ b/media-libs/babl/babl-0.1.66-r1.ebuild @@ -3,14 +3,12 @@ EAPI=7 -inherit meson - if [[ ${PV} == *9999* ]]; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"; SRC_URI="" else - SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"; + SRC_URI="http://ftp.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" fi @@ -19,28 +17,37 @@ HOMEPAGE="http://www.gegl.org/babl/"; LICENSE="LGPL-3" SLOT="0" -IUSE="introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" +IUSE="altivec lcms cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c" -BDEPEND="virtual/pkgconfig" -RDEPEND="lcms? ( media-libs/lcms:2 )" +RDEPEND="lcms? ( >=media-libs/lcms-2.8:2 )" DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + [[ ${PV} == *9999* ]] && eautoreconf +} src_configure() { # Automagic rsvg support is just for website generation we do not call, # so we don't need to fix it # w3m is used for dist target thus no issue for us that it is automagically # detected - local emesonargs=( - -Dwith-docs=false - $(meson_use introspection enable-gir) - $(meson_use lcms with-lcms) - $(meson_use cpu_flags_x86_avx2 enable-avx2) - $(meson_use cpu_flags_x86_f16c enable-f16c) - $(meson_use cpu_flags_x86_mmx enable-mmx) - $(meson_use cpu_flags_x86_sse enable-sse) - $(meson_use cpu_flags_x86_sse2 enable-sse2) - $(meson_use cpu_flags_x86_sse3 enable-sse3) - $(meson_use cpu_flags_x86_sse4_1 enable-sse4_1) - ) - meson_src_configure + econf \ + --disable-docs \ + --disable-static \ + --disable-maintainer-mode \ + $(use_enable altivec) \ + $(use_enable cpu_flags_x86_f16c f16c) \ + $(use_enable cpu_flags_x86_mmx mmx) \ + $(use_enable cpu_flags_x86_sse sse) \ + $(use_enable cpu_flags_x86_sse2 sse2) \ + $(use_enable cpu_flags_x86_sse3 sse3) \ + $(use_enable cpu_flags_x86_sse4_1 sse4_1) \ + $(use_with lcms) +} + +src_install() { + default + find "${D}" -name '*.la' -type f -delete || die } diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-0.1.74-r1.ebuild similarity index 93% copy from media-libs/babl/babl-9999.ebuild copy to media-libs/babl/babl-0.1.74-r1.ebuild index e31e4dbc6a4..16fe9b5de13 100644 --- a/media-libs/babl/babl-9999.ebuild +++ b/media-libs/babl/babl-0.1.74-r1.ebuild @@ -22,7 +22,10 @@ SLOT="0" IUSE="introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" BDEPEND="virtual/pkgconfig" -RDEPEND="lcms? ( media-libs/lcms:2 )" +RDEPEND=" + introspection? ( >=dev-libs/gobject-introspection-1.32:= ) + lcms? ( >=media-libs/lcms-2.8:2 ) +" DEPEND="${RDEPEND}" src_configure() { diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild index e31e4dbc6a4..16fe9b5de13 100644 --- a/media-libs/babl/babl-9999.ebuild +++ b/media-libs/babl/babl-9999.ebuild @@ -22,7 +22,10 @@ SLOT="0" IUSE="introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1" BDEPEND="virtual/pkgconfig" -RDEPEND="lcms? ( media-libs/lcms:2 )" +RDEPEND=" + introspection? ( >=dev-libs/gobject-introspection-1.32:= ) + lcms? ( >=media-libs/lcms-2.8:2 ) +" DEPEND="${RDEPEND}" src_configure() { diff --git a/media-libs/gegl/gegl-0.3.34-r1.ebuild b/media-libs/gegl/gegl-0.3.34-r1.ebuild index 90f06bc1e08..8abaed16a8d 100644 --- a/media-libs/gegl/gegl-0.3.34-r1.ebuild +++ b/media-libs/gegl/gegl-0.3.34-r1.ebuild @@ -34,7 +34,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.44:2 dev-libs/json-glib - >=media-libs/babl-0.1.66 + >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.16-r1.ebuild similarity index 51% copy from media-libs/gegl/gegl-9999.ebuild copy to media-libs/gegl/gegl-0.4.16-r1.ebuild index e48fb86ed8f..26d642f8095 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-0.4.16-r1.ebuild @@ -2,20 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python2_7 ) -PYTHON_COMPAT=( python3_{6,7,8} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen -inherit meson gnome2-utils python-any-r1 vala +inherit autotools 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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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.bz2"; + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~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 debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp" +IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib" REQUIRED_USE=" svg? ( cairo ) test? ( introspection ) @@ -38,20 +38,18 @@ RESTRICT="!test? ( test )" # 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.74[introspection?] - media-libs/libnsgif + dev-libs/json-glib + >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] >=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 + x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( 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:= ) + openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) @@ -60,38 +58,35 @@ 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 ) " - DEPEND="${RDEPEND}" - BDEPEND=" dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig - test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') ) + test? ( ffmpeg? ( media-libs/gexiv2 ) + $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${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.3.12-failing-tests.patch" ) -python_check_deps() { - has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]" -} - pkg_setup() { - use test && python-any-r1_pkg_setup + use test && use introspection && python-any-r1_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 @@ -100,7 +95,9 @@ 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/meson.build || die + -i tests/compositions/Makefile.am || die + + eautoreconf gnome2_environment_reset @@ -108,46 +105,66 @@ src_prepare() { } src_configure() { - local emesonargs=( - # - Disable documentation as the generating is bit automagic + local myeconfargs=( + # disable documentation as the generating is bit automagic # if anyone wants to work on it just create bug with patch - -Ddocs=false - -Dexiv2=disabled - -Dgdk-pixbuf=enabled - -Dgexiv2=disabled + --disable-docs + # never enable altering of CFLAGS via profile option + --disable-profile + # - Parameter --disable-workshop disables any use of Lua, effectivly + --disable-workshop + --program-suffix=-${SLOT} + --with-gdk-pixbuf + --with-pango # - 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 - -Dlibjpeg=enabled - -Dlibpng=enabled - # - libspiro: not in portage main tree - -Dlibspiro=disabled - -Dlua=disabled - -Dmrg=disabled - -Dpango=enabled - -Dsdl2=disabled - # - Parameter -Dworkshop=false disables any use of Lua, effectivly - -Dworkshop=false - $(meson_feature cairo) - $(meson_feature cairo pangocairo) - $(meson_feature ffmpeg libav) - $(meson_feature lcms) - $(meson_feature lensfun) - $(meson_feature openexr) - $(meson_feature raw libraw) - $(meson_feature sdl sdl1) - $(meson_feature svg librsvg) - $(meson_feature test pygobject) - $(meson_feature tiff libtiff) - $(meson_feature umfpack) + --without-graphviz + # 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) # - 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) + $(use_with v4l libv4l) + $(use_with v4l libv4l2) + $(use_with vala) + $(use_with webp) + $(use_with zlib) ) - meson_src_configure + + 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 } diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.18-r1.ebuild similarity index 87% copy from media-libs/gegl/gegl-9999.ebuild copy to media-libs/gegl/gegl-0.4.18-r1.ebuild index e48fb86ed8f..cad3f9ebf9b 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-0.4.18-r1.ebuild @@ -2,8 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 +PYTHON_COMPAT=( python3_{6,7} ) -PYTHON_COMPAT=( python3_{6,7,8} ) # vala and introspection support is broken, bug #468208 VALA_USE_DEPEND=vapigen @@ -39,7 +39,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.74[introspection?] + >=media-libs/babl-0.1.72[introspection?,lcms?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 @@ -61,9 +61,9 @@ RDEPEND=" v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) " - -DEPEND="${RDEPEND}" - +DEPEND=" + ${RDEPEND} +" BDEPEND=" dev-lang/perl >=dev-util/gtk-doc-am-1 @@ -77,8 +77,10 @@ BDEPEND=" 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}"/${P}-drop-failing-tests.patch + "${FILESDIR}"/${P}-program-suffix.patch + "${FILESDIR}"/${P}-meson_cpu_detection.patch + "${FILESDIR}"/${P}-cltostring_force_utf8.patch ) python_check_deps() { @@ -102,6 +104,12 @@ src_prepare() { -e '/composite-transform.xml/d' \ -i tests/compositions/meson.build || die + # fix skipping mipmap tests due to executable not found + for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do + sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die + sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die + done + gnome2_environment_reset use vala && vala_src_prepare diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-0.4.22-r1.ebuild similarity index 88% copy from media-libs/gegl/gegl-9999.ebuild copy to media-libs/gegl/gegl-0.4.22-r1.ebuild index e48fb86ed8f..f7d5f9dbbd4 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-0.4.22-r1.ebuild @@ -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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" @@ -39,7 +39,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.74[introspection?] + >=media-libs/babl-0.1.74[introspection?,lcms?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 @@ -61,9 +61,7 @@ RDEPEND=" v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) " - DEPEND="${RDEPEND}" - BDEPEND=" dev-lang/perl >=dev-util/gtk-doc-am-1 @@ -102,6 +100,12 @@ src_prepare() { -e '/composite-transform.xml/d' \ -i tests/compositions/meson.build || die + # fix skipping mipmap tests due to executable not found + for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do + sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die + sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die + done + gnome2_environment_reset use vala && vala_src_prepare @@ -135,6 +139,7 @@ src_configure() { $(meson_feature lcms) $(meson_feature lensfun) $(meson_feature openexr) + $(meson_feature pdf poppler) $(meson_feature raw libraw) $(meson_feature sdl sdl1) $(meson_feature svg librsvg) diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild index e48fb86ed8f..7b1deef5bdb 100644 --- a/media-libs/gegl/gegl-9999.ebuild +++ b/media-libs/gegl/gegl-9999.ebuild @@ -39,7 +39,7 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 - >=media-libs/babl-0.1.74[introspection?] + >=media-libs/babl-0.1.74[introspection?,lcms?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 @@ -61,9 +61,7 @@ RDEPEND=" v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) " - DEPEND="${RDEPEND}" - BDEPEND=" dev-lang/perl >=dev-util/gtk-doc-am-1 @@ -135,6 +133,7 @@ src_configure() { $(meson_feature lcms) $(meson_feature lensfun) $(meson_feature openexr) + $(meson_feature pdf poppler) $(meson_feature raw libraw) $(meson_feature sdl sdl1) $(meson_feature svg librsvg)
