public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/
Date: Thu, 11 Mar 2021 09:08:07 +0000 (UTC)	[thread overview]
Message-ID: <1615453654.e965ae13739d801437dbc4e70dd01f61c52fa968.juippis@gentoo> (raw)

commit:     e965ae13739d801437dbc4e70dd01f61c52fa968
Author:     Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Wed Mar 10 22:09:05 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 09:07:34 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e965ae13

media-libs/gegl: update live ebuild

libpng, libjpeg, exiv2 options now are disabled in meson.build
i.e. png and jpeg libraries are always required.

Closes: https://bugs.gentoo.org/774756

Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/19875
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-libs/gegl/gegl-9999.ebuild | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 2dded5def55..c0ed1b98aea 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..9} )
 VALA_USE_DEPEND=vapigen
 
 inherit meson gnome2-utils python-any-r1 vala
@@ -62,6 +62,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	${PYTHON_DEPS}
 	dev-lang/perl
 	>=dev-util/gtk-doc-am-1
 	>=sys-devel/gettext-0.19.8
@@ -73,21 +74,20 @@ 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
-)
-
 python_check_deps() {
+	use test || return 0
 	has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
 }
 
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
 src_prepare() {
 	default
+	# patch executables suffix
+	sed -i -e "s/'gegl'/'gegl-0.4'/" bin/meson.build || die
+	sed -i -e "s/'gegl-imgcmp'/'gegl-imgcmp-0.4'/" tools/meson.build || die
+	sed -i -e "s/gegl-imgcmp/gegl-imgcmp-0.4/" tests/simple/test-exp-combine.sh || die
+	# skip UNEXPECTED PASSED 'matting-levin' test
+	sed -i -e "s/composition_tests += 'matting-levin'//" \
+		-e "s/composition_tests_fail += 'matting-levin'//" tests/compositions/meson.build || die
 
 	# don't require Apple's OpenCL on versions of OSX that don't have it
 	if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
@@ -111,13 +111,10 @@ src_configure() {
 		-Ddocs=false
 		-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
-		-Dlibjpeg=enabled
-		-Dlibpng=enabled
 		#  - libspiro: not in portage main tree
 		-Dlibspiro=disabled
 		-Dlua=disabled


             reply	other threads:[~2021-03-11  9:08 UTC|newest]

Thread overview: 191+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-11  9:08 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-21 20:59 [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/ Sam James
2025-05-14  3:01 Sam James
2025-04-24 23:45 Sam James
2025-04-24 23:45 Sam James
2025-04-22  0:36 Sam James
2025-04-03 20:57 Sam James
2025-04-03 20:57 Sam James
2025-03-18 19:23 Sam James
2025-02-28 13:02 Sam James
2024-12-30 23:41 Sam James
2024-12-27 11:18 Andreas Sturmlechner
2024-12-01 11:54 Sam James
2024-11-08 13:27 Joonas Niilola
2024-11-08 13:27 Joonas Niilola
2024-09-25 13:59 Joonas Niilola
2024-09-25 13:58 Joonas Niilola
2024-04-14  0:43 Sam James
2024-03-21  2:50 Sam James
2023-12-08  8:46 Arthur Zamarin
2023-12-08  8:41 Arthur Zamarin
2023-08-20  7:16 Joonas Niilola
2023-08-20  7:16 Joonas Niilola
2023-06-28  6:59 Sam James
2023-05-05 13:37 Arthur Zamarin
2023-05-05 13:36 Arthur Zamarin
2023-05-05 12:58 Arthur Zamarin
2023-05-05 10:28 Arthur Zamarin
2023-04-16  0:24 Sam James
2023-02-26 21:23 Sam James
2023-02-24 19:09 Joonas Niilola
2023-02-24 19:09 Joonas Niilola
2023-01-25 17:48 Andreas Sturmlechner
2022-12-23  8:21 Sam James
2022-12-23  8:03 Sam James
2022-12-16  4:30 Sam James
2022-12-01  3:21 WANG Xuerui
2022-11-25  7:52 Sam James
2022-11-21 19:16 Arthur Zamarin
2022-11-21 19:16 Arthur Zamarin
2022-11-07  9:34 Joonas Niilola
2022-11-07  9:15 Joonas Niilola
2022-08-31 22:26 Sam James
2022-07-11 22:50 John Helmert III
2022-07-10 19:13 Sam James
2022-07-09 10:23 Arthur Zamarin
2022-07-09 10:23 Arthur Zamarin
2022-07-09 10:23 Arthur Zamarin
2022-03-01  0:02 Sam James
2022-03-01  0:01 Sam James
2022-02-28 23:56 Sam James
2022-02-27 13:54 Jakov Smolić
2022-02-26 12:08 David Seifert
2022-02-26 11:54 David Seifert
2022-02-26  2:16 Sam James
2022-02-26  2:16 Sam James
2022-02-18 22:58 Sam James
2021-12-24  4:45 Sam James
2021-11-16  2:53 Sam James
2021-10-29 16:05 Sam James
2021-10-29 11:16 Sam James
2021-10-23 13:51 Sam James
2021-09-08  6:38 Sam James
2021-06-09 21:34 Sam James
2021-04-16  5:40 Joonas Niilola
2021-04-11  8:09 Joonas Niilola
2021-04-11  8:09 Joonas Niilola
2021-04-11  8:09 Joonas Niilola
2021-02-21 10:19 Andreas Sturmlechner
2021-02-19 17:17 Sam James
2021-02-19 12:11 Sam James
2021-02-18 22:19 Sam James
2021-02-18 21:01 Sam James
2020-12-29  1:54 Sam James
2020-12-29  1:54 Sam James
2020-11-08 12:02 Sam James
2020-11-05  3:38 Georgy Yakovlev
2020-11-05  2:36 Georgy Yakovlev
2020-11-04 13:40 Joonas Niilola
2020-11-04 12:42 Mikle Kolyada
2020-10-31 11:20 Mikle Kolyada
2020-10-20 12:54 Joonas Niilola
2020-10-08  3:07 Sam James
2020-09-23  4:06 Sam James
2020-09-20 22:40 Thomas Deutschmann
2020-07-23  5:15 Kent Fredric
2020-07-21 23:15 Kent Fredric
2020-07-05  8:24 Joonas Niilola
2020-06-25  8:08 Joonas Niilola
2020-06-25  8:08 Joonas Niilola
2020-05-25 12:17 Mikle Kolyada
2020-05-10 17:42 Mart Raudsepp
2020-05-06  7:18 Sergei Trofimovich
2020-04-30 21:28 Andreas Sturmlechner
2020-04-25 18:28 Mikle Kolyada
2020-04-09 22:02 Sergei Trofimovich
2020-04-07 10:21 Mart Raudsepp
2020-03-18  0:05 Matt Turner
2020-03-05 12:21 Joonas Niilola
2020-01-27 14:25 Agostino Sarubbo
2020-01-27 12:46 Agostino Sarubbo
2020-01-25 22:41 Andreas Sturmlechner
2020-01-25 21:09 Andreas Sturmlechner
2019-12-13 14:27 Joonas Niilola
2019-12-09 16:40 Joonas Niilola
2019-12-08 23:31 Sergei Trofimovich
2019-12-08 13:47 Joonas Niilola
2019-12-08 13:47 Joonas Niilola
2019-11-27 13:33 Mikle Kolyada
2019-11-25 13:51 Aaron Bauman
2019-11-23  0:49 Aaron Bauman
2019-11-20 13:23 Agostino Sarubbo
2019-11-20 11:16 Agostino Sarubbo
2019-11-14 16:10 Lars Wendler
2019-10-28 17:33 Sebastian Pipping
2019-10-13 19:12 Matt Turner
2019-10-13 17:46 Matt Turner
2019-10-13 17:46 Matt Turner
2019-10-12 23:50 Matt Turner
2019-09-26 20:00 Mikle Kolyada
2019-08-28  8:19 David Seifert
2019-07-28 13:53 Mikle Kolyada
2019-07-28 13:53 Mikle Kolyada
2019-07-25  0:25 Aaron Bauman
2019-07-08 12:10 Thomas Deutschmann
2019-06-06  6:58 Agostino Sarubbo
2019-06-05  7:28 Agostino Sarubbo
2019-06-04 13:30 Agostino Sarubbo
2019-05-29  1:32 Aaron Bauman
2019-05-21  3:51 Aaron Bauman
2019-05-20 11:42 Mikle Kolyada
2019-05-16 21:04 Sebastian Pipping
2019-05-15 16:46 Sebastian Pipping
2019-05-15 16:46 Sebastian Pipping
2019-05-08 19:21 Mikle Kolyada
2019-05-08 14:38 Tobias Klausmann
2019-04-25 22:32 Pacho Ramos
2019-04-23  1:33 Aaron Bauman
2019-03-09 16:33 Sebastian Pipping
2018-12-09 21:50 Sebastian Pipping
2018-11-24 12:49 Sergei Trofimovich
2018-11-18 21:06 Sebastian Pipping
2018-10-19  8:51 Michał Górny
2018-09-21 18:05 Michał Górny
2018-08-27 19:56 Sebastian Pipping
2018-08-25 19:17 Sebastian Pipping
2018-08-25 17:12 Sebastian Pipping
2018-07-23 14:27 Sebastian Pipping
2018-07-19 20:41 Sebastian Pipping
2018-05-20 19:10 Andreas Sturmlechner
2018-05-17 19:47 Sebastian Pipping
2018-05-13 16:12 Sebastian Pipping
2018-05-12 20:41 Sergei Trofimovich
2018-04-29 17:57 Sebastian Pipping
2018-04-29 17:50 Sebastian Pipping
2018-04-21 21:20 Sebastian Pipping
2018-04-21 20:56 Sebastian Pipping
2018-03-31 18:01 Sebastian Pipping
2018-03-27 22:14 Sebastian Pipping
2018-03-22  6:07 Markus Meier
2018-03-21  7:39 Sergei Trofimovich
2018-02-22  9:15 Jason Zaman
2018-02-18 21:21 Sergei Trofimovich
2018-01-31 17:39 Sebastian Pipping
2018-01-22  8:31 Sergei Trofimovich
2018-01-20 16:49 Tobias Klausmann
2018-01-17  6:42 Thomas Deutschmann
2018-01-10 22:42 Sebastian Pipping
2018-01-03 19:17 Sebastian Pipping
2017-12-13 19:02 Sebastian Pipping
2017-12-04 20:50 Pacho Ramos
2017-08-23 21:52 Sebastian Pipping
2017-06-07 10:25 Sergei Trofimovich
2017-04-04 21:26 Michael Weber
2017-02-14 20:46 Sebastian Pipping
2016-12-28 11:58 Pacho Ramos
2016-12-26 12:47 Markus Meier
2016-12-25 14:54 Lars Wendler
2016-11-12 23:37 David Seifert
2016-11-10 23:10 Sebastian Pipping
2016-10-11  6:50 Lars Wendler
2016-10-01 13:40 Jeroen Roovers
2016-09-22  9:59 Tobias Klausmann
2016-09-17 14:03 Gilles Dartiguelongue
2016-09-17  8:27 Pacho Ramos
2016-01-31 18:34 Pacho Ramos
2015-12-08 21:54 Sebastian Pipping
2015-12-05  1:42 Sebastian Pipping
2015-12-04 23:03 Sebastian Pipping
2015-09-05 15:50 Pacho Ramos
2015-08-16 16:38 Mikle Kolyada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1615453654.e965ae13739d801437dbc4e70dd01f61c52fa968.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox