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

[Eric Bélanger]

    Date: Monday, October 31, 2011 @ 20:51:41
  Author: eric
Revision: 141632

upgpkg: gegl 0.1.6-2

Rebuild against ffmpeg 20111030, Clean up depends

Added:
  gegl/trunk/0.1.6-ffmpeg.patch
Modified:
  gegl/trunk/PKGBUILD

--------------------+
 0.1.6-ffmpeg.patch |   33 +++++++++++++++++++++++++++++++++
 PKGBUILD           |   12 +++++++-----
 2 files changed, 40 insertions(+), 5 deletions(-)

Added: 0.1.6-ffmpeg.patch
===================================================================
--- 0.1.6-ffmpeg.patch	                        (rev 0)
+++ 0.1.6-ffmpeg.patch	2011-11-01 00:51:41 UTC (rev 141632)
@@ -0,0 +1,33 @@
+diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c
+--- gegl-0.1.6.old//operations/external/ff-load.c   2011-01-24 19:03:30.000000000 -0300
++++ gegl-0.1.6/operations/external/ff-load.c    2011-05-04 09:59:48.910379742 -0300
+@@ -69,17 +69,17 @@
+ {
+   switch (err)
+     {
+-    case AVERROR_NUMEXPECTED:
++    case AVERROR(EDOM):
+       g_warning ("%s: Incorrect image filename syntax.\n"
+                  "Use '%%d' to specify the image number:\n"
+                  "  for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
+                  "  for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",
+                  filename);
+       break;
+-    case AVERROR_INVALIDDATA:
++    case AVERROR(EINVAL):
+       g_warning ("%s: Error while parsing header\n", filename);
+       break;
+-    case AVERROR_NOFMT:
++    case AVERROR(EILSEQ):
+       g_warning ("%s: Unknown format\n", filename);
+       break;
+     default:
+@@ -278,7 +278,7 @@
+       for (i = 0; i< p->ic->nb_streams; i++)
+         {
+           AVCodecContext *c = p->ic->streams[i]->codec;
+-          if (c->codec_type == CODEC_TYPE_VIDEO)
++          if (c->codec_type == AVMEDIA_TYPE_VIDEO)
+             {
+               p->video_st = p->ic->streams[i];
+               p->video_stream = i;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-01 00:42:15 UTC (rev 141631)
+++ PKGBUILD	2011-11-01 00:51:41 UTC (rev 141632)
@@ -3,24 +3,26 @@
 
 pkgname=gegl
 pkgver=0.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64')
 url="http://www.gegl.org/"
 license=('GPL3' 'LGPL3')
-depends=('babl' 'libpng' 'libjpeg' 'gtk2')
+depends=('babl' 'gtk2')
 makedepends=('ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
 optdepends=('openexr: for using the openexr plugin' \
             'ffmpeg: for using the ffmpeg plugin' \
             'librsvg: for using the svg plugin' \
             'jasper: for using the jasper plugin')
 options=('!libtool')
-source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('af5e5a7d3c7ddfaa2b3414de2a7e9113')
-sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d')
+source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 \
+        0.1.6-ffmpeg.patch)
+sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d'
+          'd62d4987f1c0fc256f5968271fc65cce0cc4c195')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 -i "${srcdir}/0.1.6-ffmpeg.patch"
   ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
     --with-libavformat --with-jasper --disable-docs
   make