- build and package shared libmp4ff

- rel. 3

Changed files:
    faad2-mp4ff.patch -> 1.1
    faad2.spec -> 1.33

diff --git a/faad2-mp4ff.patch b/faad2-mp4ff.patch
new file mode 100644 (file)
index 0000000..0937e29
--- /dev/null
+++ b/faad2-mp4ff.patch
@@ -0,0 +1,15 @@
+--- faad2/common/mp4ff/Makefile.am.wiget       2009-10-28 18:54:29.000000000 +0100
++++ faad2/common/mp4ff/Makefile.am     2009-10-28 18:56:28.000000000 +0100
+@@ -1,8 +1,9 @@
+-noinst_LTLIBRARIES = libmp4ff.la
++lib_LTLIBRARIES = libmp4ff.la
++
++include_HEADERS = mp4ff.h
+ 
+ libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+ 
+ libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+-   mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
++   mp4tagupdate.c mp4ffint.h mp4ff_int_types.h \
+    drms.h drms.c drmstables.h
+-

diff --git a/faad2.spec b/faad2.spec
index 2ec9e44a2a731a817d0f479495a1c50215afc4a9..1b37b64fa0cadbb2ed071caf703b4b277df2089c 100644 (file)
--- a/faad2.spec
+++ b/faad2.spec
@@ -10,7 +10,7 @@ Summary:      Freeware Advanced Audio Decoder 2
 Summary(pl.UTF-8):     Darmowy zaawansowany dekoder audio
 Name:          faad2
 Version:       2.6.1
 Summary(pl.UTF-8):     Darmowy zaawansowany dekoder audio
 Name:          faad2
 Version:       2.6.1

-Release:       2
+Release:       3

 License:       GPL
 Group:         Applications/Sound
 Source0:       http://dl.sourceforge.net/faac/%{name}-%{version}.tar.gz
 License:       GPL
 Group:         Applications/Sound
 Source0:       http://dl.sourceforge.net/faac/%{name}-%{version}.tar.gz


@@ -20,6 +20,7 @@ Patch1:               %{name}-mpeg4ip.patch
 Patch2:                %{name}-soname.patch
 Patch3:                %{name}-backward_compat.patch
 Patch4:                %{name}-ac.patch
 Patch2:                %{name}-soname.patch
 Patch3:                %{name}-backward_compat.patch
 Patch4:                %{name}-ac.patch

+Patch5:                %{name}-mp4ff.patch

 URL:           http://www.audiocoding.com/
 %{?with_mpeg4ip:BuildRequires: SDL-devel}
 BuildRequires: autoconf
 URL:           http://www.audiocoding.com/
 %{?with_mpeg4ip:BuildRequires: SDL-devel}
 BuildRequires: autoconf


@@ -113,6 +114,7 @@ Wtyczka XMMS do plików AAC.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1

+%patch5 -p1

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}


@@ -151,18 +153,24 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libfaad.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfaad.so.0
 %doc AUTHORS ChangeLog NEWS README TODO
 %attr(755,root,root) %{_libdir}/libfaad.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfaad.so.0

+%attr(755,root,root) %{_libdir}/libmp4ff.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmp4ff.so.0

 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfaad.so
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfaad.so

+%attr(755,root,root) %{_libdir}/libmp4ff.so

 %{_libdir}/libfaad.la
 %{_libdir}/libfaad.la

+%{_libdir}/libmp4ff.la

 %{_includedir}/faad.h
 %{_includedir}/faad.h

+%{_includedir}/mp4ff.h

 %{_includedir}/neaacdec.h
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfaad.a
 %{_includedir}/neaacdec.h
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfaad.a

+%{_libdir}/libmp4ff.a

 %endif
 
 %if %{with xmms}
 %endif
 
 %if %{with xmms}