[arch-commits] Commit in gegl/trunk (PKGBUILD ffmpeg4.patch)

[Christian Hesse]

    Date: Tuesday, May 22, 2018 @ 09:44:40
  Author: eworm
Revision: 324760

upgpkg: gegl 0.4.2-1

new upstream release

Modified:
  gegl/trunk/PKGBUILD
Deleted:
  gegl/trunk/ffmpeg4.patch

---------------+
 PKGBUILD      |   13 +++++--------
 ffmpeg4.patch |   46 ----------------------------------------------
 2 files changed, 5 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-22 09:28:56 UTC (rev 324759)
+++ PKGBUILD	2018-05-22 09:44:40 UTC (rev 324760)
@@ -2,8 +2,8 @@
 # Maintainer: Daniel Isenmann <daniel at archlinux.org>
 
 pkgname=gegl
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.4.2
+pkgrel=1
 pkgdesc="Graph based image processing framework"
 arch=('x86_64')
 url="http://www.gegl.org/"
@@ -21,11 +21,9 @@
             'libtiff: tiff plugin'
             'lua: lua plugin'
             'lensfun: lens-correct plugin')
-_commit=f6caafacf3d8c176049de5c6680f8065bcfe9af9  # tags/GEGL_0_4_0^0
-source=("git+https://git.gnome.org/browse/gegl#commit=$_commit"
-        ffmpeg4.patch)
-sha256sums=('SKIP'
-            '0bd90ad266ac11acb11ec6adf538c6d52e28c9f1355450763528b86959a79156')
+_commit=b16c1641126fd1ac0363845e1fc30c1f3c50fa1b  # tags/GEGL_0_4_2^0
+source=("git+https://git.gnome.org/browse/gegl#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -37,7 +35,6 @@
   ln -s /usr/bin/python2 path/python
 
   cd ${pkgname}
-  patch -Np0 -i ../ffmpeg4.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 

Deleted: ffmpeg4.patch
===================================================================
--- ffmpeg4.patch	2018-05-22 09:28:56 UTC (rev 324759)
+++ ffmpeg4.patch	2018-05-22 09:44:40 UTC (rev 324760)
@@ -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;