X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcinelerra-cv.git;a=blobdiff_plain;f=cinelerra-cv.spec;h=48516ed46355e384455f4d4ed5adb080cac540e7;hp=4828eee013aa2d6751fe12fb64733f44aff9469e;hb=1d5e4df722a3df7370924995815e260e7b8863e2;hpb=fe5cd210c03a61f6eaf1feb405c85aa797ca19bb

diff --git a/cinelerra-cv.spec b/cinelerra-cv.spec
index 4828eee..48516ed 100644
--- a/cinelerra-cv.spec
+++ b/cinelerra-cv.spec
@@ -1,27 +1,30 @@
 # TODO:
 # - external libraries packages (is there any sense in that?)
 #
-%define	snap	20061125
+%define		snap	20100109
+%define		rel		7
 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}.10
+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/j6t/cinelerra.git cinelerra-cv
+Source0:	%{name}-%{snap}.tar.bz2
+# Source0-md5:	e130b134a9e691ae36d2bbb117fc530b
 Patch0:		%{name}-build.patch
-URL:		http://cvs.cinelerra.org/
+Patch1:		%{name}-libpng.patch
+Patch2:		%{name}-desktop.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:	findutils
 BuildRequires:	ffmpeg-devel
 BuildRequires:	fftw3-devel
 BuildRequires:	freetype-devel >= 2.1.4
@@ -31,6 +34,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
@@ -39,15 +43,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
@@ -88,13 +94,16 @@ 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
 
-find . -name Makefile.am -exec sed -i -e 's#^LIBTOOL =.*##g' "{}" ";"
+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
@@ -107,6 +116,7 @@ touch config.rpath
 %{__autoconf}
 
 %configure \
+	CPPFLAGS="%{rpmcppflags} -I/usr/include/freetype2" \
 %ifarch ppc
 	--enable-altivec \
 %endif