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 <[email protected]> -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 <[email protected]> -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 <[email protected]> -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 <[email protected]> -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 <[email protected]> -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 <[email protected]> -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-@[email protected]: libgegl-@[email protected] 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-@[email protected] - Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources) - INTROSPECTION_GIRS += Gegl-@[email protected] --- -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 <[email protected]> -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-@[email protected]: libgegl-@[email protected] 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-@[email protected] --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-@[email protected] -+Gegl_@GEGL_MAJOR_VERSION@_@GEGL_MINOR_VERSION@_gir_FILES = $(introspection_sources) - INTROSPECTION_GIRS += Gegl-@[email protected] - - 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 <[email protected]> -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 <[email protected]> -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 <[email protected]> -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 <[email protected]> -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?= <[email protected]> -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 -}
