X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffaad2.git;a=blobdiff_plain;f=faad2.spec;h=3feaac9845f4a492c611e26f59c2349450d54dc6;hp=287d382bc75bdf1855a0f9140ad8d3d3f757ddb2;hb=269b5740213e6d02367a74515a2fd1ba06921004;hpb=db60caea36446c50b86f275650db9899ecf6737c

diff --git a/faad2.spec b/faad2.spec
index 287d382..3feaac9 100644
--- a/faad2.spec
+++ b/faad2.spec
@@ -1,25 +1,36 @@
 #
 # Conditional build:
-%bcond_without	xmms	# without XMMS plugin
+%bcond_without	mpeg4ip		# build without mp4v2 support in decoder
+				# ...and don't build XMMS or MPEG4IP plugins
+%bcond_without	xmms		# don't build XMMS plugin
+%bcond_with	bootstrap	# bootstrap (alias for _without_mpeg4ip)
 #
-%define		_rc rc3
+%{?with_bootstrap:%undefine with_mpeg4ip}
+%{!?with_mpeg4ip:%undefine with_xmms}
 Summary:	Freeware Advanced Audio Decoder 2
 Summary(pl):	Darmowy zaawansowany dekoder audio
 Name:		faad2
 Version:	2.0
-Release:	1
+Release:	5.4
 License:	GPL
-Group:		Libraries
-Source0:	http://dl.sourceforge.net/faac/%{name}-%{version}-%{_rc}.tar.gz
-# Source0-md5:	0080076438655ed7facf1089a9805aff
+Group:		Applications/Sound
+Source0:	http://dl.sourceforge.net/faac/%{name}-%{version}.tar.gz
+# Source0-md5:	1a6f79365f2934a4888b210ef47a3a07
+Patch0:		%{name}-make.patch
+Patch1:		%{name}-mp4v2.patch
+Patch2:		%{name}-no-extension.patch
+Patch3:		%{name}-mpeg4ip.patch
+Patch4:		%{name}-gcc4.patch
+Patch5:		%{name}-inttypes_h.patch
 URL:		http://www.audiocoding.com/
 BuildRequires:	autoconf
 BuildRequires:	automake
-%{!?_without_xmms:BuildRequires:	id3lib-devel >= 3.8.2 }
-BuildRequires:	libsndfile-devel >= 1.0.4
-BuildRequires:	libtool
-%{!?_without_xmms:Buildrequires:	rpmbuild(macros) >= 1.125}
-%{!?_without_xmms:BuildRequires:	xmms-devel}
+%{?with_xmms:BuildRequires:	id3lib-devel >= 3.8.2}
+BuildRequires:	libtool >= 2:1.4d-3
+%{?with_mpeg4ip:BuildRequires:	mpeg4ip-devel >= 1.1}
+%{?with_xmms:BuildRequires:	rpmbuild(macros) >= 1.125}
+%{?with_xmms:BuildRequires:	xmms-devel}
+Requires:	%{name}-libs = %{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,14 +41,30 @@ completely written from scratch.
 FAAD 2 to napisany ca³kowicie od pocz±tku dekoder MPEG2 i MPEG-4
 obs³uguj±cy profile LC, MAIN i LTP.
 
+%package libs
+Summary:	FAAD 2 libraries
+Summary(pl):	Biblioteki FAAD 2
+Group:		Libraries
+Conflicts:	faad2 < 2.0-3
+
+%description libs
+FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder,
+completely written from scratch. This package contains base FAAD 2
+libraries: libfaad and libmp4ff.
+
+%description libs -l pl
+FAAD 2 to napisany ca³kowicie od pocz±tku dekoder MPEG2 i MPEG-4
+obs³uguj±cy profile LC, MAIN i LTP. Ten pakiet zawiera podstawowe
+biblioteki FAAD 2: libfaad i libmp4ff.
+
 %package devel
-Summary:	Devel files for faad2
+Summary:	Header files for faad2
 Summary(pl):	Pliki nag³ówkowe faad2
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
-Devel files for faad2.
+Header files for faad2.
 
 %description devel -l pl
 Pliki nag³ówkowe faad2.
@@ -46,7 +73,7 @@ Pliki nag
 Summary:	Static faad2 library
 Summary(pl):	Statyczna biblioteka faad2
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static faad2 library.
@@ -54,11 +81,24 @@ Static faad2 library.
 %description static -l pl
 Statyczna biblioteka faad2.
 
+%package -n mpeg4ip-plugin-faad2
+Summary:	MPEG4IP plugin for AAC files
+Summary(pl):	Wtyczka MPEG4IP do plików AAC
+Group:		Applications/Sound
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	mpeg4ip
+
+%description -n mpeg4ip-plugin-faad2
+MPEG4IP plugin for AAC files.
+
+%description -n mpeg4ip-plugin-faad2 -l pl
+Wtyczka MPEG4IP do plików AAC.
+
 %package -n xmms-input-faad2
 Summary:	XMMS plugin for AAC files
 Summary(pl):	Wtyczka XMMS do plików AAC
 Group:		X11/Applications/Sound
-Requires:	%{name} = %{version}
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	xmms
 
 %description -n xmms-input-faad2
@@ -69,16 +109,24 @@ Wtyczka XMMS do plik
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
-sh ./bootstrap
-%configure
-%{__make}
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	--with%{!?with_xmms:out}-xmms \
+	--with%{!?with_mpeg4ip:out}-mp4v2
 
-%if %{with xmms}
-%{__make} -C plugins/xmms \
-	GTK_CONFIG=gtk-config
-%endif
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -86,38 +134,47 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%if %{with xmms}
-%{__make} \
-	-C plugins/xmms \
-	install \
-	GTK_CONFIG=gtk-config \
-	DESTDIR=$RPM_BUILD_ROOT
-%endif
+rm -f $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.{la,a}
+rm -f $RPM_BUILD_ROOT%{_libdir}/mp4player_plugin/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /sbin/ldconfig
-%postun	-p /sbin/ldconfig
+%post	libs -p /sbin/ldconfig
+%postun	libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/faad
+
+%files libs
+%defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libfaad.so.*.*
+%attr(755,root,root) %{_libdir}/libmp4ff.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_includedir}/*.h
+%attr(755,root,root) %{_libdir}/libfaad.so
+%attr(755,root,root) %{_libdir}/libmp4ff.so
+%{_libdir}/libfaad.la
+%{_libdir}/libmp4ff.la
+%{_includedir}/faad.h
+%{_includedir}/mp4ff.h
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libfaad.a
+%{_libdir}/libmp4ff.a
 
 %if %{with xmms}
 %files -n xmms-input-faad2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{xmms_input_plugindir}/*.so
 %endif
+
+%if %{with mpeg4ip}
+%files -n mpeg4ip-plugin-faad2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/mp4player_plugin/*.so*
+%endif