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

[Eric Bélanger]

    Date: Friday, December 9, 2011 @ 07:21:17
  Author: eric
Revision: 144901

upgpkg: gegl 0.1.8-1

Upstream update, Add check function, Remove old patch

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

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

Deleted: 0.1.6-ffmpeg.patch
===================================================================
--- 0.1.6-ffmpeg.patch	2011-12-09 12:16:38 UTC (rev 144900)
+++ 0.1.6-ffmpeg.patch	2011-12-09 12:21:17 UTC (rev 144901)
@@ -1,33 +0,0 @@
-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-12-09 12:16:38 UTC (rev 144900)
+++ PKGBUILD	2011-12-09 12:21:17 UTC (rev 144901)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=gegl
-pkgver=0.1.6
-pkgrel=2
+pkgver=0.1.8
+pkgrel=1
 pkgdesc="Graph based image processing framework"
 arch=('i686' 'x86_64')
 url="http://www.gegl.org/"
@@ -15,19 +15,21 @@
             '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 \
-        0.1.6-ffmpeg.patch)
-sha1sums=('27bedcfd077da7a6913b82966dbec904b22c121d'
-          'd62d4987f1c0fc256f5968271fc65cce0cc4c195')
+source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('3d4d902580f5c5122b01b5188b6b5da03089ecac')
 
 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
 }
 
+#check() {
+#  cd "${srcdir}/${pkgname}-${pkgver}"
+#  make check
+#}
+
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install