diff --git a/gegl-0.4.0.tar.bz2 b/gegl-0.4.0.tar.bz2 deleted file mode 100644 index a95f093..0000000 --- a/gegl-0.4.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d04d2bfa0ff5a4bcfe7566f7418929a9c80f0109fa248ea4ff19538b3e99f0c5 -size 6762190 diff --git a/gegl-0.4.2.tar.bz2 b/gegl-0.4.2.tar.bz2 new file mode 100644 index 0000000..20b3673 --- /dev/null +++ b/gegl-0.4.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6a358bc19d20b8ac1daf645cc8b53cdc2ea6f9c98a6036179a57045a26a07f8d +size 6781136 diff --git a/gegl-port-ffmpeg4.patch b/gegl-port-ffmpeg4.patch deleted file mode 100644 index 84969da..0000000 --- a/gegl-port-ffmpeg4.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 8f2545886ce3be8f1b1229bddcfa5af3216110d3 Mon Sep 17 00:00:00 2001 -From: Franz Brausse -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 - #include - -+/* 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 - - -From a2dd56d3200aeafdecbc40c58eeef3d43a5fadcc Mon Sep 17 00:00:00 2001 -From: Franz Brausse -Date: Sun, 6 May 2018 13:40:30 +0200 -Subject: operations/external/ff-save: ffmpeg-2.3-2.7 compat; minimum lav{f,c} - versions configure.ac mandates - ---- - operations/external/ff-save.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/operations/external/ff-save.c b/operations/external/ff-save.c -index e7edd3e..1edac31 100644 ---- a/operations/external/ff-save.c -+++ b/operations/external/ff-save.c -@@ -91,6 +91,8 @@ property_int (me_subpel_quality, _("me-subpel-quality"), 0) - /* 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 -+# define AV_CODEC_CAP_VARIABLE_FRAME_SIZE CODEC_CAP_VARIABLE_FRAME_SIZE -+# define AV_CODEC_CAP_INTRA_ONLY CODEC_CAP_INTRA_ONLY - #endif - - typedef struct --- -cgit v0.12 - - -From 2896800b5e7d0c656710c70fdea57098032f3ccc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= -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/gegl.changes b/gegl.changes index 728d48a..b647aff 100644 --- a/gegl.changes +++ b/gegl.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed May 16 18:12:54 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 0.4.2: + + Build: Abort early if autoreconf fails, remove unused bits, + default to -Ofast as CFLAGS. + + GeglBuffer: + - Improve concurrency for trimming and destruction of tile + caches. Improve cache invalidation during partial mipmap + regeneration. + - Do new cheap clones of buffers with new internal gegl-buffer + backed tile-backend. + - Do not keep cached sampler in buffer it makes cache + invalidation hard, and for performance/threading it is better + to create ones own samplers anyways. The old API still + exists, though parts of it is now deprecated. The single + special case where gegl_buffer_sample remains somewhat + performant is with the NEAREST sampler, for all other + samplers creating a caching sampler is better. + + Operations: + - operation: add GeglOperationAreaFilter::get_abyss_policy() + vfunc Copyright notice improvements to spherize, + color-overlay. ff-save: implement defines handling + compilation with ffmpeg 2.3-2.7, 4.0 compat. + - Improved multi-threaded performance of panorama-projection + and other transformation operations through optimizations in + buffer and base-classes. +- Drop gegl-port-ffmpeg4.patch: Fixed upstream. + ------------------------------------------------------------------- Wed May 9 19:12:51 UTC 2018 - bjorn.lie@gmail.com diff --git a/gegl.spec b/gegl.spec index b496df0..6f61598 100644 --- a/gegl.spec +++ b/gegl.spec @@ -17,7 +17,7 @@ Name: gegl -Version: 0.4.0 +Version: 0.4.2 Release: 0 Summary: Generic Graphics Library License: GPL-3.0-or-later AND LGPL-3.0-or-later @@ -25,8 +25,6 @@ Group: Productivity/Graphics/Other URL: http://gegl.org/ Source0: https://download.gimp.org/pub/gegl/0.4/%{name}-%{version}.tar.bz2 Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gegl-port-ffmpeg4.patch bgo#795625 -- Fix build with ffmpeg4 -Patch0: gegl-port-ffmpeg4.patch BuildRequires: ImageMagick BuildRequires: SDL-devel >= 1.2.0 @@ -42,7 +40,7 @@ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: suitesparse-devel BuildRequires: pkgconfig(OpenEXR) >= 1.6.1 -BuildRequires: pkgconfig(babl) >= 0.1.46 +BuildRequires: pkgconfig(babl) >= 0.1.48 BuildRequires: pkgconfig(cairo) >= 1.12.2 BuildRequires: pkgconfig(exiv2) >= 0.25 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.32.0