* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2015-12-05 9:05 Jeroen Roovers
0 siblings, 0 replies; 19+ messages in thread
From: Jeroen Roovers @ 2015-12-05 9:05 UTC (permalink / raw
To: gentoo-commits
commit: b428d604c631ab659a91f7a364f811b80f70f9a4
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 5 09:05:26 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Dec 5 09:05:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b428d604
media-libs/gegl: Fix compiling on bigendian.
Package-Manager: portage-2.2.26
media-libs/gegl/files/gegl-0.3.4-endian.patch | 11 +++++++++++
media-libs/gegl/gegl-0.3.4.ebuild | 2 ++
2 files changed, 13 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.3.4-endian.patch b/media-libs/gegl/files/gegl-0.3.4-endian.patch
new file mode 100644
index 0000000..3df13e6
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.4-endian.patch
@@ -0,0 +1,11 @@
+--- a/operations/external/tiff-load.c
++++ b/operations/external/tiff-load.c
+@@ -505,7 +505,7 @@
+ GeglRectangle line = { 0, p->height - row - 1, p->width, 1 };
+ #if G_BYTE_ORDER != G_LITTLE_ENDIAN
+ guint row_start = row * p->width;
+- guint row end = row * p->width + p->width;
++ guint row_end = row * p->width + p->width;
+ guint i;
+
+ for (i = row_start; i < row_end; i++)
diff --git a/media-libs/gegl/gegl-0.3.4.ebuild b/media-libs/gegl/gegl-0.3.4.ebuild
index 4fca26c..ce3348c 100644
--- a/media-libs/gegl/gegl-0.3.4.ebuild
+++ b/media-libs/gegl/gegl-0.3.4.ebuild
@@ -77,6 +77,8 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-0.3.4-endian.patch
+
# 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
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2015-12-05 16:41 Justin Lecher
0 siblings, 0 replies; 19+ messages in thread
From: Justin Lecher @ 2015-12-05 16:41 UTC (permalink / raw
To: gentoo-commits
commit: cd5b67b2172a17342c21c873ba7e213a6b7c89e0
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 5 16:40:20 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Dec 5 16:41:10 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd5b67b2
media-libs/gegl: Fix underlinking
Gnome-Bugs: https://bugzilla.gnome.org/show_bug.cgi?id=759065
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../gegl/files/gegl-0.3.4-underlinking.patch | 31 ++++++++++++++++++++++
media-libs/gegl/gegl-0.3.4.ebuild | 4 ++-
media-libs/gegl/metadata.xml | 20 +++++++-------
3 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/media-libs/gegl/files/gegl-0.3.4-underlinking.patch b/media-libs/gegl/files/gegl-0.3.4-underlinking.patch
new file mode 100644
index 0000000..a7a6290
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.4-underlinking.patch
@@ -0,0 +1,31 @@
+From 8dd23b1ed5f1ce065839f15a21ca28766835f1fd Mon Sep 17 00:00:00 2001
+From: Justin Lecher <jlec@gentoo.org>
+Date: Sat, 5 Dec 2015 17:34:48 +0100
+Subject: [PATCH] Fix underlinking (-lm) of libgegl.so
+
+When linking with ld.gold the builds fails due to underlinking of libgegl.so
+./.libs/libgegl-0.3.so: error: undefined reference to 'tanhf'
+
+Gnome-Bugs: https://bugzilla.gnome.org/show_bug.cgi?id=759065
+
+Signed-off-by: Justin Lecher <jlec@gentoo.org>
+---
+ gegl/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index e26099c..e53777d 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -39,7 +39,7 @@ AM_LDFLAGS = \
+ $(no_undefined) -export-dynamic -version-info $(GEGL_LIBRARY_VERSION)
+
+ LIBS = \
+- $(DEP_LIBS) $(BABL_LIBS)
++ $(DEP_LIBS) $(BABL_LIBS) -lm
+
+ GEGL_publicdir = $(includedir)/gegl-$(GEGL_API_VERSION)
+
+--
+2.6.3
+
diff --git a/media-libs/gegl/gegl-0.3.4.ebuild b/media-libs/gegl/gegl-0.3.4.ebuild
index ce3348c..764b6c9 100644
--- a/media-libs/gegl/gegl-0.3.4.ebuild
+++ b/media-libs/gegl/gegl-0.3.4.ebuild
@@ -77,7 +77,9 @@ pkg_setup() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.3.4-endian.patch
+ epatch \
+ "${FILESDIR}"/${PN}-0.3.4-endian.patch \
+ "${FILESDIR}"/${P}-underlinking.patch
# FIXME: the following should be proper patch sent to upstream
# fix OSX loadable module filename extension
diff --git a/media-libs/gegl/metadata.xml b/media-libs/gegl/metadata.xml
index 93d122d..0492c2c 100644
--- a/media-libs/gegl/metadata.xml
+++ b/media-libs/gegl/metadata.xml
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>sping@gentoo.org</email>
-</maintainer>
-<use>
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection.</flag>
- <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
- <flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
- <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
- <flag name="webp">Enable support for <pkg>media-libs/libwebp</pkg></flag>
-</use>
+ <maintainer>
+ <email>sping@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection.</flag>
+ <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg>.</flag>
+ <flag name="umfpack">Enable sparse solving via <pkg>sci-libs/umfpack</pkg>.</flag>
+ <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+ <flag name="webp">Enable support for <pkg>media-libs/libwebp</pkg></flag>
+ </use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2017-01-09 21:11 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2017-01-09 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 80ba07d5250ba5ddd08568d10934023bbb558016
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 20:58:19 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 21:11:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ba07d5
media-libs/gegl: Fix linking (bug #605216)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../gegl/files/gegl-0.2.0-underlinking.patch | 38 ++++++++++++++++++++++
media-libs/gegl/gegl-0.2.0-r2.ebuild | 5 ++-
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
new file mode 100644
index 00000000..4468f38
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
@@ -0,0 +1,38 @@
+From db19965ad957edee3c2ef3e321c3904b436749da Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 9 Jan 2017 21:38:42 +0100
+Subject: [PATCH] Backport $(MATH_LIB) patch to GEGL 0.2
+
+Source:
+https://git.gnome.org/browse/gegl/patch/?id=c9bbc815378cb81ba8a48be35f615e7e2d74dffc
+---
+ bin/Makefile.am | 2 +-
+ examples/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index c85ecbd..08a156b 100644
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -23,7 +23,7 @@ AM_CFLAGS = \
+
+ AM_LDFLAGS = \
+ $(no_undefined) ../gegl/libgegl-$(GEGL_API_VERSION).la \
+- $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO)
++ $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) $(MATH_LIB)
+
+ bin_PROGRAMS = gegl
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index c29a1dd..5c4ac3a 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -42,4 +42,4 @@ AM_CFLAGS = $(DEP_CFLAGS) $(GTK_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
+
+ AM_LDFLAGS = \
+ $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
+- $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS)
++ $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(MATH_LIB)
+--
+2.11.0
+
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index fec143c..2e8582a 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -72,6 +72,9 @@ src_prepare() {
fi
epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=605216
+ epatch "${FILESDIR}"/${P}-underlinking.patch
eautoreconf
# https://bugs.gentoo.org/show_bug.cgi?id=468248
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2017-04-01 22:25 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2017-04-01 22:25 UTC (permalink / raw
To: gentoo-commits
commit: eee0146ce47e305d2310f5139612b388c7be0e72
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 1 22:22:44 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Apr 1 22:24:37 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee0146c
media-libs/gegl: 0.3.14
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-libs/gegl/Manifest | 1 +
.../files/gegl-0.3.14-implicit-declaration.patch | 37 +++++
media-libs/gegl/gegl-0.3.14.ebuild | 180 +++++++++++++++++++++
3 files changed, 218 insertions(+)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index e2e4991034c..f0a938a4c56 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -2,5 +2,6 @@ DIST gegl-0.2.0.tar.bz2 7502040 SHA256 df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a
DIST gegl-0.3.0.tar.bz2 5463571 SHA256 f0fec8f2e7b8835979d3cf4e38b05d41bb79f68dc80cf899a846484da693bbf7 SHA512 ff758df4689b0fa8f5e16ebcea32a7fe77bccfef70efc20d10669ce5139a70ec3533e78227fd4798812b31ac1ca5081b9d1d701a7449bf75356f879ece5fadd6 WHIRLPOOL 4827d6e40025c36d4ef869b5856f4def1e93cc195757f430cfd2980742ce6b37c79833283d17ec51e93b569a144548aaf7021854b9bcdb241b90049b1321a99b
DIST gegl-0.3.10.tar.bz2 5905157 SHA256 26b4d6d0a8edb358ca2fbc097f9f97eec9d74e0ffe42f89fa1aff201728023d9 SHA512 54df7e0cb26be2f2664eb9373fc2e1dff809df505007c95e72c896f3e2829e2159df7b9701c31b4dc20953a9476de69d603e8d5c1c42078284edfa6cf05dccd7 WHIRLPOOL c307bcb65287489c98e3cae50a57c6215e29eeef315b7d581c3c5239c8156ddd69b30edd83e35549d4c6b840e6ed15a778a5145f939a7a2e20a70d6b64551439
DIST gegl-0.3.12.tar.bz2 6037107 SHA256 62eb08d7dd6ac046953a0bf606a71f9d14c9016ffef4ef7273b07b598f14bec7 SHA512 a8c9d1d21b042d2c848a540f69f58c2224c6617e21a6e25b47eb885a0388242195569a81101242041eba2b7c486dbbc47f516fae8d7ab35f4d67ab5f5c2b0fe4 WHIRLPOOL 2f7846f80238d525cf160ad07b5dc96d52f081a35a5ac2455c1c7eab65cd09d9acb048ed361ec99a033f16562ac505943e845a5f4e7e1f363840f7721fd99a93
+DIST gegl-0.3.14.tar.bz2 5985306 SHA256 09f5e2e6899697641d4660e3e274aed696f5bacc96ba389ac77674ee1156590a SHA512 8d03bb15433777af3baae20bb987587cef2ae80315116e7e8a3197278c3ca2ff2814aa533ebe2ad4c2cca58a618a8a24b0b6faff0d0ce1194e3d31cfe85beaf9 WHIRLPOOL 1be1914cae5760bb2b35fc495c409cb927783f303cff393f0cdc43a875b42b380829cec9c8907d19c1f78cb57bed5d639759f09bb434c48436d1bc59750ab33d
DIST gegl-0.3.4.tar.bz2 5328192 SHA256 846290a790854d1e6b7c17a2d6f82ad7cb14c72e240bd3b81b98cc0ceddbc3ec SHA512 7fe14c1534d61cfc253bce54cc707f93882ad96302068fe672e6cdcb613430e835ee5d39a5398537f845a6d101eed6fd3d1ff7e4204d51bc9ab5a59c9e09d2ec WHIRLPOOL 046af673b5a21a050555fabf5e52532b5de7af289922991f0c15cc39a09d32302a6a98483bd4ff2cee3a37356d0cf0e267c87f524f3b6678eb61fcaab6d6735c
DIST gegl-0.3.8.tar.bz2 5876259 SHA256 06ca9e67a59da026eb941b9d323269d7c19a922f1e478acdd3791a0eef8b229b SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb WHIRLPOOL 97e3521e2c95e2b370c8a6ac2724b57212ebfbbf3c1eeccc3cfaa4de6b993c56b32ead9e5baa23dcbcb8272f7ec29ce7a2acc3afcc5fcc062d0adc72899293b8
diff --git a/media-libs/gegl/files/gegl-0.3.14-implicit-declaration.patch b/media-libs/gegl/files/gegl-0.3.14-implicit-declaration.patch
new file mode 100644
index 00000000000..0a7943aebc1
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.14-implicit-declaration.patch
@@ -0,0 +1,37 @@
+From 72905e2865b4f352da7caa8f722b1db77c07a173 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 2 Apr 2017 00:13:54 +0200
+Subject: [PATCH] Apply upstream fixes for implicit function declaration
+ warnings
+
+Source commits:
+https://git.gnome.org/browse/gegl/commit/tests/simple/test-buffer-sharing.c?id=7cb72e3a9ade11a506e252623bead17635de2047
+https://git.gnome.org/browse/gegl/commit/tests/simple/test-buffer-sharing.c?id=52f01ba49e2246df24a504084863b12794682d37
+---
+ tests/simple/test-buffer-sharing.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/simple/test-buffer-sharing.c b/tests/simple/test-buffer-sharing.c
+index 94eccda..a52bfa8 100644
+--- a/tests/simple/test-buffer-sharing.c
++++ b/tests/simple/test-buffer-sharing.c
+@@ -16,6 +16,7 @@
+ */
+
+ #include <gegl.h>
++#include <glib/gstdio.h>
+
+ // in order of progression
+ typedef enum _TestState {
+@@ -164,6 +165,8 @@ on_timeout(gpointer user_data) {
+ return FALSE;
+ }
+
++#include <unistd.h>
++
+ static void
+ test_init(TestData *data) {
+
+--
+2.12.2
+
diff --git a/media-libs/gegl/gegl-0.3.14.ebuild b/media-libs/gegl/gegl-0.3.14.ebuild
new file mode 100644
index 00000000000..f9b15ae02a4
--- /dev/null
+++ b/media-libs/gegl/gegl-0.3.14.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://git.gnome.org/gegl"
+ SRC_URI=""
+else
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-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.3"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr 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.36:2
+ dev-libs/json-glib
+ >=media-libs/babl-0.1.24
+ sys-libs/zlib
+ >=x11-libs/gdk-pixbuf-2.32:2
+ x11-libs/pango
+
+ cairo? ( x11-libs/cairo )
+ ffmpeg? (
+ >=media-video/ffmpeg-2.8:0=
+ )
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ virtual/jpeg:0=
+ jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+ lcms? ( >=media-libs/lcms-2.2:2 )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+ openexr? ( media-libs/openexr:= )
+ media-libs/libpng:0=
+ raw? ( >=media-libs/libraw-0.15.4:0= )
+ sdl? ( media-libs/libsdl )
+ svg? ( >=gnome-base/librsvg-2.14:2 )
+ tiff? ( >=media-libs/tiff-4:0 )
+ umfpack? ( sci-libs/umfpack )
+ v4l? ( >=media-libs/libv4l-1.0.1 )
+ webp? ( media-libs/libwebp )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1
+ >=dev-util/intltool-0.40.1
+ dev-lang/perl
+ virtual/pkgconfig
+ >=sys-devel/libtool-2.2
+ test? ( introspection? (
+ $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+ vala? ( $(vala_depend) )
+"
+
+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
+ fi
+
+ #epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+ # 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
+
+ epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+ epatch "${FILESDIR}"/${P}-implicit-declaration.patch
+
+ eautoreconf
+
+ gnome2_environment_reset
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ # never enable altering of CFLAGS via profile option
+ # libspiro: not in portage main tree
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+
+ # Also please note that:
+ #
+ # - Some auto-detections are not patched away since the docs are
+ # not built (--disable-docs, lack of --enable-gtk-doc) and these
+ # tools affect re-generation of docs, only
+ # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+ #
+ # - Parameter --with-exiv2 compiles a noinst-app only, no use
+ #
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ #
+ # - 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
+ #
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ #
+ # - mrg is not in tree and gexiv2 support only has effect when mrg support
+ # is enabled
+ #
+ # So that's why USE="exif graphviz lua v4l" got resolved. More at:
+ # https://bugs.gentoo.org/show_bug.cgi?id=451136
+ #
+ econf \
+ --disable-docs \
+ --disable-profile \
+ --disable-silent-rules \
+ --disable-workshop \
+ --program-suffix=-${SLOT} \
+ --with-gdk-pixbuf \
+ --with-pango \
+ --without-libspiro \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable debug) \
+ $(use_with cairo) \
+ $(use_with cairo pangocairo) \
+ --without-exiv2 \
+ $(use_with ffmpeg libavformat) \
+ --without-gexiv2 \
+ --without-graphviz \
+ $(use_with jpeg2k jasper) \
+ $(use_with lcms) \
+ $(use_with lensfun) \
+ --without-lua \
+ --without-mrg \
+ $(use_with openexr) \
+ $(use_with raw libraw) \
+ $(use_with sdl) \
+ $(use_with svg librsvg) \
+ $(use_with tiff libtiff) \
+ $(use_with umfpack) \
+ $(use_with v4l libv4l) \
+ $(use_with v4l libv4l2) \
+ $(use_enable introspection) \
+ $(use_with vala) \
+ $(use_with webp)
+}
+
+src_compile() {
+ default
+
+ [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2017-05-20 22:23 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2017-05-20 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 3980d9be8a48e5aa8c5b47416f9c31ab171a981b
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 22:21:02 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat May 20 22:22:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3980d9be
media-libs/gegl: Fix USE=introspection compilation (bug #617618)
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../gegl/files/gegl-0.3.14-g_log_domain.patch | 47 ++++++++++++++++++++++
media-libs/gegl/gegl-0.3.14.ebuild | 3 +-
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch b/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch
new file mode 100644
index 00000000000..4fb81a2b2bb
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.14-g_log_domain.patch
@@ -0,0 +1,47 @@
+From 81fb956b221e4b1f919788d8a5f6a3a5462b86ae Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
+Date: Thu, 23 Mar 2017 14:59:28 +0100
+Subject: build: move G_LOG_DOMAIN define to a Makefile.am as suggested in glib
+ docs...
+
+---
+ configure.ac | 2 --
+ gegl/Makefile.am | 2 ++
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 41ed17e..36e8e2a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1269,8 +1269,6 @@ done
+ # We should support this at some point if possible
+ #LDFLAGS="-Wl,-z,defs"
+
+-CFLAGS="$CFLAGS -DG_LOG_DOMAIN=\\\"GEGL\\\""
+-
+ dnl bin/node-editors/Makefile
+ AC_CONFIG_FILES([
+ Makefile
+diff --git a/gegl/Makefile.am b/gegl/Makefile.am
+index 2030ebb..b5f70d8 100644
+--- a/gegl/Makefile.am
++++ b/gegl/Makefile.am
+@@ -12,6 +12,7 @@ endif
+
+ SUBDIRS = buffer graph module operation process property-types opencl
+
++
+ CLEANFILES =
+
+ AM_CPPFLAGS = \
+@@ -31,6 +32,7 @@ AM_CPPFLAGS = \
+ -I$(top_builddir)/gegl/property-types \
+ -I$(top_srcdir)/gegl/property-types \
+ -DLIBDIR=\""$(libdir)"\" \
++ -DG_LOG_DOMAIN=\"GEGL\" \
+ -DGEGL_LOCALEDIR=\""$(GEGL_LOCALEDIR)"\"
+
+ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
+--
+cgit v0.12
+
diff --git a/media-libs/gegl/gegl-0.3.14.ebuild b/media-libs/gegl/gegl-0.3.14.ebuild
index f9b15ae02a4..7a50c447bbf 100644
--- a/media-libs/gegl/gegl-0.3.14.ebuild
+++ b/media-libs/gegl/gegl-0.3.14.ebuild
@@ -86,7 +86,8 @@ src_prepare() {
sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
fi
- #epatch "${FILESDIR}"/${P}-g_log_domain.patch
+ # https://bugs.gentoo.org/show_bug.cgi?id=617618
+ epatch "${FILESDIR}"/${P}-g_log_domain.patch
# commit 7c78497b : tests that use gegl.png are broken on non-amd64
sed -e '/clones.xml/d' \
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2017-12-04 20:30 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2017-12-04 20:30 UTC (permalink / raw
To: gentoo-commits
commit: 6acac429273b8072a1db1c57a02c8e389e6536c0
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 20:29:00 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 20:30:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6acac429
media-libs/gegl: libopenraw-0.1 (bug 639834)
Package-Manager: Portage-2.3.16, Repoman-2.3.6
.../gegl/files/gegl-0.2.0-libopenraw-0.1.patch | 48 +++++++
media-libs/gegl/gegl-0.2.0-r3.ebuild | 160 +++++++++++++++++++++
2 files changed, 208 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch b/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
new file mode 100644
index 00000000000..ec122703955
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
@@ -0,0 +1,48 @@
+From 1ad5d7656891f53b76efd6783d75d14b9cbb4daa Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 4 Dec 2017 21:18:56 +0100
+Subject: [PATCH] Support (and require) libopenraw 0.1.0+
+
+---
+ configure.ac | 4 ++--
+ operations/external/openraw.c | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 30d306e..febdddb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -47,7 +47,7 @@ m4_define([lensfun_required_version], [0.2.5])
+ m4_define([librsvg_required_version], [2.14.0])
+ m4_define([lua_required_version], [5.1.0])
+ m4_define([openexr_required_version], [0.0.0])
+-m4_define([openraw_required_version], [0.0.5])
++m4_define([openraw_required_version], [0.1.0])
+ m4_define([pango_required_version], [0.0.0])
+ m4_define([pangocairo_required_version], [0.0.0])
+ m4_define([png_required_version], [0.0.0])
+@@ -790,7 +790,7 @@ AC_ARG_WITH(libopenraw, [ --without-libopenraw build without openraw support
+
+ have_libopenraw="no"
+ if test "x$with_libopenraw" != "xno"; then
+- PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= openraw_required_version,
++ PKG_CHECK_MODULES(OPENRAW, libopenraw-0.1 >= openraw_required_version,
+ have_libopenraw="yes",
+ have_libopenraw="no (openraw library not found)")
+ fi
+diff --git a/operations/external/openraw.c b/operations/external/openraw.c
+index 9fc1e95..b4b4a13 100644
+--- a/operations/external/openraw.c
++++ b/operations/external/openraw.c
+@@ -116,7 +116,7 @@ load_buffer (GeglOperation *operation)
+ goto clean_file;
+ }
+
+- if(or_rawdata_format (rawdata) != OR_DATA_TYPE_CFA)
++ if(or_rawdata_format (rawdata) != OR_DATA_TYPE_RAW)
+ {
+ goto clean_file;
+ }
+--
+2.15.0
+
diff --git a/media-libs/gegl/gegl-0.2.0-r3.ebuild b/media-libs/gegl/gegl-0.2.0-r3.ebuild
new file mode 100644
index 00000000000..9f74b026acd
--- /dev/null
+++ b/media-libs/gegl/gegl-0.2.0-r3.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.11 # see bug 471990, comment 3
+# vala and introspection support is broken, bug #468208
+#VALA_MIN_API_VERSION=0.14
+#VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools #vala
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+
+RDEPEND="
+ >=media-libs/babl-0.1.10
+ >=dev-libs/glib-2.28:2
+ >=x11-libs/gdk-pixbuf-2.18:2
+ x11-libs/pango
+ sys-libs/zlib
+ cairo? ( x11-libs/cairo )
+ ffmpeg? (
+ libav? ( media-video/libav:0= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+ openexr? ( media-libs/openexr )
+ png? ( media-libs/libpng:0= )
+ raw? ( >=media-libs/libopenraw-0.1 )
+ sdl? ( media-libs/libsdl )
+ svg? ( >=gnome-base/librsvg-2.14:2 )
+ umfpack? ( sci-libs/umfpack )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+"
+# >=media-libs/babl-0.1.10[introspection?]
+# introspection? ( >=dev-libs/gobject-introspection-0.10
+# >=dev-python/pygobject-2.26:2 )
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40.1
+ dev-lang/perl
+ virtual/pkgconfig
+ >=sys-devel/libtool-2.2
+"
+# vala? ( $(vala_depend) )"
+
+DOCS=( ChangeLog INSTALL README NEWS )
+
+src_prepare() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=442016
+ epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+ epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=416587
+ epatch "${FILESDIR}/${P}-introspection-version.patch"
+
+ epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+ # 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
+ fi
+
+ epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=605216
+ # https://bugs.gentoo.org/show_bug.cgi?id=617430
+ epatch "${FILESDIR}"/${P}-underlinking.patch
+ epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834
+
+ eapply_user
+ eautoreconf
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=468248
+ local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
+ [[ -f "${deps_file}" ]] || touch "${deps_file}"
+
+# use vala && vala_src_prepare
+}
+
+src_configure() {
+ # never enable altering of CFLAGS via profile option
+ # libspiro: not in portage main tree
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+
+ # Also please note that:
+ #
+ # - Some auto-detections are not patched away since the docs are
+ # not built (--disable-docs, lack of --enable-gtk-doc) and these
+ # tools affect re-generation of docs, only
+ # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+ #
+ # - Parameter --with-exiv2 compiles a noinst-app only, no use
+ #
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ #
+ # - 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
+ #
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ #
+ # So that's why USE="exif graphviz lua v4l" got resolved. More at:
+ # https://bugs.gentoo.org/show_bug.cgi?id=451136
+ #
+ econf \
+ --disable-silent-rules \
+ --disable-profile \
+ --without-libspiro \
+ --disable-docs --disable-workshop \
+ --with-pango --with-gdk-pixbuf \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable debug) \
+ $(use_with cairo) \
+ $(use_with cairo pangocairo) \
+ --without-exiv2 \
+ $(use_with ffmpeg libavformat) \
+ --without-graphviz \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k jasper) \
+ --without-lua \
+ $(use_with openexr) \
+ $(use_with png libpng) \
+ $(use_with raw libopenraw) \
+ $(use_with sdl) \
+ $(use_with svg librsvg) \
+ $(use_with umfpack) \
+ --without-libv4l \
+ $(use_with lensfun) \
+ --disable-introspection \
+ --without-vala
+# $(use_enable introspection) \
+# $(use_with vala)
+}
+
+src_test() {
+ gnome2_environment_reset # sandbox issues
+ default
+}
+
+src_compile() {
+ gnome2_environment_reset # sandbox issues (bug #396687)
+ default
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2018-01-10 22:08 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2018-01-10 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 64c8f56ec6b193ccab99d03de658684e5eb7e599
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 22:03:12 2018 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 22:08:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c8f56e
media-libs/gegl: Remove ghost dependency on media-gfx/exiv2
Configure option --without-exiv2 was used already but broken
in a way where it would still do auto-detection for exiv2 and
end up linking a non-inst programm against it.
Ebuilds for 0.3.20+ do not need patching as its fixed upstream
for a while now.
Closes: https://bugs.gentoo.org/641872
Package-Manager: Portage-2.3.19, Repoman-2.3.6
.../gegl/files/gegl-0.2.0-fix-without-exiv2.patch | 30 ++++
media-libs/gegl/gegl-0.2.0-r4.ebuild | 3 +-
.../{gegl-0.2.0-r4.ebuild => gegl-0.3.0-r1.ebuild} | 123 ++++++++------
media-libs/gegl/gegl-0.3.8-r1.ebuild | 180 +++++++++++++++++++++
4 files changed, 285 insertions(+), 51 deletions(-)
diff --git a/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch b/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch
new file mode 100644
index 00000000000..96a4188926d
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch
@@ -0,0 +1,30 @@
+From c0b4da18e199d1043738c034269f5dd6a4aa7d99 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Wed, 10 Jan 2018 22:39:05 +0100
+Subject: [PATCH] Fix ./configure --without-exiv2
+
+Variable names were in error
+
+Bug: https://bugs.gentoo.org/641872
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 30d306e..146b271 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -977,8 +977,8 @@ AC_SUBST(LIBSPIRO)
+
+ AC_ARG_WITH(exiv2, [ --without-exiv2 build without libexiv2 support])
+
+-have_libexiv2="no"
+-if test "x$with_libexiv2" != "xno"; then
++have_exiv2="no"
++if test "x$with_exiv2" != "xno"; then
+ PKG_CHECK_MODULES(EXIV2, exiv2,
+ have_exiv2="yes",
+ have_exiv2="no (exiv2 library not found)")
+--
+2.16.0.rc0
+
diff --git a/media-libs/gegl/gegl-0.2.0-r4.ebuild b/media-libs/gegl/gegl-0.2.0-r4.ebuild
index 2d8d8728da8..f1b427ba45a 100644
--- a/media-libs/gegl/gegl-0.2.0-r4.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -76,6 +76,7 @@ src_prepare() {
# https://bugs.gentoo.org/show_bug.cgi?id=617430
epatch "${FILESDIR}"/${P}-underlinking.patch
epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834
+ epatch "${FILESDIR}"/${P}-fix-without-exiv2.patch # bug 641872
eapply_user
eautoreconf
diff --git a/media-libs/gegl/gegl-0.2.0-r4.ebuild b/media-libs/gegl/gegl-0.3.0-r1.ebuild
similarity index 54%
copy from media-libs/gegl/gegl-0.2.0-r4.ebuild
copy to media-libs/gegl/gegl-0.3.0-r1.ebuild
index 2d8d8728da8..5e6d76c9487 100644
--- a/media-libs/gegl/gegl-0.2.0-r4.ebuild
+++ b/media-libs/gegl/gegl-0.3.0-r1.ebuild
@@ -1,68 +1,78 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
-WANT_AUTOMAKE=1.11 # see bug 471990, comment 3
# vala and introspection support is broken, bug #468208
-#VALA_MIN_API_VERSION=0.14
-#VALA_USE_DEPEND=vapigen
+VALA_MIN_API_VERSION=0.20
+VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
-inherit versionator gnome2-utils eutils autotools #vala
+if [[ ${PV} == *9999* ]]; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://git.gnome.org/gegl"
+ SRC_URI=""
+else
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-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/"
-SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+SLOT="0.3"
-IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
+REQUIRED_USE="vala? ( introspection )"
RDEPEND="
- >=media-libs/babl-0.1.10
- >=dev-libs/glib-2.28:2
+ >=dev-libs/glib-2.36:2
+ dev-libs/json-glib
+ >=media-libs/babl-0.1.12
+ sys-libs/zlib
>=x11-libs/gdk-pixbuf-2.18:2
x11-libs/pango
- sys-libs/zlib
+
cairo? ( x11-libs/cairo )
ffmpeg? (
libav? ( media-video/libav:0= )
!libav? ( media-video/ffmpeg:0= )
)
- jpeg? ( virtual/jpeg:0 )
+ introspection? ( >=dev-libs/gobject-introspection-1.32 )
+ jpeg? ( virtual/jpeg:0= )
jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+ lcms? ( >=media-libs/lcms-2.2:2 )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
openexr? ( media-libs/openexr )
png? ( media-libs/libpng:0= )
- raw? ( >=media-libs/libopenraw-0.1:0= )
+ raw? ( =media-libs/libopenraw-0.0.9 )
sdl? ( media-libs/libsdl )
svg? ( >=gnome-base/librsvg-2.14:2 )
umfpack? ( sci-libs/umfpack )
- lensfun? ( >=media-libs/lensfun-0.2.5 )
+ v4l? ( >=media-libs/libv4l-1.0.1 )
+ webp? ( media-libs/libwebp )
"
-# >=media-libs/babl-0.1.10[introspection?]
-# introspection? ( >=dev-libs/gobject-introspection-0.10
-# >=dev-python/pygobject-2.26:2 )
DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1
>=dev-util/intltool-0.40.1
dev-lang/perl
virtual/pkgconfig
>=sys-devel/libtool-2.2
+ test? ( introspection? (
+ $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+ vala? ( $(vala_depend) )
"
-# vala? ( $(vala_depend) )"
-DOCS=( ChangeLog INSTALL README NEWS )
+pkg_setup() {
+ use test && use introspection && python-any-r1_pkg_setup
+}
src_prepare() {
- # https://bugs.gentoo.org/show_bug.cgi?id=442016
- epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
- epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
-
- # https://bugs.gentoo.org/show_bug.cgi?id=416587
- epatch "${FILESDIR}/${P}-introspection-version.patch"
-
- epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+ # 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
@@ -70,21 +80,28 @@ src_prepare() {
sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
fi
- epatch "${FILESDIR}"/${P}-g_log_domain.patch
+ #epatch "${FILESDIR}"/${P}-g_log_domain.patch
- # https://bugs.gentoo.org/show_bug.cgi?id=605216
- # https://bugs.gentoo.org/show_bug.cgi?id=617430
- epatch "${FILESDIR}"/${P}-underlinking.patch
- epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834
+ # 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
- eapply_user
- eautoreconf
+ # commit 11a283ab : test-image-compare needs >=babl-0.1.13 (not released yet)
+ # for the new CIE conversions
+ sed -e '/test-image-compare/d' \
+ -i tests/simple/Makefile.am || die
+
+ # Skip broken test with >=dev-python/pygobject-3.14
+ sed -e '/test_buffer/ i\ @unittest.skip("broken")\' \
+ -i tests/python/test-gegl-format.py || die
- # https://bugs.gentoo.org/show_bug.cgi?id=468248
- local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
- [[ -f "${deps_file}" ]] || touch "${deps_file}"
+ epatch "${FILESDIR}"/${PN}-0.2.0-fix-without-exiv2.patch # bug 641872
-# use vala && vala_src_prepare
+ epatch_user
+ eautoreconf
+
+ use vala && vala_src_prepare
}
src_configure() {
@@ -114,11 +131,14 @@ src_configure() {
# https://bugs.gentoo.org/show_bug.cgi?id=451136
#
econf \
- --disable-silent-rules \
+ --disable-docs \
--disable-profile \
+ --disable-silent-rules \
+ --disable-workshop \
+ --program-suffix=-${SLOT} \
+ --with-gdk-pixbuf \
+ --with-pango \
--without-libspiro \
- --disable-docs --disable-workshop \
- --with-pango --with-gdk-pixbuf \
$(use_enable cpu_flags_x86_mmx mmx) \
$(use_enable cpu_flags_x86_sse sse) \
$(use_enable debug) \
@@ -129,6 +149,8 @@ src_configure() {
--without-graphviz \
$(use_with jpeg libjpeg) \
$(use_with jpeg2k jasper) \
+ $(use_with lcms) \
+ $(use_with lensfun) \
--without-lua \
$(use_with openexr) \
$(use_with png libpng) \
@@ -136,12 +158,11 @@ src_configure() {
$(use_with sdl) \
$(use_with svg librsvg) \
$(use_with umfpack) \
- --without-libv4l \
- $(use_with lensfun) \
- --disable-introspection \
- --without-vala
-# $(use_enable introspection) \
-# $(use_with vala)
+ $(use_with v4l libv4l) \
+ $(use_with v4l libv4l2) \
+ $(use_enable introspection) \
+ $(use_with vala) \
+ $(use_with webp)
}
src_test() {
@@ -152,9 +173,11 @@ src_test() {
src_compile() {
gnome2_environment_reset # sandbox issues (bug #396687)
default
+
+ [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
}
src_install() {
default
- find "${ED}" -name '*.la' -delete
+ prune_libtool_files --all
}
diff --git a/media-libs/gegl/gegl-0.3.8-r1.ebuild b/media-libs/gegl/gegl-0.3.8-r1.ebuild
new file mode 100644
index 00000000000..63e40fdf726
--- /dev/null
+++ b/media-libs/gegl/gegl-0.3.8-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://git.gnome.org/gegl"
+ SRC_URI=""
+else
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-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.3"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr 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.36:2
+ dev-libs/json-glib
+ >=media-libs/babl-0.1.14
+ sys-libs/zlib
+ >=x11-libs/gdk-pixbuf-2.18:2
+ x11-libs/pango
+
+ cairo? ( x11-libs/cairo )
+ ffmpeg? (
+ >=media-video/ffmpeg-2.8:0=
+ )
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ virtual/jpeg:0=
+ jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+ lcms? ( >=media-libs/lcms-2.2:2 )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+ openexr? ( media-libs/openexr:= )
+ media-libs/libpng:0=
+ raw? ( >=media-libs/libraw-0.15.4 )
+ sdl? ( media-libs/libsdl )
+ svg? ( >=gnome-base/librsvg-2.14:2 )
+ tiff? ( >=media-libs/tiff-4:0 )
+ umfpack? ( sci-libs/umfpack )
+ v4l? ( >=media-libs/libv4l-1.0.1 )
+ webp? ( media-libs/libwebp )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1
+ >=dev-util/intltool-0.40.1
+ dev-lang/perl
+ virtual/pkgconfig
+ >=sys-devel/libtool-2.2
+ test? ( introspection? (
+ $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+ vala? ( $(vala_depend) )
+"
+
+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
+ fi
+
+ #epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+ # 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
+
+ epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+ epatch "${FILESDIR}"/${PN}-0.2.0-fix-without-exiv2.patch # bug 641872
+
+ eautoreconf
+
+ gnome2_environment_reset
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ # never enable altering of CFLAGS via profile option
+ # libspiro: not in portage main tree
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+
+ # Also please note that:
+ #
+ # - Some auto-detections are not patched away since the docs are
+ # not built (--disable-docs, lack of --enable-gtk-doc) and these
+ # tools affect re-generation of docs, only
+ # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+ #
+ # - Parameter --with-exiv2 compiles a noinst-app only, no use
+ #
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ #
+ # - 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
+ #
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ #
+ # - mrg is not in tree and gexiv2 support only has effect when mrg support
+ # is enabled
+ #
+ # So that's why USE="exif graphviz lua v4l" got resolved. More at:
+ # https://bugs.gentoo.org/show_bug.cgi?id=451136
+ #
+ econf \
+ --disable-docs \
+ --disable-profile \
+ --disable-silent-rules \
+ --disable-workshop \
+ --program-suffix=-${SLOT} \
+ --with-gdk-pixbuf \
+ --with-pango \
+ --without-libspiro \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable debug) \
+ $(use_with cairo) \
+ $(use_with cairo pangocairo) \
+ --without-exiv2 \
+ $(use_with ffmpeg libavformat) \
+ --without-gexiv2 \
+ --without-graphviz \
+ $(use_with jpeg2k jasper) \
+ $(use_with lcms) \
+ $(use_with lensfun) \
+ --without-lua \
+ --without-mrg \
+ $(use_with openexr) \
+ $(use_with raw libraw) \
+ $(use_with sdl) \
+ $(use_with svg librsvg) \
+ $(use_with tiff libtiff) \
+ $(use_with umfpack) \
+ $(use_with v4l libv4l) \
+ $(use_with v4l libv4l2) \
+ $(use_enable introspection) \
+ $(use_with vala) \
+ $(use_with webp)
+}
+
+src_compile() {
+ default
+
+ [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2018-01-10 22:42 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2018-01-10 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 0217aa144b09b53ccd7da255559fe90edd91e81a
Author: Bob Brooks <gitbugged <AT> cool <DOT> fr <DOT> nf>
AuthorDate: Sat Dec 16 18:16:49 2017 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 22:35:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0217aa14
media-libs/gegl-0.2.0-r5: fix ffmpeg/libav support
ffmpeg has renamed avcodec_alloc_frame to av_frame_alloc
Closes: https://bugs.gentoo.org/636780
Closes: https://github.com/gentoo/gentoo/pull/6154
.../files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch | 38 +++++
media-libs/gegl/gegl-0.2.0-r5.ebuild | 164 +++++++++++++++++++++
2 files changed, 202 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch
new file mode 100644
index 00000000000..6998a02e75f
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch
@@ -0,0 +1,38 @@
+From 6e9ac140385d28210afdd2ed2bf9b0533ca0aac1 Mon Sep 17 00:00:00 2001
+From: fafryd <dz1125.bug.tracker@gmail.com>
+Date: Sat, 5 Mar 2016 22:11:39 +0100
+Subject: [PATCH] use av_frame_alloc instead of avcodec_alloc_frame
+
+---
+ operations/external/ff-load.c | 2 +-
+ operations/workshop/external/ff-save.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index 442ec5f..0b9d8e8 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -321,7 +321,7 @@ prepare (GeglOperation *operation)
+ p->width = p->enc->width;
+ p->height = p->enc->height;
+ p->frames = 10000000;
+- p->lavc_frame = avcodec_alloc_frame ();
++ p->lavc_frame = av_frame_alloc ();
+
+ if (p->fourcc)
+ g_free (p->fourcc);
+diff --git a/operations/workshop/external/ff-save.c b/operations/workshop/external/ff-save.c
+index 0f3105d..84d68c5 100644
+--- a/operations/workshop/external/ff-save.c
++++ b/operations/workshop/external/ff-save.c
+@@ -537,7 +537,7 @@ alloc_picture (int pix_fmt, int width, int height)
+ uint8_t *picture_buf;
+ int size;
+
+- picture = avcodec_alloc_frame ();
++ picture = av_frame_alloc ();
+ if (!picture)
+ return NULL;
+ size = avpicture_get_size (pix_fmt, width, height);
+--
+2.7.2
diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
new file mode 100644
index 00000000000..37bbe3ca913
--- /dev/null
+++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.11 # see bug 471990, comment 3
+# vala and introspection support is broken, bug #468208
+#VALA_MIN_API_VERSION=0.14
+#VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools #vala
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+
+RDEPEND="
+ >=media-libs/babl-0.1.10
+ >=dev-libs/glib-2.28:2
+ >=x11-libs/gdk-pixbuf-2.18:2
+ x11-libs/pango
+ sys-libs/zlib
+ cairo? ( x11-libs/cairo )
+ ffmpeg? (
+ libav? ( >=media-video/libav-11.3:0= )
+ !libav? ( media-video/ffmpeg:0= )
+ )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+ openexr? ( media-libs/openexr )
+ png? ( media-libs/libpng:0= )
+ raw? ( >=media-libs/libopenraw-0.1:0= )
+ sdl? ( media-libs/libsdl )
+ svg? ( >=gnome-base/librsvg-2.14:2 )
+ umfpack? ( sci-libs/umfpack )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+"
+# >=media-libs/babl-0.1.10[introspection?]
+# introspection? ( >=dev-libs/gobject-introspection-0.10
+# >=dev-python/pygobject-2.26:2 )
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40.1
+ dev-lang/perl
+ virtual/pkgconfig
+ >=sys-devel/libtool-2.2
+"
+# vala? ( $(vala_depend) )"
+
+DOCS=( ChangeLog INSTALL README NEWS )
+
+src_prepare() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=636780
+ epatch "${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=442016
+ epatch "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+ epatch "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=416587
+ epatch "${FILESDIR}/${P}-introspection-version.patch"
+
+ epatch "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+ # 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
+ fi
+
+ epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=605216
+ # https://bugs.gentoo.org/show_bug.cgi?id=617430
+ epatch "${FILESDIR}"/${P}-underlinking.patch
+ epatch "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834
+ epatch "${FILESDIR}"/${P}-fix-without-exiv2.patch # bug 641872
+
+ eapply_user
+ eautoreconf
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=468248
+ local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
+ [[ -f "${deps_file}" ]] || touch "${deps_file}"
+
+# use vala && vala_src_prepare
+}
+
+src_configure() {
+ # never enable altering of CFLAGS via profile option
+ # libspiro: not in portage main tree
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+
+ # Also please note that:
+ #
+ # - Some auto-detections are not patched away since the docs are
+ # not built (--disable-docs, lack of --enable-gtk-doc) and these
+ # tools affect re-generation of docs, only
+ # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+ #
+ # - Parameter --with-exiv2 compiles a noinst-app only, no use
+ #
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ #
+ # - 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
+ #
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ #
+ # So that's why USE="exif graphviz lua v4l" got resolved. More at:
+ # https://bugs.gentoo.org/show_bug.cgi?id=451136
+ #
+ econf \
+ --disable-silent-rules \
+ --disable-profile \
+ --without-libspiro \
+ --disable-docs --disable-workshop \
+ --with-pango --with-gdk-pixbuf \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable debug) \
+ $(use_with cairo) \
+ $(use_with cairo pangocairo) \
+ --without-exiv2 \
+ $(use_with ffmpeg libavformat) \
+ --without-graphviz \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k jasper) \
+ --without-lua \
+ $(use_with openexr) \
+ $(use_with png libpng) \
+ $(use_with raw libopenraw) \
+ $(use_with sdl) \
+ $(use_with svg librsvg) \
+ $(use_with umfpack) \
+ --without-libv4l \
+ $(use_with lensfun) \
+ --disable-introspection \
+ --without-vala
+# $(use_enable introspection) \
+# $(use_with vala)
+}
+
+src_test() {
+ gnome2_environment_reset # sandbox issues
+ default
+}
+
+src_compile() {
+ gnome2_environment_reset # sandbox issues (bug #396687)
+ default
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2018-05-13 17:30 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2018-05-13 17:30 UTC (permalink / raw
To: gentoo-commits
commit: 2ce460484a2841634b71f5df4335ba3eca4f709a
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun May 13 17:28:19 2018 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun May 13 17:30:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce46048
media-libs/gegl: Support ffmpeg 4.0
Closes: https://bugs.gentoo.org/654172
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch | 63 ++++++++++++++++++++++
.../files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch | 25 +++++++++
media-libs/gegl/gegl-0.3.34.ebuild | 2 +
media-libs/gegl/gegl-0.4.0-r1.ebuild | 2 +
4 files changed, 92 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch
new file mode 100644
index 00000000000..fc8027f08ae
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch
@@ -0,0 +1,63 @@
+From 8f2545886ce3be8f1b1229bddcfa5af3216110d3 Mon Sep 17 00:00:00 2001
+From: Franz Brausse <brausse@informatik.uni-trier.de>
+Date: Sun, 6 May 2018 13:38:09 +0200
+Subject: operations/external/ff-save: ffmpeg-4.0 compat; fixes #795625
+
+---
+ operations/external/ff-save.c | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index 90b6162..e7edd3e 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -88,6 +88,11 @@ property_int (me_subpel_quality, _("me-subpel-quality"), 0)
+ #include <libavutil/opt.h>
+ #include <libswscale/swscale.h>
+
++/* remove if libavcodec_required_version is changed to > 56.41.100 */
++#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(56,41,100)
++# define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
++#endif
++
+ typedef struct
+ {
+ gdouble frame;
+@@ -290,7 +295,7 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
+ c->codec_type = AVMEDIA_TYPE_AUDIO;
+
+ if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ return st;
+ }
+@@ -699,7 +704,9 @@ open_video (GeglProperties *o, AVFormatContext * oc, AVStream * st)
+ }
+
+ p->video_outbuf = NULL;
++#if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
+ if (!(oc->oformat->flags & AVFMT_RAWPICTURE))
++#endif
+ {
+ /* allocate output buffer, 1 mb / frame, might fail for some codecs on UHD - but works for now */
+ p->video_outbuf_size = 1024 * 1024;
+@@ -803,6 +810,7 @@ write_video_frame (GeglProperties *o,
+ picture_ptr = p->picture;
+ picture_ptr->pts = p->frame_count;
+
++ #if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
+ if (oc->oformat->flags & AVFMT_RAWPICTURE)
+ {
+ /* raw video case. The API will change slightly in the near
+@@ -821,6 +829,7 @@ write_video_frame (GeglProperties *o,
+ ret = av_write_frame (oc, &pkt);
+ }
+ else
++#endif
+ {
+ /* encode the image */
+ AVPacket pkt2;
+--
+cgit v0.12
+
diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch
new file mode 100644
index 00000000000..260ff3b2c1a
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch
@@ -0,0 +1,25 @@
+From 2896800b5e7d0c656710c70fdea57098032f3ccc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
+Date: Sun, 6 May 2018 15:09:03 +0200
+Subject: ff-save: update another occurance of CODEC_FLAG_GLOBAL_HEADER
+
+---
+ operations/external/ff-save.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
+index 1edac31..f30bf10 100644
+--- a/operations/external/ff-save.c
++++ b/operations/external/ff-save.c
+@@ -638,7 +638,7 @@ add_video_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
+ #endif
+
+ if (oc->oformat->flags & AVFMT_GLOBALHEADER)
+- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+
+ return st;
+ }
+--
+cgit v0.12
+
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index 075874901a6..90e2075cd1c 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -77,6 +77,8 @@ pkg_setup() {
PATCHES=(
"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+ "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch # bug 654172
+ "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch # bug 654172
)
src_prepare() {
diff --git a/media-libs/gegl/gegl-0.4.0-r1.ebuild b/media-libs/gegl/gegl-0.4.0-r1.ebuild
index 79a293b0beb..36f2afb95aa 100644
--- a/media-libs/gegl/gegl-0.4.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.0-r1.ebuild
@@ -78,6 +78,8 @@ pkg_setup() {
PATCHES=(
"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+ "${FILESDIR}"/${P}-ffmpeg-4-0-compat-1.patch # bug 654172
+ "${FILESDIR}"/${P}-ffmpeg-4-0-compat-2.patch # bug 654172
)
src_prepare() {
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2019-03-09 18:22 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2019-03-09 18:22 UTC (permalink / raw
To: gentoo-commits
commit: c14536acbbaf812c83be04f8db58abb76b04b93f
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 18:21:04 2019 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 18:21:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c14536ac
media-libs/gegl: 0.2 with ffmpeg 4
Closes: https://bugs.gentoo.org/673378
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
.../gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch | 13 ++
media-libs/gegl/gegl-0.2.0-r6.ebuild | 168 +++++++++++++++++++++
2 files changed, 181 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch
new file mode 100644
index 00000000000..6b8e9792c02
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch
@@ -0,0 +1,13 @@
+--- ./operations/external/ff-load.c.org 2018-12-18 09:22:34.467409854 +0100
++++ ./operations/external/ff-load.c 2018-12-18 09:22:50.921379092 +0100
+@@ -309,8 +309,8 @@
+ g_warning ("codec not found");
+ }
+
+- if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
+- p->enc->flags |= CODEC_FLAG_TRUNCATED;
++ if (p->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ p->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
+ {
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
new file mode 100644
index 00000000000..63cc626cb6a
--- /dev/null
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WANT_AUTOMAKE=1.11 # see bug 471990, comment 3
+# vala and introspection support is broken, bug #468208
+#VALA_MIN_API_VERSION=0.14
+#VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools #vala
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+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"
+
+IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+
+RDEPEND="
+ >=media-libs/babl-0.1.10
+ >=dev-libs/glib-2.28:2
+ >=x11-libs/gdk-pixbuf-2.18:2
+ x11-libs/pango
+ sys-libs/zlib
+ cairo? ( x11-libs/cairo )
+ ffmpeg? (
+ libav? ( >=media-video/libav-12:0= )
+ !libav? ( >=media-video/ffmpeg-4:0= )
+ )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+ openexr? ( media-libs/openexr )
+ png? ( media-libs/libpng:0= )
+ raw? ( >=media-libs/libopenraw-0.1:0= )
+ sdl? ( media-libs/libsdl )
+ svg? ( >=gnome-base/librsvg-2.14:2 )
+ umfpack? ( sci-libs/umfpack )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+"
+# >=media-libs/babl-0.1.10[introspection?]
+# introspection? ( >=dev-libs/gobject-introspection-0.10
+# >=dev-python/pygobject-2.26:2 )
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40.1
+ dev-lang/perl
+ virtual/pkgconfig
+ >=sys-devel/libtool-2.2
+"
+# vala? ( $(vala_depend) )"
+
+DOCS=( ChangeLog INSTALL README NEWS )
+
+PATCHES=(
+ # https://bugs.gentoo.org/show_bug.cgi?id=636780
+ "${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=442016
+ "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
+ "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=416587
+ "${FILESDIR}/${P}-introspection-version.patch"
+
+ "${FILESDIR}/${P}-ffmpeg-0.11.diff"
+ "${FILESDIR}"/${P}-g_log_domain.patch
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=605216
+ # https://bugs.gentoo.org/show_bug.cgi?id=617430
+ "${FILESDIR}"/${P}-underlinking.patch
+ "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834
+ "${FILESDIR}"/${P}-fix-without-exiv2.patch # bug 641872
+
+ "${FILESDIR}"/${P}-ffmpeg-4-0-compat.patch # bug 673378
+)
+
+src_prepare() {
+ default
+ # 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
+ fi
+
+ eautoreconf
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=468248
+ local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
+ [[ -f "${deps_file}" ]] || touch "${deps_file}"
+
+# use vala && vala_src_prepare
+}
+
+src_configure() {
+ # never enable altering of CFLAGS via profile option
+ # libspiro: not in portage main tree
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+
+ # Also please note that:
+ #
+ # - Some auto-detections are not patched away since the docs are
+ # not built (--disable-docs, lack of --enable-gtk-doc) and these
+ # tools affect re-generation of docs, only
+ # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+ #
+ # - Parameter --with-exiv2 compiles a noinst-app only, no use
+ #
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ #
+ # - 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
+ #
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ #
+ # So that's why USE="exif graphviz lua v4l" got resolved. More at:
+ # https://bugs.gentoo.org/show_bug.cgi?id=451136
+ #
+ econf \
+ --disable-silent-rules \
+ --disable-profile \
+ --without-libspiro \
+ --disable-docs --disable-workshop \
+ --with-pango --with-gdk-pixbuf \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable debug) \
+ $(use_with cairo) \
+ $(use_with cairo pangocairo) \
+ --without-exiv2 \
+ $(use_with ffmpeg libavformat) \
+ --without-graphviz \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k jasper) \
+ --without-lua \
+ $(use_with openexr) \
+ $(use_with png libpng) \
+ $(use_with raw libopenraw) \
+ $(use_with sdl) \
+ $(use_with svg librsvg) \
+ $(use_with umfpack) \
+ --without-libv4l \
+ $(use_with lensfun) \
+ --disable-introspection \
+ --without-vala
+# $(use_enable introspection) \
+# $(use_with vala)
+}
+
+src_test() {
+ gnome2_environment_reset # sandbox issues
+ default
+}
+
+src_compile() {
+ gnome2_environment_reset # sandbox issues (bug #396687)
+ default
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete
+}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2019-10-27 23:02 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2019-10-27 23:02 UTC (permalink / raw
To: gentoo-commits
commit: b09793443c40700a4503be856a21696b4793aa91
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 22:54:44 2019 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 23:01:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0979344
media-libs/gegl: 0.4.18 with meson + sync 9999
Closes: https://bugs.gentoo.org/694506
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.78, Repoman-2.3.16
media-libs/gegl/Manifest | 1 +
.../files/gegl-0.4.18-drop-failing-tests.patch | 43 +++++++
.../gegl/files/gegl-0.4.18-program-suffix.patch | 39 +++++++
.../gegl/{gegl-9999.ebuild => gegl-0.4.18.ebuild} | 125 +++++++++------------
media-libs/gegl/gegl-9999.ebuild | 125 +++++++++------------
5 files changed, 191 insertions(+), 142 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 3966857bd80..9a9f3f3851c 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -3,3 +3,4 @@ DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6c
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
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 00000000000..4be09057d89
--- /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 <sebastian@pipping.org>
+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 00000000000..be4498ccee4
--- /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 <sebastian@pipping.org>
+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-9999.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
similarity index 57%
copy from media-libs/gegl/gegl-9999.ebuild
copy to media-libs/gegl/gegl-0.4.18.ebuild
index ec1e63cf3a0..9083a3b08f6 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.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/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index ec1e63cf3a0..9083a3b08f6 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
}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2019-10-28 12:54 Sebastian Pipping
0 siblings, 0 replies; 19+ messages in thread
From: Sebastian Pipping @ 2019-10-28 12:54 UTC (permalink / raw
To: gentoo-commits
commit: 0dad3fcc89c87910dc254c00f5c7646b31e69454
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 12:52:47 2019 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 12:53:00 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dad3fcc
media-libs/gegl: Fix 0.4.18 for arches unlike amd64/ppc/ppc64/x86
Closes: https://bugs.gentoo.org/698744
Thanks to Jeroen Roovers for the patch!
Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
Package-Manager: Portage-2.3.78, Repoman-2.3.16
media-libs/gegl/files/gegl-0.4.18-arch.patch | 11 +++++++++++
media-libs/gegl/gegl-0.4.18.ebuild | 1 +
2 files changed, 12 insertions(+)
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 00000000000..57bfaf4a6c7
--- /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/gegl-0.4.18.ebuild b/media-libs/gegl/gegl-0.4.18.ebuild
index 9083a3b08f6..06defec21a4 100644
--- a/media-libs/gegl/gegl-0.4.18.ebuild
+++ b/media-libs/gegl/gegl-0.4.18.ebuild
@@ -80,6 +80,7 @@ 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() {
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2020-06-25 8:08 Joonas Niilola
0 siblings, 0 replies; 19+ messages in thread
From: Joonas Niilola @ 2020-06-25 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 794418cf941905fc957501a1e7a3bd9e954f86a6
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon May 25 00:02:17 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 08:07:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794418cf
media-libs/gegl: 0.3.34, drop failed tests using gegl-video, vp8
1.
The 'gegl-video' executable is built only 'with-gexiv2' option enabled.
Enabling of 'gexiv2' option on test phase allows
to built 'gegl-video' executable and then this part passed.
As mentioned in gegl-0.3.34.ebuild (as mentioned by previous maintainer):
"mrg is not in tree and gexiv2 support only has effect
when mrg support is enabled".
But as this option is disabled for build without USE="test"
(or FEATURES="test") and therefore isn't used in provided package
I see no reason to fix compilation instead of disabling this part of test.
2.
The second error seems due to hardware doesn't support vp8 hardware encoding.
AFAIK the vp8 hardware support is presented for intel since Broadwell
(2014 year) and I didn't find if it's support by AMD CPUs or for other ARCHs.
So this part of test is disabled here too.
Closes: https://bugs.gentoo.org/631930
Bug: https://bugs.gentoo.org/686202
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../gegl/files/gegl-0.3.34-failing-tests.patch | 27 ++++++++++++++++++++++
media-libs/gegl/gegl-0.3.34-r1.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch b/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch
new file mode 100644
index 00000000000..c388ac556e9
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch
@@ -0,0 +1,27 @@
+diff -Naur a/tests/ff-load-save/Makefile.am b/tests/ff-load-save/Makefile.am
+--- a/tests/ff-load-save/Makefile.am 2017-09-21 22:11:00.000000000 +0300
++++ b/tests/ff-load-save/Makefile.am 2020-03-07 16:33:21.000000000 +0300
+@@ -6,13 +6,7 @@
+
+ EXTRA_DIST = $(TESTS)
+
+-check: vids images
+-
+-images:
+- for a in *.avi *.mp4 *.ogv ;do \
+- GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/gegl-video \
+- $$a -s 74 -e 74 -of $$a- ;\
+- done
++check: vids
+
+ vids: $(TESTS) $(top_builddir)/examples/frame-counter
+ GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
+@@ -27,8 +21,6 @@
+ --video-codec mpeg4 --fps 12 --video-bit-rate 128 128kb-12fps.mp4
+ GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
+ --video-codec mpeg4 --fps 100 --video-bit-rate 128 128kb-100fps.mp4
+- GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
+- --fps 28 --video-bit-rate 512 512kb-28fps.ogv
+
+ clean-local:
+ rm -f *.png *.avi *.ogv *.mp4 *.webm
diff --git a/media-libs/gegl/gegl-0.3.34-r1.ebuild b/media-libs/gegl/gegl-0.3.34-r1.ebuild
index 9a69225a627..bd05c114d0d 100644
--- a/media-libs/gegl/gegl-0.3.34-r1.ebuild
+++ b/media-libs/gegl/gegl-0.3.34-r1.ebuild
@@ -74,6 +74,7 @@ pkg_setup() {
PATCHES=(
"${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+ "${FILESDIR}"/${PN}-0.3.34-failing-tests.patch # bug 631930, 686202
"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch # bug 654172
"${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch # bug 654172
)
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2020-08-22 16:07 Andreas Sturmlechner
0 siblings, 0 replies; 19+ messages in thread
From: Andreas Sturmlechner @ 2020-08-22 16:07 UTC (permalink / raw
To: gentoo-commits
commit: b98449cc7eb273b489dbf0c2ca4a07be861077af
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 2 11:19:17 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 22 16:06:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98449cc
media-libs/gegl: Drop 0.2.0-r6, 0.3.34* and 0.4.16*
Effectively dropping back to ~ppc.
Bug: https://bugs.gentoo.org/685624
Closes: https://bugs.gentoo.org/735370
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/gegl/Manifest | 3 -
.../files/gegl-0.2.0-cve-2012-4433-1e92e523.patch | 68 --------
.../files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch | 70 --------
media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff | 57 -------
.../gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch | 13 --
.../files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch | 38 -----
.../gegl/files/gegl-0.2.0-fix-without-exiv2.patch | 30 ----
.../gegl/files/gegl-0.2.0-g_log_domain.patch | 25 ---
.../files/gegl-0.2.0-introspection-version.patch | 31 ----
.../gegl/files/gegl-0.2.0-libopenraw-0.1.patch | 48 ------
.../gegl/files/gegl-0.2.0-underlinking.patch | 65 --------
.../gegl/files/gegl-0.3.12-failing-tests.patch | 33 ----
.../files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch | 63 --------
.../files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch | 25 ---
media-libs/gegl/gegl-0.2.0-r6.ebuild | 163 -------------------
media-libs/gegl/gegl-0.3.34-r1.ebuild | 173 --------------------
media-libs/gegl/gegl-0.3.34.ebuild | 178 ---------------------
media-libs/gegl/gegl-0.4.16-r1.ebuild | 170 --------------------
media-libs/gegl/gegl-0.4.16.ebuild | 169 -------------------
19 files changed, 1422 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 3baeaacbd6b..a02306475c3 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,6 +1,3 @@
-DIST gegl-0.2.0.tar.bz2 7502040 BLAKE2B 29b33bf6aa878b74461e929a96570fca9a56e52931ee66356ca9c3c4cec7cdc0668330aa25756d0baf531d0b90c4830c1f244e8327b238a63d68cb74d486e961 SHA512 16ef3f6852fd8efef2b6468a754342a2d003f2c2bef468d9465a448e6c89dedb8e791570f073a9faed05218a7c94c6c418eaa0f3abeadfb3e6b88d766ab792c8
-DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
-DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
DIST gegl-0.4.18.tar.xz 4812756 BLAKE2B b8e5902b62c3549f57dd0ce52a0a406974bf8664d5b85389b79f7d698bcf2643d19861add3d8a9bd5c99036aba4da97b70884dcaacf2cb89170b995f1d1497a0 SHA512 e79874cd50e9f0c27c7dc9d9b952545c31d0a48e2b158aa54b92c3e933267877222f86ede7256f2528f18985dc85d6eadbcd809f7a3563efc4449ec7634f15fd
DIST gegl-0.4.22.tar.xz 4826748 BLAKE2B 3b6ddca1dff17d0336614fb02cdf94c7497586f075fa548fef66f9f81f62a8055c58e008b9eed989dd283fa701a07d4e22ee81b85c35a0a55f4a92e51cf6b780 SHA512 3118fb17532bcd5893a77739eaf936f5d1e2020178abc497098d227c25f726679621503ac83e7d14a9883d259247d97b92016174e76a2e6e950be7e26ce251ab
DIST gegl-0.4.24.tar.xz 4937056 BLAKE2B a6237d0642713e2dc6fb5aa889dea31aad688608b99e985d69dfa43580caae634a6fc41ff050372d8b364f2f002e260335159325c01f73a10719c3d1bda70d36 SHA512 09d857332eeabe39327d312b1a1692b7c6c9f8f952ae3e3cc06b5a5c262757d8b86467c25a4e66c90c37922fd3548fc1342a9864732d17924f97e7b6c6c1786d
diff --git a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-1e92e523.patch b/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-1e92e523.patch
deleted file mode 100644
index 0babb0f41c1..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-1e92e523.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 1e92e5235ded0415d555aa86066b8e4041ee5a53 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Tue, 16 Oct 2012 14:58:27 +0000
-Subject: ppm-load: CVE-2012-4433: don't overflow memory allocation
-
-Carefully selected width/height values could cause the size of a later
-allocation to overflow, resulting in a buffer much too small to store
-the data which would then written beyond its end.
----
-diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c
-index efe6d56..3d6bce7 100644
---- a/operations/external/ppm-load.c
-+++ b/operations/external/ppm-load.c
-@@ -84,7 +84,6 @@ ppm_load_read_header(FILE *fp,
- /* Get Width and Height */
- img->width = strtol (header,&ptr,0);
- img->height = atoi (ptr);
-- img->numsamples = img->width * img->height * CHANNEL_COUNT;
-
- fgets (header,MAX_CHARS_IN_ROW,fp);
- maxval = strtol (header,&ptr,0);
-@@ -109,6 +108,16 @@ ppm_load_read_header(FILE *fp,
- g_warning ("%s: Programmer stupidity error", G_STRLOC);
- }
-
-+ /* Later on, img->numsamples is multiplied with img->bpc to allocate
-+ * memory. Ensure it doesn't overflow. */
-+ if (!img->width || !img->height ||
-+ G_MAXSIZE / img->width / img->height / CHANNEL_COUNT < img->bpc)
-+ {
-+ g_warning ("Illegal width/height: %ld/%ld", img->width, img->height);
-+ return FALSE;
-+ }
-+ img->numsamples = img->width * img->height * CHANNEL_COUNT;
-+
- return TRUE;
- }
-
-@@ -229,12 +238,24 @@ process (GeglOperation *operation,
- if (!ppm_load_read_header (fp, &img))
- goto out;
-
-- rect.height = img.height;
-- rect.width = img.width;
--
- /* Allocating Array Size */
-+
-+ /* Should use g_try_malloc(), but this causes crashes elsewhere because the
-+ * error signalled by returning FALSE isn't properly acted upon. Therefore
-+ * g_malloc() is used here which aborts if the requested memory size can't be
-+ * allocated causing a controlled crash. */
- img.data = (guchar*) g_malloc (img.numsamples * img.bpc);
-
-+ /* No-op without g_try_malloc(), see above. */
-+ if (! img.data)
-+ {
-+ g_warning ("Couldn't allocate %" G_GSIZE_FORMAT " bytes, giving up.", ((gsize)img.numsamples * img.bpc));
-+ goto out;
-+ }
-+
-+ rect.height = img.height;
-+ rect.width = img.width;
-+
- switch (img.bpc)
- {
- case 1:
---
-cgit v0.9.0.2
diff --git a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch b/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch
deleted file mode 100644
index f78557f5772..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-cve-2012-4433-4757cdf7.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 4757cdf73d3675478d645a3ec8250ba02168a230 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Tue, 16 Oct 2012 14:56:40 +0000
-Subject: ppm-load: CVE-2012-4433: add plausibility checks for header fields
-
-Refuse values that are non-decimal, negative or overflow the target
-type.
----
-diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c
-index 3d6bce7..465096d 100644
---- a/operations/external/ppm-load.c
-+++ b/operations/external/ppm-load.c
-@@ -36,6 +36,7 @@ gegl_chant_file_path (path, _("File"), "", _("Path of file to load."))
- #include "gegl-chant.h"
- #include <stdio.h>
- #include <stdlib.h>
-+#include <errno.h>
-
- typedef enum {
- PIXMAP_ASCII = 51,
-@@ -44,8 +45,8 @@ typedef enum {
-
- typedef struct {
- map_type type;
-- gint width;
-- gint height;
-+ glong width;
-+ glong height;
- gsize numsamples; /* width * height * channels */
- gsize bpc; /* bytes per channel */
- guchar *data;
-@@ -82,11 +83,33 @@ ppm_load_read_header(FILE *fp,
- }
-
- /* Get Width and Height */
-- img->width = strtol (header,&ptr,0);
-- img->height = atoi (ptr);
-+ errno = 0;
-+ img->width = strtol (header,&ptr,10);
-+ if (errno)
-+ {
-+ g_warning ("Error reading width: %s", strerror(errno));
-+ return FALSE;
-+ }
-+ else if (img->width < 0)
-+ {
-+ g_warning ("Error: width is negative");
-+ return FALSE;
-+ }
-+
-+ img->height = strtol (ptr,&ptr,10);
-+ if (errno)
-+ {
-+ g_warning ("Error reading height: %s", strerror(errno));
-+ return FALSE;
-+ }
-+ else if (img->width < 0)
-+ {
-+ g_warning ("Error: height is negative");
-+ return FALSE;
-+ }
-
- fgets (header,MAX_CHARS_IN_ROW,fp);
-- maxval = strtol (header,&ptr,0);
-+ maxval = strtol (header,&ptr,10);
-
- if ((maxval != 255) && (maxval != 65535))
- {
---
-cgit v0.9.0.2
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff
deleted file mode 100644
index 8e9a328524c..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-0.11.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-From 97067622352e58f86a24851dacb1f5daa0762897 Mon Sep 17 00:00:00 2001
-From: nick black <nick.black@sprezzatech.com>
-Date: Fri, 14 Dec 2012 04:11:16 +0000
-Subject: port gegl forward to libav 54
-
----
-diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
-index 442ec5f..75d26e9 100644
---- a/operations/external/ff-load.c
-+++ b/operations/external/ff-load.c
-@@ -137,7 +137,7 @@ ff_cleanup (GeglChantO *o)
- if (p->enc)
- avcodec_close (p->enc);
- if (p->ic)
-- av_close_input_file (p->ic);
-+ avformat_close_input(&p->ic);
- if (p->lavc_frame)
- av_free (p->lavc_frame);
-
-@@ -216,9 +216,9 @@ decode_frame (GeglOperation *operation,
- {
- do
- {
-- if (av_read_packet (p->ic, &p->pkt) < 0)
-+ if (av_read_frame (p->ic, &p->pkt) < 0)
- {
-- fprintf (stderr, "av_read_packet failed for %s\n",
-+ fprintf (stderr, "av_read_frame failed for %s\n",
- o->path);
- return -1;
- }
-@@ -271,12 +271,12 @@ prepare (GeglOperation *operation)
- gint err;
-
- ff_cleanup (o);
-- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
-+ err = avformat_open_input(&p->ic, o->path, NULL, 0);
- if (err < 0)
- {
- print_error (o->path, err);
- }
-- err = av_find_stream_info (p->ic);
-+ err = avformat_find_stream_info (p->ic, NULL);
- if (err < 0)
- {
- g_warning ("ff-load: error finding stream info for %s", o->path);
-@@ -312,7 +312,7 @@ prepare (GeglOperation *operation)
- if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
- p->enc->flags |= CODEC_FLAG_TRUNCATED;
-
-- if (avcodec_open (p->enc, p->codec) < 0)
-+ if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
- {
- g_warning ("error opening codec %s", p->enc->codec->name);
- return;
---
-cgit v0.9.1
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch
deleted file mode 100644
index 6b8e9792c02..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-4-0-compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./operations/external/ff-load.c.org 2018-12-18 09:22:34.467409854 +0100
-+++ ./operations/external/ff-load.c 2018-12-18 09:22:50.921379092 +0100
-@@ -309,8 +309,8 @@
- g_warning ("codec not found");
- }
-
-- if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
-- p->enc->flags |= CODEC_FLAG_TRUNCATED;
-+ if (p->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
-+ p->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
-
- if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
- {
diff --git a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch b/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch
deleted file mode 100644
index 6998a02e75f..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6e9ac140385d28210afdd2ed2bf9b0533ca0aac1 Mon Sep 17 00:00:00 2001
-From: fafryd <dz1125.bug.tracker@gmail.com>
-Date: Sat, 5 Mar 2016 22:11:39 +0100
-Subject: [PATCH] use av_frame_alloc instead of avcodec_alloc_frame
-
----
- operations/external/ff-load.c | 2 +-
- operations/workshop/external/ff-save.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
-index 442ec5f..0b9d8e8 100644
---- a/operations/external/ff-load.c
-+++ b/operations/external/ff-load.c
-@@ -321,7 +321,7 @@ prepare (GeglOperation *operation)
- p->width = p->enc->width;
- p->height = p->enc->height;
- p->frames = 10000000;
-- p->lavc_frame = avcodec_alloc_frame ();
-+ p->lavc_frame = av_frame_alloc ();
-
- if (p->fourcc)
- g_free (p->fourcc);
-diff --git a/operations/workshop/external/ff-save.c b/operations/workshop/external/ff-save.c
-index 0f3105d..84d68c5 100644
---- a/operations/workshop/external/ff-save.c
-+++ b/operations/workshop/external/ff-save.c
-@@ -537,7 +537,7 @@ alloc_picture (int pix_fmt, int width, int height)
- uint8_t *picture_buf;
- int size;
-
-- picture = avcodec_alloc_frame ();
-+ picture = av_frame_alloc ();
- if (!picture)
- return NULL;
- size = avpicture_get_size (pix_fmt, width, height);
---
-2.7.2
diff --git a/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch b/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch
deleted file mode 100644
index 96a4188926d..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-fix-without-exiv2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c0b4da18e199d1043738c034269f5dd6a4aa7d99 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 10 Jan 2018 22:39:05 +0100
-Subject: [PATCH] Fix ./configure --without-exiv2
-
-Variable names were in error
-
-Bug: https://bugs.gentoo.org/641872
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 30d306e..146b271 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -977,8 +977,8 @@ AC_SUBST(LIBSPIRO)
-
- AC_ARG_WITH(exiv2, [ --without-exiv2 build without libexiv2 support])
-
--have_libexiv2="no"
--if test "x$with_libexiv2" != "xno"; then
-+have_exiv2="no"
-+if test "x$with_exiv2" != "xno"; then
- PKG_CHECK_MODULES(EXIV2, exiv2,
- have_exiv2="yes",
- have_exiv2="no (exiv2 library not found)")
---
-2.16.0.rc0
-
diff --git a/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch b/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch
deleted file mode 100644
index cdb42b2ca5f..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-g_log_domain.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From deaa974528ac1f4099d091a333214b1a50147243 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 1 May 2013 00:39:42 +0200
-Subject: [PATCH] Prevent double escaping / error "stray ‘\’ in program"
-
----
- gegl/Makefile.am | 1 +
- 1 file changed, 1 insertion(+), 0 deletion(-)
-
-diff --git a/gegl/Makefile.am b/gegl/Makefile.am
-index 43010ce..fd046d2 100644
---- a/gegl/Makefile.am
-+++ b/gegl/Makefile.am
-@@ -119,7 +119,8 @@ INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS)
-
- Gegl-@GEGL_API_VERSION@.gir: libgegl-@GEGL_API_VERSION@.la Makefile
- Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
- Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
-+INTROSPECTION_SCANNER_ENV = CFLAGS="${CFLAGS} "-D'G_LOG_DOMAIN="GEGL-"__FILE__' # No extra backslashes here!
- Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
- Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources)
- INTROSPECTION_GIRS += Gegl-@GEGL_API_VERSION@.gir
---
-1.8.1.5
-
diff --git a/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch b/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch
deleted file mode 100644
index 1ac28dc6296..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-introspection-version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 35469116fbf0b398d748f8116e4dcc8bdaee12c7 Mon Sep 17 00:00:00 2001
-From: Jon Nordby <jononor@gmail.com>
-Date: Thu, 12 Apr 2012 12:10:05 +0000
-Subject: gobject-introspection: Fix build after 0.2.x version bump
-
-Remove hardcoding of version numbers so that this does
-not happen again.
----
-(limited to 'gegl/Makefile.am')
-
-diff --git a/gegl/Makefile.am b/gegl/Makefile.am
-index aef4c33..43010ce 100644
---- a/gegl/Makefile.am
-+++ b/gegl/Makefile.am
-@@ -118,10 +118,10 @@ introspection_sources = \
- INCLUDES = $(AM_CFLAGS) $(AM_CPPFLAGS)
-
- Gegl-@GEGL_API_VERSION@.gir: libgegl-@GEGL_API_VERSION@.la Makefile
--Gegl_0_1_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
--Gegl_0_1_gir_CFLAGS = $(INCLUDES)
--Gegl_0_1_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
--Gegl_0_1_gir_FILES = $(introspection_sources)
-+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_INCLUDES = GObject-2.0 GLib-2.0 Babl-0.1
-+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_CFLAGS = $(INCLUDES)
-+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_LIBS = libgegl-@GEGL_API_VERSION@.la
-+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources)
- INTROSPECTION_GIRS += Gegl-@GEGL_API_VERSION@.gir
-
- girdir = $(datadir)/gir-1.0
---
-cgit v0.9.1
diff --git a/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch b/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
deleted file mode 100644
index ec122703955..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-libopenraw-0.1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1ad5d7656891f53b76efd6783d75d14b9cbb4daa Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 4 Dec 2017 21:18:56 +0100
-Subject: [PATCH] Support (and require) libopenraw 0.1.0+
-
----
- configure.ac | 4 ++--
- operations/external/openraw.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 30d306e..febdddb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -47,7 +47,7 @@ m4_define([lensfun_required_version], [0.2.5])
- m4_define([librsvg_required_version], [2.14.0])
- m4_define([lua_required_version], [5.1.0])
- m4_define([openexr_required_version], [0.0.0])
--m4_define([openraw_required_version], [0.0.5])
-+m4_define([openraw_required_version], [0.1.0])
- m4_define([pango_required_version], [0.0.0])
- m4_define([pangocairo_required_version], [0.0.0])
- m4_define([png_required_version], [0.0.0])
-@@ -790,7 +790,7 @@ AC_ARG_WITH(libopenraw, [ --without-libopenraw build without openraw support
-
- have_libopenraw="no"
- if test "x$with_libopenraw" != "xno"; then
-- PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= openraw_required_version,
-+ PKG_CHECK_MODULES(OPENRAW, libopenraw-0.1 >= openraw_required_version,
- have_libopenraw="yes",
- have_libopenraw="no (openraw library not found)")
- fi
-diff --git a/operations/external/openraw.c b/operations/external/openraw.c
-index 9fc1e95..b4b4a13 100644
---- a/operations/external/openraw.c
-+++ b/operations/external/openraw.c
-@@ -116,7 +116,7 @@ load_buffer (GeglOperation *operation)
- goto clean_file;
- }
-
-- if(or_rawdata_format (rawdata) != OR_DATA_TYPE_CFA)
-+ if(or_rawdata_format (rawdata) != OR_DATA_TYPE_RAW)
- {
- goto clean_file;
- }
---
-2.15.0
-
diff --git a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
deleted file mode 100644
index 00e936ce68e..00000000000
--- a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From bedd95f5f14524360117209ed6a1a83627523f54 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 10 May 2017 17:33:05 +0200
-Subject: [PATCH] Backport $(MATH_LIB) patch to GEGL 0.2
-
-Source:
-https://git.gnome.org/browse/gegl/patch/?id=c9bbc815378cb81ba8a48be35f615e7e2d74dffc
----
- bin/Makefile.am | 2 +-
- examples/Makefile.am | 2 +-
- tools/Makefile.am | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/bin/Makefile.am b/bin/Makefile.am
-index c85ecbd..08a156b 100644
---- a/bin/Makefile.am
-+++ b/bin/Makefile.am
-@@ -23,7 +23,7 @@ AM_CFLAGS = \
-
- AM_LDFLAGS = \
- $(no_undefined) ../gegl/libgegl-$(GEGL_API_VERSION).la \
-- $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO)
-+ $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) $(MATH_LIB)
-
- bin_PROGRAMS = gegl
-
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index c29a1dd..5c4ac3a 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -42,4 +42,4 @@ AM_CFLAGS = $(DEP_CFLAGS) $(GTK_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
-
- AM_LDFLAGS = \
- $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
-- $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS)
-+ $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(MATH_LIB)
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 8f1077d..4dd3845 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -22,7 +22,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
-
- AM_LDFLAGS = \
- $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
-- $(DEP_LIBS) $(BABL_LIBS)
-+ $(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB)
-
- noinst_PROGRAMS = introspect operation_reference img_cmp
-
-diff --git a/tests/buffer/Makefile.am b/tests/buffer/Makefile.am
-index d62ce71..0a4df53 100644
---- a/tests/buffer/Makefile.am
-+++ b/tests/buffer/Makefile.am
-@@ -30,7 +30,7 @@ AM_CFLAGS = $(DEP_CFLAGS) $(BABL_CFLAGS)
-
- buffer_test_LDADD = \
- $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
-- $(DEP_LIBS) $(BABL_LIBS)
-+ $(DEP_LIBS) $(BABL_LIBS) $(MATH_LIB)
-
-
- # Our custom target rules
---
-2.12.2
-
diff --git a/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch b/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch
deleted file mode 100644
index c886419925a..00000000000
--- a/media-libs/gegl/files/gegl-0.3.12-failing-tests.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From e3ffef75aabd2d078cf341124ba42ce7673419b3 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 22 Mar 2017 19:59:38 +0100
-Subject: [PATCH] Disable failing tests
-
-https://bugs.gentoo.org/show_bug.cgi?id=595332#c3
----
- tests/simple/Makefile.am | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/simple/Makefile.am b/tests/simple/Makefile.am
-index e28680a..aa7efd8 100644
---- a/tests/simple/Makefile.am
-+++ b/tests/simple/Makefile.am
-@@ -15,7 +15,6 @@ noinst_PROGRAMS = \
- test-gegl-rectangle \
- test-gegl-color \
- test-gegl-tile \
-- test-image-compare \
- test-license-check \
- test-misc \
- test-node-connections \
-@@ -23,7 +22,6 @@ noinst_PROGRAMS = \
- test-node-properties \
- test-object-forked \
- test-opencl-colors \
-- test-serialize \
- test-path \
- test-proxynop-processing \
- test-scaled-blit \
---
-2.12.0
-
diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch
deleted file mode 100644
index fc8027f08ae..00000000000
--- a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 8f2545886ce3be8f1b1229bddcfa5af3216110d3 Mon Sep 17 00:00:00 2001
-From: Franz Brausse <brausse@informatik.uni-trier.de>
-Date: Sun, 6 May 2018 13:38:09 +0200
-Subject: operations/external/ff-save: ffmpeg-4.0 compat; fixes #795625
-
----
- operations/external/ff-save.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
-index 90b6162..e7edd3e 100644
---- a/operations/external/ff-save.c
-+++ b/operations/external/ff-save.c
-@@ -88,6 +88,11 @@ property_int (me_subpel_quality, _("me-subpel-quality"), 0)
- #include <libavutil/opt.h>
- #include <libswscale/swscale.h>
-
-+/* remove if libavcodec_required_version is changed to > 56.41.100 */
-+#if LIBAVCODEC_VERSION_INT <= AV_VERSION_INT(56,41,100)
-+# define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#endif
-+
- typedef struct
- {
- gdouble frame;
-@@ -290,7 +295,7 @@ add_audio_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
- c->codec_type = AVMEDIA_TYPE_AUDIO;
-
- if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
- return st;
- }
-@@ -699,7 +704,9 @@ open_video (GeglProperties *o, AVFormatContext * oc, AVStream * st)
- }
-
- p->video_outbuf = NULL;
-+#if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
- if (!(oc->oformat->flags & AVFMT_RAWPICTURE))
-+#endif
- {
- /* allocate output buffer, 1 mb / frame, might fail for some codecs on UHD - but works for now */
- p->video_outbuf_size = 1024 * 1024;
-@@ -803,6 +810,7 @@ write_video_frame (GeglProperties *o,
- picture_ptr = p->picture;
- picture_ptr->pts = p->frame_count;
-
-+ #if (LIBAVFORMAT_VERSION_MAJOR < 58) /* AVFMT_RAWPICTURE got removed from ffmpeg: "not used anymore" */
- if (oc->oformat->flags & AVFMT_RAWPICTURE)
- {
- /* raw video case. The API will change slightly in the near
-@@ -821,6 +829,7 @@ write_video_frame (GeglProperties *o,
- ret = av_write_frame (oc, &pkt);
- }
- else
-+#endif
- {
- /* encode the image */
- AVPacket pkt2;
---
-cgit v0.12
-
diff --git a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch b/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch
deleted file mode 100644
index 260ff3b2c1a..00000000000
--- a/media-libs/gegl/files/gegl-0.4.0-ffmpeg-4-0-compat-2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2896800b5e7d0c656710c70fdea57098032f3ccc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
-Date: Sun, 6 May 2018 15:09:03 +0200
-Subject: ff-save: update another occurance of CODEC_FLAG_GLOBAL_HEADER
-
----
- operations/external/ff-save.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c
-index 1edac31..f30bf10 100644
---- a/operations/external/ff-save.c
-+++ b/operations/external/ff-save.c
-@@ -638,7 +638,7 @@ add_video_stream (GeglProperties *o, AVFormatContext * oc, int codec_id)
- #endif
-
- if (oc->oformat->flags & AVFMT_GLOBALHEADER)
-- c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
- return st;
- }
---
-cgit v0.12
-
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
deleted file mode 100644
index 609ff11bae2..00000000000
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WANT_AUTOMAKE=1.11 # see bug 471990, comment 3
-# vala and introspection support is broken, bug #468208
-#VALA_MIN_API_VERSION=0.14
-#VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools #vala
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="cairo debug ffmpeg jpeg lensfun cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
-
-RDEPEND="
- >=media-libs/babl-0.1.10
- >=dev-libs/glib-2.28:2
- >=x11-libs/gdk-pixbuf-2.18:2
- x11-libs/pango
- sys-libs/zlib
- cairo? ( x11-libs/cairo )
- ffmpeg? ( >=media-video/ffmpeg-4:0= )
- jpeg? ( virtual/jpeg:0 )
- openexr? ( media-libs/openexr )
- png? ( media-libs/libpng:0= )
- raw? ( >=media-libs/libopenraw-0.1:0= )
- sdl? ( media-libs/libsdl )
- svg? ( >=gnome-base/librsvg-2.14:2 )
- umfpack? ( sci-libs/umfpack )
- lensfun? ( >=media-libs/lensfun-0.2.5 )
-"
-# >=media-libs/babl-0.1.10[introspection?]
-# introspection? ( >=dev-libs/gobject-introspection-0.10
-# >=dev-python/pygobject-2.26:2 )
-DEPEND="${RDEPEND}
- >=dev-util/intltool-0.40.1
- dev-lang/perl
- virtual/pkgconfig
- >=sys-devel/libtool-2.2
-"
-# vala? ( $(vala_depend) )"
-
-DOCS=( ChangeLog INSTALL README NEWS )
-
-PATCHES=(
- # https://bugs.gentoo.org/show_bug.cgi?id=636780
- "${FILESDIR}/${P}-ffmpeg-av_frame_alloc.patch"
-
- # https://bugs.gentoo.org/show_bug.cgi?id=442016
- "${FILESDIR}/${P}-cve-2012-4433-1e92e523.patch"
- "${FILESDIR}/${P}-cve-2012-4433-4757cdf7.patch"
-
- # https://bugs.gentoo.org/show_bug.cgi?id=416587
- "${FILESDIR}/${P}-introspection-version.patch"
-
- "${FILESDIR}/${P}-ffmpeg-0.11.diff"
- "${FILESDIR}"/${P}-g_log_domain.patch
-
- # https://bugs.gentoo.org/show_bug.cgi?id=605216
- # https://bugs.gentoo.org/show_bug.cgi?id=617430
- "${FILESDIR}"/${P}-underlinking.patch
- "${FILESDIR}"/${P}-libopenraw-0.1.patch # bug 639834
- "${FILESDIR}"/${P}-fix-without-exiv2.patch # bug 641872
-
- "${FILESDIR}"/${P}-ffmpeg-4-0-compat.patch # bug 673378
-)
-
-src_prepare() {
- default
- # 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
- fi
-
- eautoreconf
-
- # https://bugs.gentoo.org/show_bug.cgi?id=468248
- local deps_file="${PN}/${PN}-$(get_version_component_range 1-2).deps"
- [[ -f "${deps_file}" ]] || touch "${deps_file}"
-
-# use vala && vala_src_prepare
-}
-
-src_configure() {
- # never enable altering of CFLAGS via profile option
- # libspiro: not in portage main tree
- # disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
-
- # Also please note that:
- #
- # - Some auto-detections are not patched away since the docs are
- # not built (--disable-docs, lack of --enable-gtk-doc) and these
- # tools affect re-generation of docs, only
- # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
- #
- # - Parameter --with-exiv2 compiles a noinst-app only, no use
- #
- # - Parameter --disable-workshop disables any use of Lua, effectivly
- #
- # - 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
- #
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- #
- # So that's why USE="exif graphviz lua v4l" got resolved. More at:
- # https://bugs.gentoo.org/show_bug.cgi?id=451136
- #
- econf \
- --disable-profile \
- --without-libspiro \
- --disable-docs --disable-workshop \
- --with-pango --with-gdk-pixbuf \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable debug) \
- $(use_with cairo) \
- $(use_with cairo pangocairo) \
- --without-exiv2 \
- $(use_with ffmpeg libavformat) \
- --without-graphviz \
- $(use_with jpeg libjpeg) \
- --without-jasper \
- --without-lua \
- $(use_with openexr) \
- $(use_with png libpng) \
- $(use_with raw libopenraw) \
- $(use_with sdl) \
- $(use_with svg librsvg) \
- $(use_with umfpack) \
- --without-libv4l \
- $(use_with lensfun) \
- --disable-introspection \
- --without-vala
-# $(use_enable introspection) \
-# $(use_with vala)
-}
-
-src_test() {
- gnome2_environment_reset # sandbox issues
- default
-}
-
-src_compile() {
- gnome2_environment_reset # sandbox issues (bug #396687)
- default
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete
-}
diff --git a/media-libs/gegl/gegl-0.3.34-r1.ebuild b/media-libs/gegl/gegl-0.3.34-r1.ebuild
deleted file mode 100644
index e2bac3fc2fa..00000000000
--- a/media-libs/gegl/gegl-0.3.34-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit gnome2-utils eutils autotools python-any-r1 vala
-
-SRC_URI="http://download.gimp.org/pub/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0.3"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-RESTRICT="!test? ( test )"
-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="
- >=dev-libs/glib-2.44:2
- dev-libs/json-glib
- >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?]
- sys-libs/zlib
- >=x11-libs/gdk-pixbuf-2.32:2
- x11-libs/pango
-
- cairo? ( >=x11-libs/cairo-1.12.2 )
- ffmpeg? ( >=media-video/ffmpeg-2.8:0= )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- virtual/jpeg:0=
- lcms? ( >=media-libs/lcms-2.8:2 )
- lensfun? ( >=media-libs/lensfun-0.2.5 )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- >=media-libs/libpng-1.6.0:0=
- 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:= )
-"
-
-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}]') )
- vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
- use test && use introspection && python-any-r1_pkg_setup
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
- "${FILESDIR}"/${PN}-0.3.34-failing-tests.patch # bug 631930, 686202
- "${FILESDIR}"/${PN}-0.3.34-fno-common.patch # bug 719198
- "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch # bug 654172
- "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch # bug 654172
-)
-
-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
- 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/Makefile.am || die
-
- eautoreconf
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # never enable altering of CFLAGS via profile option
- # libspiro: not in portage main tree
- # disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
-
- # Also please note that:
- #
- # - Some auto-detections are not patched away since the docs are
- # not built (--disable-docs, lack of --enable-gtk-doc) and these
- # tools affect re-generation of docs, only
- # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
- #
- # - Parameter --with-exiv2 compiles a noinst-app only, no use
- #
- # - Parameter --disable-workshop disables any use of Lua, effectivly
- #
- # - 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
- #
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- #
- # - mrg is not in tree and gexiv2 support only has effect when mrg support
- # is enabled
- #
- # So that's why USE="exif graphviz lua v4l" got resolved. More at:
- # https://bugs.gentoo.org/show_bug.cgi?id=451136
- #
- econf \
- --disable-docs \
- --disable-profile \
- --disable-workshop \
- --program-suffix=-${SLOT} \
- --with-gdk-pixbuf \
- --with-pango \
- --without-exiv2 \
- --without-gexiv2 \
- --without-graphviz \
- --without-jasper \
- --without-libspiro \
- --without-lua \
- --without-mrg \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable debug) \
- $(use_with cairo) \
- $(use_with cairo pangocairo) \
- $(use_with ffmpeg libavformat) \
- $(use_with lcms) \
- $(use_with lensfun) \
- $(use_with openexr) \
- $(use_with raw libraw) \
- $(use_with sdl) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with umfpack) \
- $(use_with v4l libv4l) \
- $(use_with v4l libv4l2) \
- $(use_enable introspection) \
- $(use_with vala) \
- $(use_with webp)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
deleted file mode 100644
index 9808f9fd781..00000000000
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit versionator gnome2-utils eutils autotools ltprune python-any-r1 vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit autotools 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 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="http://www.gegl.org/"
-
-LICENSE="|| ( GPL-3 LGPL-3 )"
-SLOT="0.3"
-
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
-RESTRICT="!test? ( test )"
-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
- >=media-libs/babl-0.1.46
- sys-libs/zlib
- >=x11-libs/gdk-pixbuf-2.32:2
- x11-libs/pango
-
- cairo? ( >=x11-libs/cairo-1.12.2 )
- ffmpeg? ( >=media-video/ffmpeg-2.8:0= )
- introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- virtual/jpeg:0=
- lcms? ( >=media-libs/lcms-2.8:2 )
- lensfun? ( >=media-libs/lensfun-0.2.5 )
- openexr? ( >=media-libs/openexr-1.6.1:= )
- >=media-libs/libpng-1.6.0:0=
- 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:= )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- dev-lang/perl
- virtual/pkgconfig
- >=sys-devel/libtool-2.2
- test? ( introspection? (
- $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
- vala? ( $(vala_depend) )
-"
-
-pkg_setup() {
- use test && use introspection && python-any-r1_pkg_setup
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
- "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch # bug 654172
- "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch # bug 654172
-)
-
-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
- 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/Makefile.am || die
-
- eautoreconf
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # never enable altering of CFLAGS via profile option
- # libspiro: not in portage main tree
- # disable documentation as the generating is bit automagic
- # if anyone wants to work on it just create bug with patch
-
- # Also please note that:
- #
- # - Some auto-detections are not patched away since the docs are
- # not built (--disable-docs, lack of --enable-gtk-doc) and these
- # tools affect re-generation of docs, only
- # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
- #
- # - Parameter --with-exiv2 compiles a noinst-app only, no use
- #
- # - Parameter --disable-workshop disables any use of Lua, effectivly
- #
- # - 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
- #
- # - There are two checks for dot, one controllable by --with(out)-graphviz
- # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
- #
- # - mrg is not in tree and gexiv2 support only has effect when mrg support
- # is enabled
- #
- # So that's why USE="exif graphviz lua v4l" got resolved. More at:
- # https://bugs.gentoo.org/show_bug.cgi?id=451136
- #
- econf \
- --disable-docs \
- --disable-profile \
- --disable-workshop \
- --program-suffix=-${SLOT} \
- --with-gdk-pixbuf \
- --with-pango \
- --without-libspiro \
- $(use_enable cpu_flags_x86_mmx mmx) \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable debug) \
- $(use_with cairo) \
- $(use_with cairo pangocairo) \
- --without-exiv2 \
- $(use_with ffmpeg libavformat) \
- --without-gexiv2 \
- --without-graphviz \
- --without-jasper \
- $(use_with lcms) \
- $(use_with lensfun) \
- --without-lua \
- --without-mrg \
- $(use_with openexr) \
- $(use_with raw libraw) \
- $(use_with sdl) \
- $(use_with svg librsvg) \
- $(use_with tiff libtiff) \
- $(use_with umfpack) \
- $(use_with v4l libv4l) \
- $(use_with v4l libv4l2) \
- $(use_enable introspection) \
- $(use_with vala) \
- $(use_with webp)
-}
-
-src_compile() {
- default
-
- [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
-}
-
-src_install() {
- default
- prune_libtool_files --all
-}
diff --git a/media-libs/gegl/gegl-0.4.16-r1.ebuild b/media-libs/gegl/gegl-0.4.16-r1.ebuild
deleted file mode 100644
index cff23c4d482..00000000000
--- a/media-libs/gegl/gegl-0.4.16-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-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.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-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 openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
-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="
- >=dev-libs/glib-2.44:2
- dev-libs/json-glib
- >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?]
- >=media-libs/libpng-1.6.0:0=
- virtual/jpeg:0=
- >=x11-libs/gdk-pixbuf-2.32:2
- 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-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 )
- 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:= )
- 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? ( ffmpeg? ( media-libs/gexiv2 )
- $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]')
- )
- vala? ( $(vala_depend) )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
-)
-
-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
- 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/Makefile.am || die
-
- eautoreconf
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- # 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
- # - 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.
- --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
- $(use_with v4l libv4l)
- $(use_with v4l libv4l2)
- $(use_with vala)
- $(use_with webp)
- $(use_with zlib)
- )
-
- 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-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
deleted file mode 100644
index 36861f4ba37..00000000000
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-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.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-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 openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
-RESTRICT="!test? ( test )"
-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
- >=media-libs/babl-0.1.62
- >=media-libs/libpng-1.6.0:0=
- virtual/jpeg:0=
- >=x11-libs/gdk-pixbuf-2.32:2
- 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-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 )
- 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:= )
- zlib? ( >=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) )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
-)
-
-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
- 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/Makefile.am || die
-
- eautoreconf
-
- gnome2_environment_reset
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- # 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
- # - 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.
- --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
- $(use_with v4l libv4l)
- $(use_with v4l libv4l2)
- $(use_with vala)
- $(use_with webp)
- $(use_with zlib)
- )
-
- 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
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2021-06-09 21:34 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2021-06-09 21:34 UTC (permalink / raw
To: gentoo-commits
commit: aa48d2b8434c6b1b5e68039270c001e5552e2028
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Jun 6 08:00:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 9 21:33:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa48d2b8
media-libs/gegl: fix USE="openexr" build against >=dev-libs/glib-2.67.3
Closes: https://bugs.gentoo.org/793998
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gegl-0.4.26-fix-build-glib-2.67.3.patch | 24 ++++++++++++++++++++++
media-libs/gegl/gegl-0.4.26-r1.ebuild | 3 ++-
media-libs/gegl/gegl-0.4.28.ebuild | 3 ++-
media-libs/gegl/gegl-0.4.30.ebuild | 2 +-
4 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
new file mode 100644
index 00000000000..00e1b8ab484
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
@@ -0,0 +1,24 @@
+From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001
+From: Olivier Tilloy <olivier.tilloy@canonical.com>
+Date: Fri, 5 Mar 2021 12:58:18 +0100
+Subject: [PATCH] Fix build with glib 2.67.3 (see
+ https://gitlab.gnome.org/GNOME/glib/-/issues/2331).
+
+---
+ operations/external/exr-load.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp
+index e864f7e3e..28403639c 100644
+--- a/operations/external/exr-load.cpp
++++ b/operations/external/exr-load.cpp
+@@ -29,9 +29,7 @@ property_file_path (path, "File", "")
+ #define GEGL_OP_NAME exr_load
+ #define GEGL_OP_C_FILE "exr-load.cpp"
+
+-extern "C" {
+ #include "gegl-op.h"
+-}
+
+ #include <ImfInputFile.h>
+ #include <ImfChannelList.h>
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild
index 5185fcb9f8e..bc7777e314b 100644
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )"
# 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/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
media-libs/libnsgif
@@ -78,6 +78,7 @@ 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}-fix-build-glib-2.67.3.patch
)
python_check_deps() {
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild
index 6efb79792de..ba46251dad9 100644
--- a/media-libs/gegl/gegl-0.4.28.ebuild
+++ b/media-libs/gegl/gegl-0.4.28.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )"
# 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/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
media-libs/libnsgif
@@ -78,6 +78,7 @@ 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.26-fix-build-glib-2.67.3.patch
)
python_check_deps() {
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild
index db958e5516e..62fe72b1c9a 100644
--- a/media-libs/gegl/gegl-0.4.30.ebuild
+++ b/media-libs/gegl/gegl-0.4.30.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )"
# 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/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
media-libs/libnsgif
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2021-06-09 21:34 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2021-06-09 21:34 UTC (permalink / raw
To: gentoo-commits
commit: 9933f6370e9e1af96dad6f922449da5988e2a576
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sun Jun 6 08:03:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 9 21:33:57 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9933f637
media-libs/gegl: fix USE="openexr" build against media-libs/openexr-3.0.1
Closes: https://bugs.gentoo.org/788400
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/21135
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/gegl-0.4.30-fix-build-openexr-3.patch | 22 ++++++++++++++++++++++
media-libs/gegl/gegl-0.4.26-r1.ebuild | 1 +
media-libs/gegl/gegl-0.4.28.ebuild | 1 +
media-libs/gegl/gegl-0.4.30.ebuild | 4 ++++
4 files changed, 28 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
new file mode 100644
index 00000000000..e0e938acc22
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
@@ -0,0 +1,22 @@
+From 499a239d158fadb3a04499255b5b282a8a6023bb Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 10:51:09 +0000
+Subject: [PATCH] Fix build with OpenEXR 3
+
+Add a header that is no longer transitively included
+---
+ operations/external/exr-save.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc
+index 1e8c09d96..87abed511 100644
+--- a/operations/external/exr-save.cc
++++ b/operations/external/exr-save.cc
+@@ -45,6 +45,7 @@ extern "C" {
+ #include <ImfChromaticities.h>
+ #include <ImfStandardAttributes.h>
+ #include <ImfArray.h>
++#include <ImfFrameBuffer.h>
+ #include "ImathRandom.h"
+
+
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild
index bc7777e314b..71107e34e87 100644
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
"${FILESDIR}"/${P}-fix-build-glib-2.67.3.patch
+ "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
)
python_check_deps() {
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild
index ba46251dad9..db9f50a4fb7 100644
--- a/media-libs/gegl/gegl-0.4.28.ebuild
+++ b/media-libs/gegl/gegl-0.4.28.ebuild
@@ -79,6 +79,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
"${FILESDIR}"/${PN}-0.4.26-fix-build-glib-2.67.3.patch
+ "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
)
python_check_deps() {
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild
index 62fe72b1c9a..0f6d0b73825 100644
--- a/media-libs/gegl/gegl-0.4.30.ebuild
+++ b/media-libs/gegl/gegl-0.4.30.ebuild
@@ -75,6 +75,10 @@ BDEPEND="
DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-build-openexr-3.patch
+)
+
python_check_deps() {
use test || return 0
has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2022-03-15 4:20 John Helmert III
0 siblings, 0 replies; 19+ messages in thread
From: John Helmert III @ 2022-03-15 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 3ed3104af9d0bc7b2aaccaa0a423f0522b91ab10
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Mon Mar 14 19:18:25 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 04:05:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ed3104a
media-libs/gegl: drop <gegl-0.4.34, CVE-2021-45463 affected
Bug: https://bugs.gentoo.org/829880
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
media-libs/gegl/Manifest | 4 -
.../files/gegl-0.4.18-drop-failing-tests.patch | 43 ------
.../gegl/files/gegl-0.4.18-program-suffix.patch | 39 -----
.../files/gegl-0.4.26-fix-build-glib-2.67.3.patch | 24 ---
.../files/gegl-0.4.30-fix-build-openexr-3.patch | 22 ---
media-libs/gegl/gegl-0.4.26-r1.ebuild | 167 ---------------------
media-libs/gegl/gegl-0.4.28.ebuild | 167 ---------------------
media-libs/gegl/gegl-0.4.30.ebuild | 161 --------------------
media-libs/gegl/gegl-0.4.32.ebuild | 157 -------------------
9 files changed, 784 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 4f6f2f0f4657..b97cbb75d489 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,6 +1,2 @@
-DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
-DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
-DIST gegl-0.4.30.tar.xz 5398052 BLAKE2B c57b34ed64d3b9305d3e639b872c283bd4c9c798d13f7bde49b991044139bb4e433a3adb0a9e991b78b2905985496ca3bf4ed116333ceaaccc043b8a66426131 SHA512 73db2d18260ba061fbbc2adb3256ea9d5b822b57f5654cc3aefb59e7afeeb2e4f0fd7e95ac14603c0a549935df04d5744001089efb378511c914c68664dbd378
-DIST gegl-0.4.32.tar.xz 5633796 BLAKE2B a4ba5d19291a61c6903dcc368e6cc3e1934e8d89b555e81afd22709504fbb8a7ed104890af5f1e7bfbdd5664caef8f5e015341c7882f2171ecb518afe32a65ef SHA512 68da02b8df0a1d234063958896f3678ead62772e611bddb39a6f21ec58cc744599d0a691224c057f2da4d04f2ccfb155a545deea92e77c728dbaeeb90e68cad6
DIST gegl-0.4.34.tar.xz 5647516 BLAKE2B 7d9e0c395e6bf38e407ed55f43c090789e29692254990a341e7b9a391ae67423a9948821c1b8a4dd156fb42c16fe6b8572de2ee7b5be09b9f802b892e82df580 SHA512 13bbc19c4fb1feee609d2191b09fe1d2f020da1be788f9dcf7ed89dfef8465ce77dc34a9cb74279c88336aa0f3d3a7a44ca35335a3c2374516f590a40edbc08e
DIST gegl-0.4.36.tar.xz 5680876 BLAKE2B e2051d21eadfd6ff5c4547d337e749ebb9526be0b45bf80116cfdd1bb98b0fd3b4cced83b4700ecb04c003f83074928ac0c7b4bc8929134c57950a1ac957d50b SHA512 4d681091b15e7911229f86bf22381d62268451da57bba072bcb8ee3f4db79e2719dd7e70ab208c2c021e5353f42a9f88c18f62132512b18fe78ed6ad279660f8
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
deleted file mode 100644
index 4be09057d896..000000000000
--- a/media-libs/gegl/files/gegl-0.4.18-drop-failing-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From a1dd28e7e7c022c4e887006311c916fe5d9e4c0e Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-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
deleted file mode 100644
index be4498ccee4a..000000000000
--- a/media-libs/gegl/files/gegl-0.4.18-program-suffix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From eeecf286efb312709e43341eaadc64eb006bc6bf Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-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/files/gegl-0.4.26-fix-build-glib-2.67.3.patch b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
deleted file mode 100644
index 00e1b8ab4845..000000000000
--- a/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001
-From: Olivier Tilloy <olivier.tilloy@canonical.com>
-Date: Fri, 5 Mar 2021 12:58:18 +0100
-Subject: [PATCH] Fix build with glib 2.67.3 (see
- https://gitlab.gnome.org/GNOME/glib/-/issues/2331).
-
----
- operations/external/exr-load.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp
-index e864f7e3e..28403639c 100644
---- a/operations/external/exr-load.cpp
-+++ b/operations/external/exr-load.cpp
-@@ -29,9 +29,7 @@ property_file_path (path, "File", "")
- #define GEGL_OP_NAME exr_load
- #define GEGL_OP_C_FILE "exr-load.cpp"
-
--extern "C" {
- #include "gegl-op.h"
--}
-
- #include <ImfInputFile.h>
- #include <ImfChannelList.h>
diff --git a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
deleted file mode 100644
index e0e938acc22e..000000000000
--- a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 499a239d158fadb3a04499255b5b282a8a6023bb Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Sat, 24 Apr 2021 10:51:09 +0000
-Subject: [PATCH] Fix build with OpenEXR 3
-
-Add a header that is no longer transitively included
----
- operations/external/exr-save.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc
-index 1e8c09d96..87abed511 100644
---- a/operations/external/exr-save.cc
-+++ b/operations/external/exr-save.cc
-@@ -45,6 +45,7 @@ extern "C" {
- #include <ImfChromaticities.h>
- #include <ImfStandardAttributes.h>
- #include <ImfArray.h>
-+#include <ImfFrameBuffer.h>
- #include "ImathRandom.h"
-
-
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild
deleted file mode 100644
index 71107e34e87e..000000000000
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-# 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="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://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"
-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="
- >=dev-libs/glib-2.68.2:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
- 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
- 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:= )
- 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:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- 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}]') )
- 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}"/${P}-fix-build-glib-2.67.3.patch
- "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
-)
-
-python_check_deps() {
- use test || return 0
- has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-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
-
- # 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
-
- # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
- pushd "${S}/opencl/" || die
- for file in *.cl; do
- if [ -f "$file" ]; then
- "${EPYTHON}" cltostring.py "${file}" || die
- fi
- done
- popd || 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
- -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
- -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 pdf poppler)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(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-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild
deleted file mode 100644
index 6952d3f4fa8c..000000000000
--- a/media-libs/gegl/gegl-0.4.28.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-# 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="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://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"
-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="
- >=dev-libs/glib-2.68.2:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
- 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
- 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:= )
- 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:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- 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}]') )
- 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.26-fix-build-glib-2.67.3.patch
- "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
-)
-
-python_check_deps() {
- use test || return 0
- has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-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
-
- # 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
-
- # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
- pushd "${S}/opencl/" || die
- for file in *.cl; do
- if [ -f "$file" ]; then
- "${EPYTHON}" cltostring.py "${file}" || die
- fi
- done
- popd || 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
- -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
- -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 pdf poppler)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(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-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild
deleted file mode 100644
index 6aacb2afe2a3..000000000000
--- a/media-libs/gegl/gegl-0.4.30.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson optfeature 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="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://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"
-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="
- >=dev-libs/glib-2.68.2:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
- 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
- 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:= )
- 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:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- 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}]') )
- vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-build-openexr-3.patch
-)
-
-python_check_deps() {
- use test || return 0
- has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-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
- 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
-
- # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
- pushd "${S}/opencl/" || die
- for file in *.cl; do
- if [[ -f ${file} ]]; then
- "${EPYTHON}" cltostring.py "${file}" || die
- fi
- done
- popd || die
-
- 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
- -Dexiv2=disabled
- -Dgdk-pixbuf=enabled
- -Djasper=disabled
- # - 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 pdf poppler)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(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
-}
-
-pkg_postinst() {
- optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
-}
diff --git a/media-libs/gegl/gegl-0.4.32.ebuild b/media-libs/gegl/gegl-0.4.32.ebuild
deleted file mode 100644
index dab149b166ad..000000000000
--- a/media-libs/gegl/gegl-0.4.32.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit meson optfeature 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="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://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"
-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="
- >=dev-libs/glib-2.68.2:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.88[introspection?,lcms?,vala?]
- 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
- 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:= )
- 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:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- 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}]') )
- vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
-
-python_check_deps() {
- use test || return 0
- has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-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
- 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
-
- # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
- pushd "${S}/opencl/" || die
- for file in *.cl; do
- if [[ -f ${file} ]]; then
- "${EPYTHON}" cltostring.py "${file}" || die
- fi
- done
- popd || die
-
- 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
- -Dexiv2=disabled
- -Dgdk-pixbuf=enabled
- -Djasper=disabled
- # - 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 pdf poppler)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(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
-}
-
-pkg_postinst() {
- optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2022-12-21 23:52 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2022-12-21 23:52 UTC (permalink / raw
To: gentoo-commits
commit: 1b67509015dbe51f15a0c7d3f4c316826dc927de
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 23:46:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 23:52:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b675090
media-libs/gegl: fix -Wstrict-prototypes
Signed-off-by: Carlos Eduardo <carana2099 <AT> gmail.com>
Closes: https://bugs.gentoo.org/883313
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../gegl/files/gegl-0.4.40-strict-prototypes.patch | 79 ++++++++++++++++++++++
media-libs/gegl/gegl-0.4.40-r1.ebuild | 4 ++
2 files changed, 83 insertions(+)
diff --git a/media-libs/gegl/files/gegl-0.4.40-strict-prototypes.patch b/media-libs/gegl/files/gegl-0.4.40-strict-prototypes.patch
new file mode 100644
index 000000000000..6982afa4d7b0
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.40-strict-prototypes.patch
@@ -0,0 +1,79 @@
+https://bugs.gentoo.org/883313
+https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/132
+--- a/gegl/graph/gegl-region-generic.c
++++ b/gegl/graph/gegl-region-generic.c
+@@ -910,7 +910,7 @@ miRegionOp (GeglRegion *newReg,
+ top = MAX (r1->y1, ybot);
+ bot = MIN (r1->y2, r2->y1);
+
+- if ((top != bot) && (nonOverlap1Fn != (void (*)())NULL))
++ if ((top != bot) && (nonOverlap1Fn != (void (*)(void))NULL))
+ {
+ (*nonOverlap1Fn)(newReg, r1, r1BandEnd, top, bot);
+ }
+@@ -922,7 +922,7 @@ miRegionOp (GeglRegion *newReg,
+ top = MAX (r2->y1, ybot);
+ bot = MIN (r2->y2, r1->y1);
+
+- if ((top != bot) && (nonOverlap2Fn != (void (*)())NULL))
++ if ((top != bot) && (nonOverlap2Fn != (void (*)(void))NULL))
+ {
+ (*nonOverlap2Fn)(newReg, r2, r2BandEnd, top, bot);
+ }
+--- a/operations/common/ctx/ctx.h
++++ b/operations/common/ctx/ctx.h
+@@ -6047,7 +6047,6 @@ int _ctx_is_rasterizer (Ctx *ctx);
+
+ int ctx_color (Ctx *ctx, const char *string);
+ typedef struct _CtxState CtxState;
+-CtxColor *ctx_color_new ();
+ CtxState *ctx_get_state (Ctx *ctx);
+ void ctx_color_get_rgba (CtxState *state, CtxColor *color, float *out);
+ void ctx_color_set_rgba (CtxState *state, CtxColor *color, float r, float g, float b, float a);
+@@ -11081,7 +11080,6 @@ static void
+ ctx_matrix_set (CtxMatrix *matrix, float a, float b, float c, float d, float e, float f, float g, float h, float i);
+
+
+-static void ctx_font_setup ();
+ static float ctx_state_get (CtxState *state, uint32_t hash);
+
+ #if CTX_RASTERIZER
+@@ -40708,9 +40706,9 @@ static void ctx_events_deinit (Ctx *ctx)
+ #if CTX_TERMINAL_EVENTS
+
+
+-static int mice_has_event ();
+-static char *mice_get_event ();
+-static void mice_destroy ();
++static int mice_has_event (void);
++static char *mice_get_event (void);
++static void mice_destroy (void);
+ static int mice_get_fd (EvSource *ev_source);
+ static void mice_set_coord (EvSource *ev_source, double x, double y);
+
+@@ -40759,13 +40757,13 @@ static int mmm_evsource_mice_init ()
+ return 0;
+ }
+
+-static void mice_destroy ()
++static void mice_destroy (void)
+ {
+ if (mrg_mice_this->fd != -1)
+ close (mrg_mice_this->fd);
+ }
+
+-static int mice_has_event ()
++static int mice_has_event (void)
+ {
+ struct timeval tv;
+ int retval;
+@@ -40783,7 +40781,7 @@ static int mice_has_event ()
+ return 0;
+ }
+
+-static char *mice_get_event ()
++static char *mice_get_event (void)
+ {
+ const char *ret = "pm";
+ double relx, rely;
+
diff --git a/media-libs/gegl/gegl-0.4.40-r1.ebuild b/media-libs/gegl/gegl-0.4.40-r1.ebuild
index a99b95054c29..bcb10baa5cb6 100644
--- a/media-libs/gegl/gegl-0.4.40-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.40-r1.ebuild
@@ -76,6 +76,10 @@ BDEPEND="
DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.4.40-strict-prototypes.patch
+)
+
pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
}
^ permalink raw reply related [flat|nested] 19+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/
@ 2024-04-14 0:43 Sam James
0 siblings, 0 replies; 19+ messages in thread
From: Sam James @ 2024-04-14 0:43 UTC (permalink / raw
To: gentoo-commits
commit: 413ac744b37e0546a8b29ae914a7eca8c84a8b8d
Author: Sergey Torokhov <torokhov-s-a <AT> yandex <DOT> ru>
AuthorDate: Sat Apr 13 21:31:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 00:42:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=413ac744
media-libs/gegl: drop old 0.4.40-r1, 0.4.42-r1, 0.4.44
Signed-off-by: Sergey Torokhov <torokhov-s-a <AT> yandex.ru>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/gegl/Manifest | 3 -
.../gegl/files/gegl-0.4.40-libraw-0.21.patch | 26 ----
.../gegl/files/gegl-0.4.40-strict-prototypes.patch | 79 ----------
media-libs/gegl/gegl-0.4.40-r1.ebuild | 171 ---------------------
media-libs/gegl/gegl-0.4.42-r1.ebuild | 171 ---------------------
media-libs/gegl/gegl-0.4.44.ebuild | 167 --------------------
6 files changed, 617 deletions(-)
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index b65b2acd470b..d3eec31043bb 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,5 +1,2 @@
-DIST gegl-0.4.40.tar.xz 5784744 BLAKE2B c4466a76ec4f7939161e9ead6980b8a701f3fc459c40c3de3e09caa688aae12fb1f4a9979ca82e95011437f229532ba07012590d00aeb97b610b69968faa454f SHA512 99ace5f1b916e56f31483b60a38f885d0e09652c834122390bba4439d9bb1a137d84770e1518187330c44f3491e53393cfb8802ba9ede20658e1c8122e798888
-DIST gegl-0.4.42.tar.xz 5787100 BLAKE2B 6ae3ec98e72b1057b9d84551f56b675edb511994a73979bfccf559e24d3d636ba915aab10d3b3a1b38989d69c63692d3f312c621819700332c8cc1a4b3e86875 SHA512 29ccd93faa6127b6a9b1180eeba47f1b6f9bc06da8a5c9d68315d7474b77ff19d1084a6f4e7b218666b355329b17bc562f5906a334aa2baf93840d7caa0adf57
-DIST gegl-0.4.44.tar.xz 5791844 BLAKE2B dbbdca0ff9985025f528fe298df32672069c09dd87e22ab70330f078ca7fc7efb8b78f8f9077bb559eb61c790c5ab50c53853a1032fe00fbea7080d140baa28c SHA512 4dd3fad0c5e391fc1ac3784d4365ffdc483d37b90a24a29eaa632dd337971674999b2e0f8facf255d86852a3899cc51f4d27f9875ab5849f8b38d9ed5bb7413a
DIST gegl-0.4.46.tar.xz 5799248 BLAKE2B 2fc9ccd0c711cc901abd50740a24d0f75b162cbb196bdd62ab8430882da3b9ea72c08dd587ecfecaf5e4ba9aca4df51bcd7d98ec197325375b1d954c2995029e SHA512 cd733208da7dc1ec77ca023f03f47e578350e156ad07ece701b39f517a292e9f9c081b3a8a2db846813483b4ddb21f32f9fc8b9c70fea8a6ba27bb97ef8bb847
DIST gegl-0.4.48.tar.xz 5805488 BLAKE2B 3a800004f166fdbfbd563688bb71c4579bba132380f5f45496e8fb813943333b89781320230adf6e0ee49b9bde7db37d81929a8fd42e19e62281e7f8d1ea3bfb SHA512 8f47e6445062894c16d54eeeec4a55cccc32fc49c9fb9be3428a591daaeb21b1a5b8529a68d82613fd75f107bb8c0418c9e5337346bd94da3226e545189c226b
diff --git a/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch b/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch
deleted file mode 100644
index 84d80d96503c..000000000000
--- a/media-libs/gegl/files/gegl-0.4.40-libraw-0.21.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/887421
-https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/133
-
-From ef71b865a301514fcd13f50d421942f7b6b92d5e Mon Sep 17 00:00:00 2001
-From: Chris Mayo <aklhfex@gmail.com>
-Date: Wed, 21 Dec 2022 19:32:02 +0000
-Subject: [PATCH] raw-load: make compatible with LibRaw 0.21.0
-
-imgdata.params.shot_select moved to imgdata.rawparams.shot_select
-https://github.com/LibRaw/LibRaw/blob/979160ff13/Changelog.txt#L182
---- a/operations/external/raw-load.c
-+++ b/operations/external/raw-load.c
-@@ -114,7 +114,11 @@ prepare (GeglOperation *operation)
- g_warning ("raw-load: Error Initializing raw library");
- else
- {
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
-+ p->LibRaw->rawparams.shot_select = o->image_num;
-+#else
- p->LibRaw->params.shot_select = o->image_num;
-+#endif
-
- p->LibRaw->params.aber[0] = 1.0;
- p->LibRaw->params.aber[2] = 1.0;
---
-GitLab
diff --git a/media-libs/gegl/files/gegl-0.4.40-strict-prototypes.patch b/media-libs/gegl/files/gegl-0.4.40-strict-prototypes.patch
deleted file mode 100644
index 6982afa4d7b0..000000000000
--- a/media-libs/gegl/files/gegl-0.4.40-strict-prototypes.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-https://bugs.gentoo.org/883313
-https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/132
---- a/gegl/graph/gegl-region-generic.c
-+++ b/gegl/graph/gegl-region-generic.c
-@@ -910,7 +910,7 @@ miRegionOp (GeglRegion *newReg,
- top = MAX (r1->y1, ybot);
- bot = MIN (r1->y2, r2->y1);
-
-- if ((top != bot) && (nonOverlap1Fn != (void (*)())NULL))
-+ if ((top != bot) && (nonOverlap1Fn != (void (*)(void))NULL))
- {
- (*nonOverlap1Fn)(newReg, r1, r1BandEnd, top, bot);
- }
-@@ -922,7 +922,7 @@ miRegionOp (GeglRegion *newReg,
- top = MAX (r2->y1, ybot);
- bot = MIN (r2->y2, r1->y1);
-
-- if ((top != bot) && (nonOverlap2Fn != (void (*)())NULL))
-+ if ((top != bot) && (nonOverlap2Fn != (void (*)(void))NULL))
- {
- (*nonOverlap2Fn)(newReg, r2, r2BandEnd, top, bot);
- }
---- a/operations/common/ctx/ctx.h
-+++ b/operations/common/ctx/ctx.h
-@@ -6047,7 +6047,6 @@ int _ctx_is_rasterizer (Ctx *ctx);
-
- int ctx_color (Ctx *ctx, const char *string);
- typedef struct _CtxState CtxState;
--CtxColor *ctx_color_new ();
- CtxState *ctx_get_state (Ctx *ctx);
- void ctx_color_get_rgba (CtxState *state, CtxColor *color, float *out);
- void ctx_color_set_rgba (CtxState *state, CtxColor *color, float r, float g, float b, float a);
-@@ -11081,7 +11080,6 @@ static void
- ctx_matrix_set (CtxMatrix *matrix, float a, float b, float c, float d, float e, float f, float g, float h, float i);
-
-
--static void ctx_font_setup ();
- static float ctx_state_get (CtxState *state, uint32_t hash);
-
- #if CTX_RASTERIZER
-@@ -40708,9 +40706,9 @@ static void ctx_events_deinit (Ctx *ctx)
- #if CTX_TERMINAL_EVENTS
-
-
--static int mice_has_event ();
--static char *mice_get_event ();
--static void mice_destroy ();
-+static int mice_has_event (void);
-+static char *mice_get_event (void);
-+static void mice_destroy (void);
- static int mice_get_fd (EvSource *ev_source);
- static void mice_set_coord (EvSource *ev_source, double x, double y);
-
-@@ -40759,13 +40757,13 @@ static int mmm_evsource_mice_init ()
- return 0;
- }
-
--static void mice_destroy ()
-+static void mice_destroy (void)
- {
- if (mrg_mice_this->fd != -1)
- close (mrg_mice_this->fd);
- }
-
--static int mice_has_event ()
-+static int mice_has_event (void)
- {
- struct timeval tv;
- int retval;
-@@ -40783,7 +40781,7 @@ static int mice_has_event ()
- return 0;
- }
-
--static char *mice_get_event ()
-+static char *mice_get_event (void)
- {
- const char *ret = "pm";
- double relx, rely;
-
diff --git a/media-libs/gegl/gegl-0.4.40-r1.ebuild b/media-libs/gegl/gegl-0.4.40-r1.ebuild
deleted file mode 100644
index bafe8c1e36a0..000000000000
--- a/media-libs/gegl/gegl-0.4.40-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
- SRC_URI=""
-else
- SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp"
-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="
- >=dev-libs/glib-2.68.2:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.98[introspection?,lcms?,vala?]
- media-libs/libjpeg-turbo
- media-libs/libnsgif
- >=media-libs/libpng-1.6.0:0=
- >=sys-libs/zlib-1.2.0
- >=x11-libs/gdk-pixbuf-2.32:2
- >=x11-libs/pango-1.38.0
- 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:= )
- pdf? ( >=app-text/poppler-0.71.0[cairo] )
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- sdl2? ( >=media-libs/libsdl2-2.0.20 )
- svg? ( >=gnome-base/librsvg-2.40.6:2 )
- tiff? ( >=media-libs/tiff-4:= )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-lang/perl
- >=dev-build/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- >=dev-build/libtool-2.2
- virtual/pkgconfig
- test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
- vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.4.40-strict-prototypes.patch
- "${FILESDIR}"/${PN}-0.4.40-libraw-0.21.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- python-any-r1_pkg_setup
-}
-
-python_check_deps() {
- use test || return 0
- python_has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-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
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
- pushd "${S}/opencl/" || die
- for file in *.cl; do
- if [[ -f ${file} ]]; then
- "${EPYTHON}" cltostring.py "${file}" || die
- fi
- done
- popd || die
-}
-
-src_configure() {
- # Bug #859901
- filter-lto
-
- use vala && vala_setup
-
- local emesonargs=(
- # - 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
- -Djasper=disabled
- # - libspiro: not in portage main tree
- -Dlibspiro=disabled
- -Dlua=disabled
- -Dmrg=disabled
- -Dpango=enabled
- # - 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 openmp)
- $(meson_feature pdf poppler)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(meson_feature sdl2 sdl2)
- $(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
-}
-
-pkg_postinst() {
- optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
-}
diff --git a/media-libs/gegl/gegl-0.4.42-r1.ebuild b/media-libs/gegl/gegl-0.4.42-r1.ebuild
deleted file mode 100644
index 7e965050bcc7..000000000000
--- a/media-libs/gegl/gegl-0.4.42-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
- SRC_URI=""
-else
- SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp"
-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="
- >=dev-libs/glib-2.68.2:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.98[introspection?,lcms?,vala?]
- media-libs/libjpeg-turbo
- media-libs/libnsgif
- >=media-libs/libpng-1.6.0:0=
- >=sys-libs/zlib-1.2.0
- >=x11-libs/gdk-pixbuf-2.32:2
- >=x11-libs/pango-1.38.0
- 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:= )
- pdf? ( >=app-text/poppler-0.71.0[cairo] )
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- sdl2? ( >=media-libs/libsdl2-2.0.20 )
- svg? ( >=gnome-base/librsvg-2.40.6:2 )
- tiff? ( >=media-libs/tiff-4:= )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-lang/perl
- >=dev-build/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- >=dev-build/libtool-2.2
- virtual/pkgconfig
- test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
- vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.4.40-strict-prototypes.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- python-any-r1_pkg_setup
-}
-
-python_check_deps() {
- use test || return 0
- python_has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-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
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
- pushd "${S}/opencl/" || die
- for file in *.cl; do
- if [[ -f ${file} ]]; then
- "${EPYTHON}" cltostring.py "${file}" || die
- fi
- done
- popd || die
-}
-
-src_configure() {
- # Bug #859901
- filter-lto
-
- use vala && vala_setup
-
- local emesonargs=(
- # - 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
- -Djasper=disabled
- # - libspiro: not in portage main tree
- -Dlibspiro=disabled
- -Dlua=disabled
- -Dmrg=disabled
- -Dpango=enabled
- # - 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 openmp)
- $(meson_feature pdf poppler)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(meson_feature sdl2 sdl2)
- $(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
-}
-
-pkg_postinst() {
- optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
-}
diff --git a/media-libs/gegl/gegl-0.4.44.ebuild b/media-libs/gegl/gegl-0.4.44.ebuild
deleted file mode 100644
index bee4faac7e40..000000000000
--- a/media-libs/gegl/gegl-0.4.44.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-# vala and introspection support is broken, bug #468208
-VALA_USE_DEPEND=vapigen
-
-inherit flag-o-matic meson optfeature python-any-r1 toolchain-funcs vala
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
- SRC_URI=""
-else
- SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="A graph based image processing framework"
-HOMEPAGE="https://gegl.org/"
-
-LICENSE="|| ( GPL-3+ LGPL-3 )"
-SLOT="0.4"
-
-IUSE="cairo debug ffmpeg introspection lcms lensfun openexr openmp pdf raw sdl sdl2 svg test tiff umfpack vala v4l webp"
-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="
- >=dev-libs/glib-2.68.2:2
- >=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.98[introspection?,lcms?,vala?]
- media-libs/libjpeg-turbo
- media-libs/libnsgif
- >=media-libs/libpng-1.6.0:0=
- >=sys-libs/zlib-1.2.0
- >=x11-libs/gdk-pixbuf-2.32:2
- >=x11-libs/pango-1.38.0
- 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:= )
- pdf? ( >=app-text/poppler-0.71.0[cairo] )
- raw? ( >=media-libs/libraw-0.15.4:0= )
- sdl? ( >=media-libs/libsdl-1.2.0 )
- sdl2? ( >=media-libs/libsdl2-2.0.20 )
- svg? ( >=gnome-base/librsvg-2.40.6:2 )
- tiff? ( >=media-libs/tiff-4:= )
- umfpack? ( sci-libs/umfpack )
- v4l? ( >=media-libs/libv4l-1.0.1 )
- webp? ( >=media-libs/libwebp-0.5.0:= )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-lang/perl
- >=dev-build/gtk-doc-am-1
- >=sys-devel/gettext-0.19.8
- >=dev-build/libtool-2.2
- virtual/pkgconfig
- test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
- vala? ( $(vala_depend) )
-"
-
-DOCS=( AUTHORS docs/ChangeLog docs/NEWS.adoc )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- python-any-r1_pkg_setup
-}
-
-python_check_deps() {
- use test || return 0
- python_has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
-}
-
-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
- sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
- fi
-
- # fix 'build'headers from *.cl on gentoo-hardened, bug 739816
- pushd "${S}/opencl/" || die
- for file in *.cl; do
- if [[ -f ${file} ]]; then
- "${EPYTHON}" cltostring.py "${file}" || die
- fi
- done
- popd || die
-}
-
-src_configure() {
- # Bug #859901
- filter-lto
-
- use vala && vala_setup
-
- local emesonargs=(
- # - 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
- -Djasper=disabled
- # - libspiro: not in portage main tree
- -Dlibspiro=disabled
- -Dlua=disabled
- -Dmrg=disabled
- -Dpango=enabled
- # - 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 openmp)
- $(meson_feature pdf poppler)
- $(meson_feature raw libraw)
- $(meson_feature sdl sdl1)
- $(meson_feature sdl2 sdl2)
- $(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
-}
-
-pkg_postinst() {
- optfeature "'Show Image Graph' under GIMP[debug] menu 'File - Debug'" media-gfx/graphviz
-}
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-04-14 0:43 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-05 9:05 [gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/, media-libs/gegl/files/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2015-12-05 16:41 Justin Lecher
2017-01-09 21:11 Sebastian Pipping
2017-04-01 22:25 Sebastian Pipping
2017-05-20 22:23 Sebastian Pipping
2017-12-04 20:30 Sebastian Pipping
2018-01-10 22:08 Sebastian Pipping
2018-01-10 22:42 Sebastian Pipping
2018-05-13 17:30 Sebastian Pipping
2019-03-09 18:22 Sebastian Pipping
2019-10-27 23:02 Sebastian Pipping
2019-10-28 12:54 Sebastian Pipping
2020-06-25 8:08 Joonas Niilola
2020-08-22 16:07 Andreas Sturmlechner
2021-06-09 21:34 Sam James
2021-06-09 21:34 Sam James
2022-03-15 4:20 John Helmert III
2022-12-21 23:52 Sam James
2024-04-14 0:43 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox