[gentoo-commits] repo/gentoo:master commit in: media-libs/gegl/files/

[Michael Palimaka]

commit:     3374c119b39762e12d2bba4bb7e4b55075c459bf
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Dec 20 19:17:26 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 16:04:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3374c119

media-libs/gegl: remove unused patches

 media-libs/gegl/files/0.1.6-ffmpeg.patch           | 33 ----------
 media-libs/gegl/files/gegl-0.0.22-locale_h.diff    | 10 ---
 .../files/gegl-0.1.8-cve-2012-4433-4757cdf7.patch  | 74 ----------------------
 media-libs/gegl/files/gegl-doubledestdir.diff      | 12 ----
 .../files/replace-imgconvert-by-swsscale.patch     | 58 -----------------
 5 files changed, 187 deletions(-)

diff --git a/media-libs/gegl/files/0.1.6-ffmpeg.patch b/media-libs/gegl/files/0.1.6-ffmpeg.patch
deleted file mode 100644
index 51fb95d..00000000
--- a/media-libs/gegl/files/0.1.6-ffmpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c
---- gegl-0.1.6.old//operations/external/ff-load.c   2011-01-24 19:03:30.000000000 -0300
-+++ gegl-0.1.6/operations/external/ff-load.c    2011-05-04 09:59:48.910379742 -0300
-@@ -69,17 +69,17 @@
- {
-   switch (err)
-     {
--    case AVERROR_NUMEXPECTED:
-+    case AVERROR(EDOM):
-       g_warning ("%s: Incorrect image filename syntax.\n"
-                  "Use '%%d' to specify the image number:\n"
-                  "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
-                  "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",
-                  filename);
-       break;
--    case AVERROR_INVALIDDATA:
-+    case AVERROR(EINVAL):
-       g_warning ("%s: Error while parsing header\n", filename);
-       break;
--    case AVERROR_NOFMT:
-+    case AVERROR(EILSEQ):
-       g_warning ("%s: Unknown format\n", filename);
-       break;
-     default:
-@@ -278,7 +278,7 @@
-       for (i = 0; i< p->ic->nb_streams; i++)
-         {
-           AVCodecContext *c = p->ic->streams[i]->codec;
--          if (c->codec_type == CODEC_TYPE_VIDEO)
-+          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
-             {
-               p->video_st = p->ic->streams[i];
-               p->video_stream = i;

diff --git a/media-libs/gegl/files/gegl-0.0.22-locale_h.diff b/media-libs/gegl/files/gegl-0.0.22-locale_h.diff
deleted file mode 100644
index a4a9707..00000000
--- a/media-libs/gegl/files/gegl-0.0.22-locale_h.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- gegl-0.0.22/gegl/gegl-init.c	2008-12-31 02:38:59.000000000 +0100
-+++ gegl-0.0.22-1/gegl/gegl-init.c	2009-01-14 22:21:41.000000000 +0100
-@@ -26,6 +26,7 @@
- #include <glib/gi18n-lib.h>
- 
- #include <stdlib.h>
-+#include <locale.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif

diff --git a/media-libs/gegl/files/gegl-0.1.8-cve-2012-4433-4757cdf7.patch b/media-libs/gegl/files/gegl-0.1.8-cve-2012-4433-4757cdf7.patch
deleted file mode 100644
index 7bda5b0..00000000
--- a/media-libs/gegl/files/gegl-0.1.8-cve-2012-4433-4757cdf7.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3d3b1559cb34bc862f145c9880d156f6f2fe7b5f Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@×××××××.org>
-Date: Sat, 17 Nov 2012 16:22:21 +0100
-Subject: [PATCH] ppm-load: CVE-2012-4433: add plausibility checks for header
- fields
-
-"Port" of 4757cdf73d3675478d645a3ec8250ba02168a230 by Nils Philippsen from GEGL 0.2.0 to 0.1.8
----
- operations/external/ppm-load.c | 33 ++++++++++++++++++++++++++++-----
- 1 file changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/operations/external/ppm-load.c b/operations/external/ppm-load.c
-index 6db6e5a..2d4f0ca 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;
-+      }
- 
-     retval = fgets (header,MAX_CHARS_IN_ROW,fp);
--    maxval = strtol (header,&ptr,0);
-+    maxval = strtol (header,&ptr,10);
- 
-     if ((maxval != 255) && (maxval != 65535))
-       {
--- 
-1.7.12.4
-

diff --git a/media-libs/gegl/files/gegl-doubledestdir.diff b/media-libs/gegl/files/gegl-doubledestdir.diff
deleted file mode 100644
index 8a9bf33..00000000
--- a/media-libs/gegl/files/gegl-doubledestdir.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gegl-0.1.6/docs/Makefile.am gegl-0.1.6-1//docs/Makefile.am
---- gegl-0.1.6/docs/Makefile.am	2010-10-08 18:51:41.000000000 +0200
-+++ gegl-0.1.6-1//docs/Makefile.am	2011-02-16 20:05:30.458043758 +0100
-@@ -6,7 +6,7 @@
- # is very small, and should probably be documented in a tutorial.
- #
- 
--gtkdochtmldir = $(DESTDIR)$(datadir)/gtk-doc/html/gegl
-+gtkdochtmldir = $(datadir)/gtk-doc/html/gegl
- 
- HTML_FILES = \
- 	operations.html		\

diff --git a/media-libs/gegl/files/replace-imgconvert-by-swsscale.patch b/media-libs/gegl/files/replace-imgconvert-by-swsscale.patch
deleted file mode 100644
index 2cf5601..00000000
--- a/media-libs/gegl/files/replace-imgconvert-by-swsscale.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Index: gegl-0.0.22/operations/workshop/external/ff-save.c
-===================================================================
---- gegl-0.0.22.orig/operations/workshop/external/ff-save.c
-+++ gegl-0.0.22/operations/workshop/external/ff-save.c
-@@ -19,6 +19,8 @@
- #include "config.h"
- #include <glib/gi18n-lib.h>
- 
-+#include <libswscale/swscale.h>
-+
- 
- #ifdef GEGL_CHANT_PROPERTIES
- 
-@@ -640,6 +642,7 @@ write_video_frame (GeglChantO *op,
-   int       out_size, ret;
-   AVCodecContext *c;
-   AVFrame  *picture_ptr;
-+  struct SwsContext *img_convert_ctx;
- 
-   c = st->codec;
- 
-@@ -649,10 +652,22 @@ write_video_frame (GeglChantO *op,
-          to the codec pixel format if needed */
-       fill_yuv_image (op, p->tmp_picture, p->frame_count, c->width,
-                       c->height);
--      /* FIXME: img_convert is deprecated. Update code to use sws_scale(). */
-+      /* FIXME: img_convert is deprecated. Update code to use sws_scale().
-       img_convert ((AVPicture *) p->picture, c->pix_fmt,
-                    (AVPicture *) p->tmp_picture, PIX_FMT_RGB24,
-                    c->width, c->height);
-+      */
-+      img_convert_ctx = sws_getContext(c->width, c->height, c->pix_fmt,
-+                                       c->width, c->height, PIX_FMT_RGB24,
-+                                       SWS_BICUBIC, NULL, NULL, NULL);
-+
-+      if (img_convert_ctx == NULL)
-+        fprintf(stderr, "ff_save: Cannot initialize conversion context.");
-+      else
-+      {
-+        sws_scale(img_convert_ctx, p->tmp_picture->data, p->tmp_picture->linesize,
-+                  0, c->height, p->picture->data, p->picture->linesize);
-+      }
-     }
-   else
-     {
-Index: gegl-0.0.22/operations/workshop/external/Makefile.am
-===================================================================
---- gegl-0.0.22.orig/operations/workshop/external/Makefile.am
-+++ gegl-0.0.22/operations/workshop/external/Makefile.am
-@@ -21,7 +21,7 @@ endif
- if HAVE_AVFORMAT
- ops += ff_save.la
- ff_save_la_SOURCES = ff-save.c
--ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS)
-+ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS) -lswscale
- ff_save_la_CFLAGS = $(AVFORMAT_CFLAGS)
- endif
-