- s/e2fsprogs-devel/libuuid-devel/

- BR: quicktime4linux-devel updated to >= 2.0.0
- added freetype patch to fix build titler plugin with ft 2.1.5
- release 2

Changed files:
    cinelerra-freetype.patch -> 1.1
    cinelerra.spec -> 1.10

diff --git a/cinelerra-freetype.patch b/cinelerra-freetype.patch
new file mode 100644 (file)
index 0000000..34eebe7
--- /dev/null
+++ b/cinelerra-freetype.patch
@@ -0,0 +1,11 @@
+--- cinelerra-1.1.7/plugins/titler/title.C.orig        2003-10-14 23:51:02.000000000 +0200
++++ cinelerra-1.1.7/plugins/titler/title.C     2003-10-15 00:26:11.787038584 +0200
+@@ -10,7 +10,7 @@
+ #include "freetype/ftbbox.h"
+ #include "freetype/ftglyph.h"
+ #include "freetype/ftoutln.h"
+-#include "freetype/ftstroker.h"
++#include FT_STROKER_H
+ #include "picon_png.h"
+ #include "plugincolors.h"
+ #include "title.h"

diff --git a/cinelerra.spec b/cinelerra.spec
index 676ee94162e46ffbfc0f72d1bfc9a3fc02c005fa..1dbb6c0486ab16aa1db4de076e48f64255e3f1f3 100644 (file)
--- a/cinelerra.spec
+++ b/cinelerra.spec
@@ -4,7 +4,7 @@ Summary:        Cinelerra - capturing, editing and production of audio/video material
 Summary(pl):   Cinelerra - nagrywanie, obróbka i produkcja materia³u audio/video
 Name:          cinelerra
 Version:       1.1.7
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/heroines/%{name}-%{version}-src.tar.bz2
@@ -13,18 +13,19 @@ Patch0:             %{name}-system-libs.patch
 Patch1:                %{name}-libsndfile1.patch
 Patch2:                %{name}-strip.patch
 Patch3:                %{name}-fontsdir.patch
+Patch4:                %{name}-freetype.patch
 URL:           http://heroinewarrior.com/cinelerra.php3
 BuildRequires: XFree86-devel
-# it's sick, but it's true - it uses libuuid functions
-BuildRequires: e2fsprogs-devel
 BuildRequires: esound-devel
+BuildRequires: freetype-devel >= 2.1.4
 BuildRequires: lame-libs-devel >= 3.93.1
 BuildRequires: libavc1394-devel >= 0.4.0
 BuildRequires: libmpeg3-devel >= 1.5.0-2
 BuildRequires: libsndfile-devel >= 1.0.0
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
-BuildRequires: quicktime4linux-devel >= 1.6.1-2
+BuildRequires: libuuid-devel
+BuildRequires: quicktime4linux-devel >= 2.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # defaulttheme and microtheme cannot be stripped
@@ -61,6 +62,7 @@ Cinelerra by
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 CFLAGS="%{rpmcflags} -fno-rtti"; export CFLAGS