diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-15 11:36:24 -0300 |
| commit | 7caeeae33fd491dbea5044168bbc50197963118c (patch) | |
| tree | 2ceec96ef9e1897d921d05f2fc5c5dda2ad893e9 /extra/gegl | |
| parent | 2f39e56def6dadf0746b6e96e756518f1af9396b (diff) | |
| parent | 3d151dfc8e08b65c2c1d4b5e8081562d56ee7d41 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ginac/PKGBUILD
community/gnash/PKGBUILD
community/haskell-tar/PKGBUILD
community/libdlna/PKGBUILD
community/mplayer2/PKGBUILD
community/musescore/PKGBUILD
community/open-vm-tools-modules/PKGBUILD
community/paraview/PKGBUILD
community/picard/PKGBUILD
core/idnkit/PKGBUILD
core/ifenslave/PKGBUILD
extra/audacious/PKGBUILD
extra/avidemux/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/graphite/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/k3b/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/koffice/PKGBUILD
extra/kradio/PKGBUILD
extra/libreoffice/PKGBUILD
extra/mediastreamer/PKGBUILD
extra/poppler/PKGBUILD
extra/vlc/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
Diffstat (limited to 'extra/gegl')
| -rw-r--r-- | extra/gegl/0.1.6-ffmpeg.patch | 33 | ||||
| -rw-r--r-- | extra/gegl/PKGBUILD | 14 |
2 files changed, 41 insertions, 6 deletions
diff --git a/extra/gegl/0.1.6-ffmpeg.patch b/extra/gegl/0.1.6-ffmpeg.patch new file mode 100644 index 000000000..51fb95d28 --- /dev/null +++ b/extra/gegl/0.1.6-ffmpeg.patch @@ -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; diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD index 2d99183f7..808942a8a 100644 --- a/extra/gegl/PKGBUILD +++ b/extra/gegl/PKGBUILD @@ -1,26 +1,28 @@ -# $Id: PKGBUILD 110564 2011-02-20 03:00:42Z eric $ +# $Id: PKGBUILD 142624 2011-11-12 17:15:18Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gegl pkgver=0.1.6 -pkgrel=1 +pkgrel=2 pkgdesc="Graph based image processing framework" arch=('i686' 'x86_64' 'mips64el') 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 |