SPECS (AC-branch): cinelerra.spec - merge 2.1 update from HEAD

[glen]

Author: glen                         Date: Fri Dec  8 12:59:10 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merge 2.1 update from HEAD

---- Files affected:
SPECS:
   cinelerra.spec (1.25 -> 1.25.2.1) 

---- Diffs:

================================================================
Index: SPECS/cinelerra.spec
diff -u SPECS/cinelerra.spec:1.25 SPECS/cinelerra.spec:1.25.2.1
--- SPECS/cinelerra.spec:1.25	Tue Jun 13 21:25:11 2006
+++ SPECS/cinelerra.spec	Fri Dec  8 13:59:05 2006
@@ -9,27 +9,28 @@
 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:	2.0
-Release:	2
+Version:	2.1
+Release:	1
 License:	GPL
 Group:		X11/Applications
 Source0:	http://dl.sourceforge.net/heroines/%{name}-%{version}-src.tar.bz2
-# Source0-md5:	2beb3f1df203cbdc8918f06ea573324c
+# Source0-md5:	0f0523ef1aa94efb5152dcc494009b56
 Patch0:		%{name}-system-libs.patch
 Patch1:		%{name}-strip.patch
 Patch2:		%{name}-fontsdir.patch
 Patch3:		%{name}-locale_h.patch
 Patch4:		%{name}-guicast_bootstrap.patch
+Patch5:		%{name}-fix.patch
 URL:		http://heroinewarrior.com/cinelerra.php3
 BuildRequires:	OpenEXR-devel >= 1.2.1
-BuildRequires:	XFree86-devel
+#BuildRequires:	OpenGL-devel >= 2.0
 BuildRequires:	alsa-lib-devel >= 1.0.8
 BuildRequires:	esound-devel
 BuildRequires:	freetype-devel >= 2.1.4
 BuildRequires:	lame-libs-devel >= 3.93.1
 BuildRequires:	libavc1394-devel >= 0.5.1
 BuildRequires:	libiec61883-devel >= 1.0.0
-BuildRequires:	libmpeg3-devel >= 1.6
+BuildRequires:	libmpeg3-devel >= 1.7
 BuildRequires:	libraw1394-devel >= 1.2.0
 BuildRequires:	libsndfile-devel >= 1.0.11
 BuildRequires:	libstdc++-devel >= 5:3.2.2
@@ -39,17 +40,18 @@
 %ifarch %{ix86}
 BuildRequires:	nasm
 %endif
-BuildRequires:	quicktime4linux-devel >= 2.1
+BuildRequires:	XFree86-devel
+BuildRequires:	quicktime4linux-devel >= 2.2
 Requires:	OpenEXR-devel >= 1.2.1
 Requires:	alsa-lib >= 1.0.8
 Requires:	freetype >= 2.1.4
 Requires:	libavc1394 >= 0.5.1
 Requires:	libiec61883 >= 1.0.0
-Requires:	libmpeg3 >= 1.6
+Requires:	libmpeg3 >= 1.7
 Requires:	libraw1394 >= 1.2.0
 Requires:	libsndfile >= 1.0.11
 Requires:	libtheora >= 1.0-0.alpha4
-Requires:	quicktime4linux >= 2.1
+Requires:	quicktime4linux >= 2.2
 Obsoletes:	bcast
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,8 +76,8 @@
 obejrzeć. Cinelerra nie jest dla konsumentów. Program ma wiele
 możliwości do edycji nieskompresowanej zawartości, obróbki w wysokiej
 rozdzielczości oraz montażu, z bardzo małą liczbą skrótów. Producenci
-potrzebują tych możliwości ze względu na konieczność retuszowania
-oraz modyfikacji formatu, co czyni program bardzo złożonym.
+potrzebują tych możliwości ze względu na konieczność retuszowania oraz
+modyfikacji formatu, co czyni program bardzo złożonym.
 
 Cinelerra była tworzona z myślą o zastąpieniu programu Broadcast 2000.
 
@@ -86,10 +88,15 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
-# assume we have <linux/videodev2.h> (it's in llh)
-echo '#define HAVE_VIDEO4LINUX2' > hvirtual_config.h
-echo '#define PACKAGE_STRING "cinelerra"' >> hvirtual_config.h
+# assume we have <linux/videodev2.h> and <linux/dvb/*> (present in llh)
+# don't define HAVE_GL as Mesa doesn't support OpenGL 2.0 (e.g. glUseProgram()) yet
+cat > hvirtual_config.h <<EOF
+#define HAVE_VIDEO4LINUX2
+#define HAVE_DVB
+#define PACKAGE_STRING "cinelerra"
+EOF
 
 rm -rf OpenEXR-* alsa-lib-* audiofile esound fftw-* freetype-* libavc1394-* libiec61883-* libmpeg3 libraw1394-* libsndfile-* libtheora-* mjpegtools-* quicktime tiff-* uuid
 
@@ -127,6 +134,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25.2.1  2006/12/08 12:59:05  glen
+- merge 2.1 update from HEAD
+
 Revision 1.25  2006/06/13 19:25:11  hawk
 - release 2
 - updated TODO
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/cinelerra.spec?r1=1.25&r2=1.25.2.1&f=u