X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcinelerra-cv.git;a=blobdiff_plain;f=cinelerra-cv.spec;h=a94c08eb0a180a42bc8d0a4fdf78f88510d74b62;hp=49f2796915f9b79a5246de67105815fe8c4fcb19;hb=3862479174f367317f91abe3ba15bdaf361075d8;hpb=9a2d9fed59a3960deeed049477f557c78846cba1

diff --git a/cinelerra-cv.spec b/cinelerra-cv.spec
index 49f2796..a94c08e 100644
--- a/cinelerra-cv.spec
+++ b/cinelerra-cv.spec
@@ -1,21 +1,25 @@
 # TODO:
 # - external libraries packages (is there any sense in that?)
 #
-%define		snap	20100109
-%define		rel		9
+%define		snap	20121104
+%define		rel	4
 Summary:	Cinelerra - capturing, editing and production of audio/video material
 Summary(pl.UTF-8):	Cinelerra - nagrywanie, obróbka i produkcja materiału audio/video
 Name:		cinelerra-cv
-Version:	2.1
+Version:	2.2
 Release:	0.%{snap}.%{rel}
 License:	GPL
 Group:		X11/Applications
 # git clone git://git.cinelerra.org/j6t/cinelerra.git cinelerra-cv
 Source0:	%{name}-%{snap}.tar.bz2
-# Source0-md5:	e130b134a9e691ae36d2bbb117fc530b
+# Source0-md5:	06b92b01fa6ba32ca4622922f2cbaa68
 Patch0:		%{name}-build.patch
-Patch1:		%{name}-libpng.patch
-Patch2:		%{name}-desktop.patch
+Patch1:		%{name}-desktop.patch
+# http://bugs.cinelerra.org/raw-attachment/ticket/949/remove-support-v4l-buzz-k2-6-38.diff
+Patch2:		remove-support-v4l-buzz-k2-6-38.diff
+Patch3:		%{name}-ffmpeg.patch
+Patch4:		%{name}-format-security.patch
+Patch5:		%{name}-ffmpeg2.patch
 URL:		http://cinelerra.org/
 BuildRequires:	OpenEXR-devel >= 1.2.1
 BuildRequires:	OpenGL-GLU-devel
@@ -24,7 +28,7 @@ BuildRequires:	a52dec-libs-devel
 BuildRequires:	alsa-lib-devel >= 1.0.8
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	ffmpeg-devel
+BuildRequires:	ffmpeg-devel >= 0.7.1
 BuildRequires:	fftw3-devel
 BuildRequires:	freetype-devel >= 2.1.4
 BuildRequires:	gettext-devel
@@ -99,10 +103,12 @@ Wersja społecznościowa.
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p0
 
 find -name Makefile.am | xargs %{__sed} -i -e 's#^LIBTOOL =.*##g'
-%{__sed} -i -e 's/png_check_sig((unsigned char\*)test, 8)/!png_sig_cmp((unsigned char\*)test, 0, 8)/g' cinelerra/filepng.C
 
 %build
 rm -f m4/*.m4 *.m4
@@ -116,6 +122,7 @@ touch config.rpath
 
 %configure \
 	CPPFLAGS="%{rpmcppflags} -I/usr/include/freetype2" \
+	CXXFLAGS="%{rpmcxxflags} -D__STDC_CONSTANT_MACROS=1" \
 %ifarch ppc
 	--enable-altivec \
 %endif