- up to 0.4.2

diff --git a/gegl-ffmpeg4.patch b/gegl-ffmpeg4.patch
deleted file mode 100644 (file)
index 79a512e..0000000
--- a/gegl-ffmpeg4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- operations/external/ff-save.c.orig 2017-07-01 17:19:54 UTC
-+++ operations/external/ff-save.c
-@@ -290,7 +290,7 @@ add_audio_stream (GeglProperties *o, AVFormatContext *
-   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;
- }
-@@ -631,7 +631,7 @@ add_video_stream (GeglProperties *o, AVFormatContext *
- #endif
- 
-    if (oc->oformat->flags & AVFMT_GLOBALHEADER)
--     c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+     c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
- 
-   return st;
- }
-@@ -699,7 +699,9 @@ open_video (GeglProperties *o, AVFormatContext * oc, A
-     }
- 
-   p->video_outbuf = NULL;
-+#ifdef AVFMT_RAWPICTURE
-   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 +805,7 @@ write_video_frame (GeglProperties *o,
-   picture_ptr      = p->picture;
-   picture_ptr->pts = p->frame_count;
- 
-+#ifdef AVFMT_RAWPICTURE
-   if (oc->oformat->flags & AVFMT_RAWPICTURE)
-     {
-       /* raw video case. The API will change slightly in the near
-@@ -821,6 +824,7 @@ write_video_frame (GeglProperties *o,
-       ret = av_write_frame (oc, &pkt);
-     }
-   else
-+#endif
-     {
-       /* encode the image */
-       AVPacket pkt2;

diff --git a/gegl.spec b/gegl.spec
index 878941302e3219eb44ded8feb39030942cae9682..041769a03d7bb2414076995e88d7a43ec1d352bc 100644 (file)
--- a/gegl.spec
+++ b/gegl.spec
@@ -17,22 +17,21 @@
 %undefine      with_vala
 %endif
 
-%define        babl_version    0.1.46
+%define        babl_version    0.1.50
 %define        mrg_version     0.1.2-1.20180122.1
 
 Summary:       Generic image processing library
 Summary(pl.UTF-8):     Ogólna biblioteka przetwarzania obrazu
 Name:          gegl
-Version:       0.4.0
+Version:       0.4.2
 Release:       1
 License:       LGPL v3+
 Group:         Libraries
 Source0:       https://download.gimp.org/pub/gegl/0.4/%{name}-%{version}.tar.bz2
-# Source0-md5: 70c054f584d32cd03a15b87fd8ace9e4
+# Source0-md5: 47b8f88c466e0a38f5e8d6181bba89bd
 Patch1:                %{name}-ruby1.9.patch
 Patch2:                %{name}-build.patch
 Patch3:                umfpack.patch
-Patch4:                %{name}-ffmpeg4.patch
 URL:           http://www.gegl.org/
 BuildRequires: OpenEXR-devel >= 1.6.1
 BuildRequires: SDL-devel >= 1.2.0
@@ -169,7 +168,6 @@ API języka Vala dla biblioteki gegl.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p0
 
 %build
 %{__libtoolize}