- updated to 0.1.8

- removed obsolete ffmpeg-0.8 patch
- added vala API (on bcond)

Changed files:
    gegl-ffmpeg-0.8.patch -> 1.2
    gegl.spec -> 1.27

diff --git a/gegl-ffmpeg-0.8.patch b/gegl-ffmpeg-0.8.patch
deleted file mode 100644 (file)
index 7d15033..0000000
--- a/gegl-ffmpeg-0.8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gegl-0.1.2/operations/external/ff-load.c.orig      2011-06-28 20:14:52.491649253 +0200
-+++ gegl-0.1.2/operations/external/ff-load.c   2011-06-28 20:38:32.935030148 +0200
-@@ -69,7 +69,7 @@
- {
-   switch (err)
-     {
--    case AVERROR_NUMEXPECTED:
-+    case AVERROR(EINVAL):
-       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"
-@@ -79,7 +79,7 @@
-     case AVERROR_INVALIDDATA:
-       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/gegl.spec b/gegl.spec
index ec0a157df9bb4e230cc65efb68fbd4251661b07d..77f79a265a2ac68cf0d0d20ee114e9d630136a13 100644 (file)
--- a/gegl.spec
+++ b/gegl.spec
@@ -2,8 +2,9 @@
 # Conditional build:
 %bcond_with    mmx     # use MMX instructions
 %bcond_with    sse     # use SSE instructions
-%bcond_with    doc
-
+%bcond_with    doc     # apidocs (fail to build)
+%bcond_without vala    # Vala API
+#
 %ifarch %{x8664} athlon pentium3 pentium4
 %define        with_mmx        1
 %endif
@@ -13,47 +14,51 @@
 Summary:       Generic image processing library
 Summary(pl.UTF-8):     Ogólna biblioteka przetwarzania obrazu
 Name:          gegl
-Version:       0.1.6
+Version:       0.1.8
 Release:       1
 License:       LGPL v3+
 Group:         Libraries
-Source0:       ftp://ftp.gimp.org/pub/gegl/0.1//%{name}-%{version}.tar.bz2
-# Source0-md5: af5e5a7d3c7ddfaa2b3414de2a7e9113
+Source0:       ftp://ftp.gimp.org/pub/gegl/0.1/%{name}-%{version}.tar.bz2
+# Source0-md5: c8279b86b3d584ee4f503839fc500425
 Patch0:                %{name}-lua.patch
 Patch1:                %{name}-ffmpeg.patch
-Patch2:                %{name}-ffmpeg-0.8.patch
 URL:           http://www.gegl.org/
 BuildRequires: OpenEXR-devel
 BuildRequires: SDL-devel
 BuildRequires: UMFPACK-devel
 BuildRequires: asciidoc
 BuildRequires: autoconf >= 2.54
-BuildRequires: automake
-BuildRequires: babl-devel >= 0.1.4
+BuildRequires: automake >= 1:1.11
+BuildRequires: babl-devel >= 0.1.6
 BuildRequires: cairo-devel
 BuildRequires: enscript
 BuildRequires: exiv2-devel
 BuildRequires: ffmpeg-devel >= 0.8
 BuildRequires: gdk-pixbuf2-devel >= 2.18.0
-BuildRequires: glib2-devel >= 1:2.22.0
+BuildRequires: glib2-devel >= 1:2.28.0
+BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: graphviz
 BuildRequires: gtk-doc >= 1.0
 BuildRequires: jasper-devel >= 1.900.1
+BuildRequires: lensfun-devel >= 0.2.5
 BuildRequires: libjpeg-devel
 BuildRequires: libopenraw-devel >= 0.0.5
 BuildRequires: libpng-devel
 BuildRequires: librsvg-devel >= 1:2.14.0
 BuildRequires: libspiro-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2.2
+BuildRequires: libv4l-devel
 BuildRequires: lua51-devel >= 5.1.0
 BuildRequires: pango-devel >= 1:1.10
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 BuildRequires: ruby
-Requires:      babl >= 0.1.4
-Requires:      glib2 >= 1:2.22.0
+%{?with_vala:BuildRequires:    vala}
+Requires:      babl >= 0.1.6
+Requires:      glib2 >= 1:2.28.0
 Requires:      gdk-pixbuf2 >= 2.18.0
 Requires:      jasper-libs >= 1.900.1
+Requires:      lensfun >= 0.2.5
 Requires:      libopenraw >= 0.0.5
 Requires:      librsvg >= 1:2.14.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -80,8 +85,8 @@ Summary:      Header files for gegl library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki gegl
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      babl-devel >= 0.1.4
-Requires:      glib2-devel >= 1:2.22.0
+Requires:      babl-devel >= 0.1.6
+Requires:      glib2-devel >= 1:2.28.0
 
 %description devel
 Header files for gegl library.
@@ -113,11 +118,22 @@ gegl library API documentation.
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki gegl.
 
+%package -n vala-gegl
+Summary:       Vala API for gegl library
+Summary(pl.UTF-8):     API języka Vala dla biblioteki gegl
+Group:         Development/Libraries
+Requires:      %{name}-devel = %{version}-%{release}
+
+%description -n vala-gegl
+Vala API for gegl library.
+
+%description -n vala-gegl -l pl.UTF-8
+API języka Vala dla biblioteki gegl.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -155,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/gegl
 %attr(755,root,root) %{_libdir}/libgegl-0.1.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgegl-0.1.so.0
+%{_libdir}/girepository-1.0/Gegl-0.1.typelib
 %dir %{_libdir}/gegl-0.1
 %attr(755,root,root) %{_libdir}/gegl-0.1/*.so
 
@@ -163,6 +180,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libgegl-0.1.so
 %{_libdir}/libgegl-0.1.la
 %{_includedir}/gegl-0.1
+%{_datadir}/gir-1.0/Gegl-0.1.gir
 %{_pkgconfigdir}/gegl.pc
 
 %files static
@@ -174,3 +192,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_gtkdocdir}/gegl
 %endif
+
+%if %{with vala}
+%files -n vala-gegl
+%defattr(644,root,root,755)
+%{_datadir}/vala/vapi/gegl-0.1.vapi
+%endif