[arch-commits] Commit in gegl/trunk (3 files)

[Bartłomiej Piotrowski]

    Date: Saturday, April 11, 2015 @ 17:07:29
  Author: bpiotrowski
Revision: 236266

upgpkg: gegl 0.2.0-14

use improved patch for deprecated ffmpeg functions made by Hussam Al-Tayeb (FS#42289)

Added:
  gegl/trunk/gegl-0.2.0-ffmpeg-0.11.patch
    (from rev 236265, gegl/trunk/gegl-0.2.0-ffmpeg-0.11.diff)
Modified:
  gegl/trunk/PKGBUILD
Deleted:
  gegl/trunk/gegl-0.2.0-ffmpeg-0.11.diff

------------------------------+
 PKGBUILD                     |    8 +++---
 gegl-0.2.0-ffmpeg-0.11.diff  |   21 ------------------
 gegl-0.2.0-ffmpeg-0.11.patch |   47 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-11 15:01:13 UTC (rev 236265)
+++ PKGBUILD	2015-04-11 15:07:29 UTC (rev 236266)
@@ -3,7 +3,7 @@
 
 pkgname=gegl
 pkgver=0.2.0
-pkgrel=13
+pkgrel=14
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64')
 url="http://www.gegl.org/"
@@ -15,13 +15,13 @@
             'librsvg: for using the svg plugin'
             'jasper: for using the jasper plugin')
 source=(http://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        gegl-0.2.0-ffmpeg-0.11.diff
+        gegl-0.2.0-ffmpeg-0.11.patch
         gegl-0.2.0-CVE-2012-4433.patch
         gegl-0.2.0-lua-5.2.patch
         gegl-0.2.0-remove-src-over-op.patch)
 options=(!makeflags)
 sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
-          'e2e00633149fa4d5196520e284609de257eb012f'
+          'f5e4c0edd32e088f768e303081f1ed2d80588d4c'
           '44d48bd9ad008703de9f8eb683d557bac39a02c8'
           'c78a092b880874ba7784b652bcd9c532e2b9975d'
           'dc9ae21cc5ba0fb47ef05793f0cb169572dfab74')
@@ -28,7 +28,7 @@
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../gegl-0.2.0-ffmpeg-0.11.diff
+  patch -Np1 -i ../gegl-0.2.0-ffmpeg-0.11.patch
   patch -Np1 -i ../gegl-0.2.0-CVE-2012-4433.patch
   patch -Np1 -i ../gegl-0.2.0-lua-5.2.patch
   patch -Np1 -i ../gegl-0.2.0-remove-src-over-op.patch

Deleted: gegl-0.2.0-ffmpeg-0.11.diff
===================================================================
--- gegl-0.2.0-ffmpeg-0.11.diff	2015-04-11 15:01:13 UTC (rev 236265)
+++ gegl-0.2.0-ffmpeg-0.11.diff	2015-04-11 15:07:29 UTC (rev 236266)
@@ -1,21 +0,0 @@
-diff -u -r gegl-0.2.0/operations/external/ff-load.c gegl-0.2.0-1/operations/external/ff-load.c
---- gegl-0.2.0/operations/external/ff-load.c	2012-04-01 13:17:57.000000000 +0200
-+++ gegl-0.2.0-1/operations/external/ff-load.c	2013-10-20 03:22:06.824278863 +0200
-@@ -271,7 +271,7 @@
-       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, NULL);
-       if (err < 0)
-         {
-           print_error (o->path, err);
-@@ -312,7 +312,7 @@
-       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;

Copied: gegl/trunk/gegl-0.2.0-ffmpeg-0.11.patch (from rev 236265, gegl/trunk/gegl-0.2.0-ffmpeg-0.11.diff)
===================================================================
--- gegl-0.2.0-ffmpeg-0.11.patch	                        (rev 0)
+++ gegl-0.2.0-ffmpeg-0.11.patch	2015-04-11 15:07:29 UTC (rev 236266)
@@ -0,0 +1,47 @@
+--- ./operations/external/ff-load.c	2012-04-01 14:17:57.000000000 +0300
++++ ./operations/external/ff-load.c.new	2014-10-23 01:49:25.090139749 +0300
+@@ -137,7 +137,7 @@
+       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 @@
+             {
+               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 @@
+       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 @@
+       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;
\ No newline at end of file