- updated to 1.29.9.2

- removed outdated link,mp4v2,format-security patches
- now MP4 encoding is provided by custom code instead of using mp4v2

diff --git a/faac-link.patch b/faac-link.patch
deleted file mode 100644 (file)
index e329ecd..0000000
--- a/faac-link.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- faac/frontend/Makefile.am.orig     2004-07-28 10:18:21.000000000 +0200
-+++ faac/frontend/Makefile.am  2007-11-04 11:26:06.598027652 +0100
-@@ -7,5 +7,9 @@
- LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.la -lm -lstdc++
- else
- INCLUDES = -I$(top_srcdir)/include 
-+if WITH_EXT_MP4V2
-+LDADD = $(top_builddir)/libfaac/libfaac.la -lmp4v2 -lm -lstdc++
-+else
- LDADD = $(top_builddir)/libfaac/libfaac.la -lm
- endif
-+endif
---- faac/configure.in.orig     2007-08-20 20:03:22.000000000 +0200
-+++ faac/configure.in  2007-11-04 11:20:45.451726567 +0100
-@@ -28,6 +28,7 @@
- AC_CHECK_LIB(gnugetopt, getopt_long)
- 
- AM_CONDITIONAL(WITH_MP4V2, false)
-+AM_CONDITIONAL(WITH_EXT_MP4V2, false)
- 
- AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
-                AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
-@@ -36,6 +37,8 @@
- 
- if test x$external_mp4v2 = xyes; then
-   AC_MSG_NOTICE([*** Building with external mp4v2 ***])
-+  AM_CONDITIONAL(WITH_EXT_MP4V2, true)
-+  MY_DEFINE(HAVE_LIBMP4V2)
- else
-   if test x$WITHMP4V2 = xyes; then
-      AC_MSG_NOTICE([*** Building with internal mp4v2 ***])

diff --git a/faac.spec b/faac.spec
index 9db31ceab2ff6bc73c0faaaba5e7c808d42a6fa3..b780c8121982e17c464cff82f28271fb3a7b8774 100644 (file)
--- a/faac.spec
+++ b/faac.spec
@@ -1,26 +1,21 @@
 #
 # Conditional build:
 #
 # Conditional build:

-%bcond_without mp4v2           # without MPEG4 support in frontend (which requires mp4v2)

 %bcond_without static_libs     # don't build static libraries
 #
 Summary:       Freeware Advanced Audio Codec
 Summary(pl.UTF-8):     Freeware Advanced Audio Codec - darmowy zaawansowany kodek dźwięku
 Name:          faac
 %bcond_without static_libs     # don't build static libraries
 #
 Summary:       Freeware Advanced Audio Codec
 Summary(pl.UTF-8):     Freeware Advanced Audio Codec - darmowy zaawansowany kodek dźwięku
 Name:          faac

-Version:       1.28
-Release:       3
+Version:       1.29.9.2
+Release:       1

 License:       LGPL v2.1+
 Group:         Applications/Sound
 Source0:       http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.gz
 License:       LGPL v2.1+
 Group:         Applications/Sound
 Source0:       http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.gz

-# Source0-md5: 80763728d392c7d789cde25614c878f6
-Patch0:                %{name}-link.patch
-Patch1:                %{name}-mp4v2.patch
-Patch2:                format-security.patch
+# Source0-md5: 2b58d621fad8fda879f07b7cad8bfe10

 URL:           http://www.audiocoding.com/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: dos2unix
 BuildRequires: libtool
 URL:           http://www.audiocoding.com/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: dos2unix
 BuildRequires: libtool

-%{?with_mp4v2:BuildRequires:   mp4v2-devel >= 2.0.0}

 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -73,9 +68,6 @@ Statyczna biblioteka faac.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1
-%patch1 -p1
-%patch2 -p1

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


@@ -84,7 +76,6 @@ Statyczna biblioteka faac.
 %{__autoheader}
 %{__automake}
 %configure \
 %{__autoheader}
 %{__automake}
 %configure \

-       %{!?with_mp4v2:--without-mp4v2} \

        %{!?with_static_libs:--disable-static}
 %{__make}
 
        %{!?with_static_libs:--disable-static}
 %{__make}
 


@@ -107,13 +98,12 @@ rm -rf $RPM_BUILD_ROOT
 
 %files libs
 %defattr(644,root,root,755)
 
 %files libs
 %defattr(644,root,root,755)

-%doc ChangeLog README TODO docs/faac.html
+%doc AUTHORS ChangeLog NEWS README TODO

 %attr(755,root,root) %{_libdir}/libfaac.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfaac.so.0
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfaac.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfaac.so.0
 
 %files devel
 %defattr(644,root,root,755)

-%doc docs/libfaac.html

 %attr(755,root,root) %{_libdir}/libfaac.so
 %{_libdir}/libfaac.la
 %{_includedir}/faac*.h
 %attr(755,root,root) %{_libdir}/libfaac.so
 %{_libdir}/libfaac.la
 %{_includedir}/faac*.h