diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /media-libs/gegl/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'media-libs/gegl/files')
13 files changed, 0 insertions, 566 deletions
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 0babb0f41c1b..000000000000 --- 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 f78557f5772a..000000000000 --- 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 8e9a328524c3..000000000000 --- 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 6b8e9792c026..000000000000 --- 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 6998a02e75f5..000000000000 --- 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 96a4188926df..000000000000 --- 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 cdb42b2ca5f2..000000000000 --- 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 1ac28dc62964..000000000000 --- 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 ec1227039554..000000000000 --- 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 00e936ce68ea..000000000000 --- 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 c886419925af..000000000000 --- 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 fc8027f08ae4..000000000000 --- 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 260ff3b2c1a4..000000000000 --- 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 - |