git » gegl.git » commit 319d91b

Fixed FS#30936 - [gimpl] gegl undefined symbol

author Daniel Isenmann
2012-09-08 07:12:34 UTC
committer Daniel Isenmann
2012-09-08 07:12:34 UTC
parent 642ea121cca31f2c2c92666f6093098090afe436

Fixed FS#30936 - [gimpl] gegl undefined symbol

PKGBUILD +5 -3
gegl-0.2.0-ffmpeg-0.11.diff +12 -0

diff --git a/PKGBUILD b/PKGBUILD
index 8199ab5..a2a4854 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gegl
 pkgver=0.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64')
 url="http://www.gegl.org/"
@@ -14,11 +14,13 @@ optdepends=('openexr: for using the openexr 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)
-sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573')
+source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 gegl-0.2.0-ffmpeg-0.11.diff)
+sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
+          'c10fd988c634fcf0948cc91a51d6528f6f1704ba')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff
   ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
     --with-libavformat --with-jasper --disable-docs
   make
diff --git a/gegl-0.2.0-ffmpeg-0.11.diff b/gegl-0.2.0-ffmpeg-0.11.diff
new file mode 100644
index 0000000..a33ec6f
--- /dev/null
+++ b/gegl-0.2.0-ffmpeg-0.11.diff
@@ -0,0 +1,12 @@
+diff -Naur 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	2012-07-11 12:42:05.174756560 +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);