From 718a779a84b9c353e67447e95c998c8b2af3b417 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 5 Mar 2020 23:28:34 +0300 Subject: [PATCH] rebuild --- .../gegl02/files/gegl-0.2.0-ffmpeg-0.11.diff | 57 ++++++++++++++++ .../files/gegl-0.2.0-ffmpeg-4-0-compat.patch | 13 ++++ .../gegl-0.2.0-ffmpeg-av_frame_alloc.patch | 38 +++++++++++ .../files/gegl-0.2.0-fix-without-exiv2.patch | 30 +++++++++ .../files/gegl-0.2.0-g_log_domain.patch | 25 +++++++ .../gegl-0.2.0-introspection-version.patch | 31 +++++++++ .../files/gegl-0.2.0-libopenraw-0.1.patch | 48 ++++++++++++++ .../files/gegl-0.2.0-underlinking.patch | 65 +++++++++++++++++++ multimedia/graphics/gegl02/pspec.xml | 15 ++++- 9 files changed, 319 insertions(+), 3 deletions(-) create mode 100644 multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-0.11.diff create mode 100644 multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-4-0-compat.patch create mode 100644 multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch create mode 100644 multimedia/graphics/gegl02/files/gegl-0.2.0-fix-without-exiv2.patch create mode 100644 multimedia/graphics/gegl02/files/gegl-0.2.0-g_log_domain.patch create mode 100644 multimedia/graphics/gegl02/files/gegl-0.2.0-introspection-version.patch create mode 100644 multimedia/graphics/gegl02/files/gegl-0.2.0-libopenraw-0.1.patch create mode 100644 multimedia/graphics/gegl02/files/gegl-0.2.0-underlinking.patch diff --git a/multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-0.11.diff b/multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-0.11.diff new file mode 100644 index 0000000000..8e9a328524 --- /dev/null +++ b/multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-0.11.diff @@ -0,0 +1,57 @@ +From 97067622352e58f86a24851dacb1f5daa0762897 Mon Sep 17 00:00:00 2001 +From: nick black +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/multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-4-0-compat.patch b/multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-4-0-compat.patch new file mode 100644 index 0000000000..6b8e9792c0 --- /dev/null +++ b/multimedia/graphics/gegl02/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/multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch b/multimedia/graphics/gegl02/files/gegl-0.2.0-ffmpeg-av_frame_alloc.patch new file mode 100644 index 0000000000..6998a02e75 --- /dev/null +++ b/multimedia/graphics/gegl02/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 +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/multimedia/graphics/gegl02/files/gegl-0.2.0-fix-without-exiv2.patch b/multimedia/graphics/gegl02/files/gegl-0.2.0-fix-without-exiv2.patch new file mode 100644 index 0000000000..96a4188926 --- /dev/null +++ b/multimedia/graphics/gegl02/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 +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/multimedia/graphics/gegl02/files/gegl-0.2.0-g_log_domain.patch b/multimedia/graphics/gegl02/files/gegl-0.2.0-g_log_domain.patch new file mode 100644 index 0000000000..cdb42b2ca5 --- /dev/null +++ b/multimedia/graphics/gegl02/files/gegl-0.2.0-g_log_domain.patch @@ -0,0 +1,25 @@ +From deaa974528ac1f4099d091a333214b1a50147243 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +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/multimedia/graphics/gegl02/files/gegl-0.2.0-introspection-version.patch b/multimedia/graphics/gegl02/files/gegl-0.2.0-introspection-version.patch new file mode 100644 index 0000000000..1ac28dc629 --- /dev/null +++ b/multimedia/graphics/gegl02/files/gegl-0.2.0-introspection-version.patch @@ -0,0 +1,31 @@ +From 35469116fbf0b398d748f8116e4dcc8bdaee12c7 Mon Sep 17 00:00:00 2001 +From: Jon Nordby +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/multimedia/graphics/gegl02/files/gegl-0.2.0-libopenraw-0.1.patch b/multimedia/graphics/gegl02/files/gegl-0.2.0-libopenraw-0.1.patch new file mode 100644 index 0000000000..ec12270395 --- /dev/null +++ b/multimedia/graphics/gegl02/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 +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/multimedia/graphics/gegl02/files/gegl-0.2.0-underlinking.patch b/multimedia/graphics/gegl02/files/gegl-0.2.0-underlinking.patch new file mode 100644 index 0000000000..00e936ce68 --- /dev/null +++ b/multimedia/graphics/gegl02/files/gegl-0.2.0-underlinking.patch @@ -0,0 +1,65 @@ +From bedd95f5f14524360117209ed6a1a83627523f54 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +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/multimedia/graphics/gegl02/pspec.xml b/multimedia/graphics/gegl02/pspec.xml index 40f635c690..c63758fd58 100644 --- a/multimedia/graphics/gegl02/pspec.xml +++ b/multimedia/graphics/gegl02/pspec.xml @@ -37,12 +37,17 @@ ruby + zlib-devel + openexr-libs + librsvg-devel ilmbase-devel - - - + gegl-0.2.0-ffmpeg-4-0-compat.patch + gegl-0.2.0-ffmpeg-av_frame_alloc.patch + gegl-0.2.0-fix-without-exiv2.patch + gegl-0.2.0-libopenraw-0.1.patch + gegl-0.2.0-underlinking.patch @@ -58,6 +63,10 @@ cairo pango babl + zlib + openexr-libs + ilmbase + librsvg libjpeg-turbo