SPECS: quicktime4linux.spec - merged from DEVEL

[qboosh]

Author: qboosh                       Date: Mon Oct 31 12:14:11 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   quicktime4linux.spec (1.61 -> 1.62) 

---- Diffs:

================================================================
Index: SPECS/quicktime4linux.spec
diff -u SPECS/quicktime4linux.spec:1.61 SPECS/quicktime4linux.spec:1.62
--- SPECS/quicktime4linux.spec:1.61	Mon Oct 31 13:08:29 2005
+++ SPECS/quicktime4linux.spec	Mon Oct 31 13:14:06 2005
@@ -12,24 +12,25 @@
 Patch1:		%{name}-libs.patch
 Patch2:		%{name}-broken.patch
 URL:		http://heroinewarrior.com/quicktime.php3
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	faac-devel >= 1.24
 BuildRequires:	faad2-devel >= 2.0
-BuildRequires:	ffmpeg-devel >= 0.4.8
-BuildRequires:	glib-devel
+BuildRequires:	ffmpeg-devel >= 0.4.9-1.20050714
 BuildRequires:	lame-libs-devel >= 3.93.1
-BuildRequires:	libdv-devel >= 0.102
+BuildRequires:	libdv-devel >= 0.104
 BuildRequires:	libjpeg-devel
-BuildRequires:	libmpeg3-devel >= 1.5.3
-BuildRequires:	libogg-devel >= 2:1.0
+BuildRequires:	libmpeg3-devel >= 1.6
+BuildRequires:	libogg-devel >= 2:1.1.2
 BuildRequires:	libpng-devel >= 1.0.8
 BuildRequires:	libtool
-BuildRequires:	libvorbis-devel >= 1:1.0
-BuildRequires:	libx264-devel
+BuildRequires:	libvorbis-devel >= 1:1.1.1
+BuildRequires:	libx264-devel >= 0.1.2-1.20050714
 BuildRequires:	pkgconfig >= 1:0.9.0
-Requires:	ffmpeg >= 0.4.8
-Requires:	libdv >= 0.99
-Requires:	libmpeg3 >= 1.5.3
+Requires:	ffmpeg >= 0.4.9-1.20050714
+Requires:	libdv >= 0.104
+Requires:	libmpeg3 >= 1.6
+Requires:	libx264 >= 0.1.2-1.20050714
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -50,15 +51,17 @@
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	faad2-devel >= 2.0
-Requires:	ffmpeg-devel >= 0.4.8
+Requires:	ffmpeg-devel >= 0.4.9-1.20050714
 Requires:	glib-devel
 Requires:	lame-libs-devel >= 3.93.1
-Requires:	libdv-devel >= 0.99
+Requires:	libdv-devel >= 0.104
 Requires:	libjpeg-devel
-Requires:	libmpeg3-devel >= 1.5.3
-Requires:	libogg-devel >= 2:1.0
+Requires:	libmpeg3-devel >= 1.6
+Requires:	libogg-devel >= 2:1.1.2
 Requires:	libpng-devel >= 1.0.8
-Requires:	libvorbis-devel >= 1:1.0
+Requires:	libvorbis-devel >= 1:1.1.1
+Requires:	libx264-devel >= 0.1.2-1.20050714
+Obsoletes:	libquicktime-devel
 
 %description devel
 Header files and development documentation for quicktime4linux.
@@ -66,23 +69,12 @@
 %description devel -l pl
 Pliki nagłówkowe i dokumentacja do biblioteki quicktime4linux.
 
-%package progs
-Summary:	Useful tools to operate at Quicktime files
-Summary(pl):	Pożyteczne narzędzia od operowania na plikach w formacie Quicktime
-Group:		Applications/Multimedia
-Requires:	%{name} = %{version}-%{release}
-
-%description progs
-Useful tools to operate at Quicktime files.
-
-%description progs -l pl
-Pożyteczne narzędzia od operowania na plikach w formacie Quicktime.
-
 %package static
 Summary:	Static quicktime4linux libraries
 Summary(pl):	Biblioteki statyczne quicktime4linux
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
+Obsoletes:	libquicktime-static
 
 %description static
 Static quicktime4linux libraries.
@@ -90,14 +82,25 @@
 %description static -l pl
 Biblioteki statyczne quicktime4linux.
 
+%package progs
+Summary:	Useful tools to operate at Quicktime files
+Summary(pl):	Pożyteczne narzędzia od operowania na plikach w formacie Quicktime
+Group:		Applications/Multimedia
+Requires:	%{name} = %{version}-%{release}
+
+%description progs
+Useful tools to operate at Quicktime files.
+
+%description progs -l pl
+Pożyteczne narzędzia od operowania na plikach w formacie Quicktime.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 
-rm -rf faad2 ffmpeg-* jpeg jpeg-mmx-* lame-* libdv-* libogg-* libvorbis-*
-%{__perl} -pi -e 's@"faad2/include/faad\.h"@<faad.h>@' mp4a.c
+rm -rf faac-1.24 faad2-2.0 ffmpeg.* jpeg jpeg-mmx.* lame-* libdv-* libogg-* libvorbis-* x264.*
 
 %build
 %{__libtoolize}
@@ -127,10 +130,6 @@
 %doc README
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
-%files progs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-
 %files devel
 %defattr(644,root,root,755)
 %doc docs/*.html
@@ -142,17 +141,37 @@
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
+%files progs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/*
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.62  2005/10/31 12:14:06  qboosh
+- merged from DEVEL
+
 Revision 1.61  2005/10/31 12:08:29  arekm
 - up to 2.1
 
 Revision 1.60  2005/10/31 11:00:11  arekm
 - rel 4
+
+Revision 1.59.2.4  2005/10/26 19:43:02  qboosh
+- -devel,-static Obsoletes: libquicktime-* for easy switching
+
+Revision 1.59.2.3  2005/10/24 17:33:21  qboosh
+- updated acam patch, now builds with DEVEL ffmpeg/libx264
+
+Revision 1.59.2.2  2005/10/13 15:41:52  qboosh
+- updated ffmpeg release; needs newer libx264 as well
+
+Revision 1.59.2.1  2005/10/11 20:21:36  qboosh
+- partially updated to 2.1 (saving work - requires too new ffmpeg)
+- updated acam,libs patches and deps
 
 Revision 1.59  2005/03/29 18:04:26  havner
 - rel up for one more rebuild (sparc didn't upgrade ffmpeg)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/quicktime4linux.spec?r1=1.61&r2=1.62&f=u