X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcinelerra-cv.git;a=blobdiff_plain;f=cinelerra-cv.spec;h=eacdb3a3eb792dae982ffd43e64e268feb0484b0;hp=5c4b9cc31da03bad918bddf7bc8c7b3368b23c51;hb=bdb0f0c46253d6e2ffbd36e7da3caacae78124de;hpb=2c7218ef33351be8c51aedc1aa8145bf16d8a60a

diff --git a/cinelerra-cv.spec b/cinelerra-cv.spec
index 5c4b9cc..eacdb3a 100644
--- a/cinelerra-cv.spec
+++ b/cinelerra-cv.spec
@@ -1,27 +1,34 @@
 # TODO:
 # - external libraries packages (is there any sense in that?)
 #
-%define	snap	20061125
+%define		snap	20121105
+%define		rel	1
 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
-Release:	0.%{snap}.6
+Version:	2.2
+Release:	0.%{snap}.%{rel}
 License:	GPL
 Group:		X11/Applications
-# svn://svn.skolelinux.org/cinelerra/trunk/hvirtual
-Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	89a039be86acab89ed392ce987dea2c8
+# git clone git://git.cinelerra.org/CinelerraCV.git cinelerra-cv
+Source0:	%{name}-%{snap}.tar.bz2
+# Source0-md5:	06b92b01fa6ba32ca4622922f2cbaa68
 Patch0:		%{name}-build.patch
-URL:		http://cvs.cinelerra.org/
+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
 BuildRequires:	OpenGL-devel
 BuildRequires:	a52dec-libs-devel
 BuildRequires:	alsa-lib-devel >= 1.0.8
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	esound-devel
-BuildRequires:	ffmpeg-devel
+BuildRequires:	ffmpeg-devel >= 0.7.1
 BuildRequires:	fftw3-devel
 BuildRequires:	freetype-devel >= 2.1.4
 BuildRequires:	gettext-devel
@@ -30,6 +37,7 @@ BuildRequires:	libavc1394-devel >= 0.5.1
 BuildRequires:	libdv-devel
 BuildRequires:	libiec61883-devel >= 1.0.0
 #BuildRequires:	libmpeg3-devel >= 1.7
+BuildRequires:	libpng-devel >= 2:1.4.0
 BuildRequires:	libraw1394-devel >= 1.2.0
 BuildRequires:	libsndfile-devel >= 1.0.11
 BuildRequires:	libstdc++-devel >= 5:3.2.2
@@ -38,15 +46,17 @@ BuildRequires:	libtiff-devel >= 3.5.7
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 BuildRequires:	mjpegtools-devel
-%ifarch %{ix86}
+BuildRequires:	pkgconfig
+%ifarch %{ix86} %{x8664}
 BuildRequires:	nasm
 %endif
 #BuildRequires:	quicktime4linux-devel >= 2.2
+BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXv-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
-Requires:	OpenEXR-devel >= 1.2.1
+Requires:	OpenEXR >= 1.2.1
 Requires:	alsa-lib >= 1.0.8
 Requires:	freetype >= 2.1.4
 Requires:	libavc1394 >= 0.5.1
@@ -87,11 +97,18 @@ modyfikacji formatu, co czyni program bardzo złożonym.
 
 Cinelerra była tworzona z myślą o zastąpieniu programu Broadcast 2000.
 
-Wersja Społecznościowa.
+Wersja społecznościowa.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
+#%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p0
+
+find -name Makefile.am | xargs %{__sed} -i -e 's#^LIBTOOL =.*##g'
 
 %build
 rm -f m4/*.m4 *.m4
@@ -104,6 +121,8 @@ touch config.rpath
 %{__autoconf}
 
 %configure \
+	CPPFLAGS="%{rpmcppflags} -I/usr/include/freetype2" \
+	CXXFLAGS="%{rpmcxxflags} -D__STDC_CONSTANT_MACROS=1" \
 %ifarch ppc
 	--enable-altivec \
 %endif
@@ -111,6 +130,7 @@ touch config.rpath
 	--enable-mmx \
 	--enable-3dnow \
 %endif
+	--disable-esd \
 	--enable-freetype2 \
 	--with-external-ffmpeg \
 	--with-alsa-prefix=%{_prefix} \