- updated to 2.8.6 (new soname, but keep libfaad.so.0 symlink for compatibility)

- updated mpeg4ip,backward_compat,mp4ff patches
- removed obsolete soname,man patches

diff --git a/faad2-backward_compat.patch b/faad2-backward_compat.patch
index a951cd3c9de8fdced2dd37290c10275205f7a382..812118969b8a740e034ffe42dd02e3dea34f9e47 100644 (file)
--- a/faad2-backward_compat.patch
+++ b/faad2-backward_compat.patch
@@ -1,14 +1,3 @@
---- faad2/libfaad/Makefile.am.orig     2007-01-16 17:52:58.000000000 +0000
-+++ faad2/libfaad/Makefile.am  2007-01-16 17:53:29.000000000 +0000
-@@ -4,7 +4,7 @@
-                   $(top_srcdir)/include/neaacdec.h
- 
- libfaad_la_LIBADD = -lm
--libfaad_la_LDFLAGS = -version-info 1:0:0
-+libfaad_la_LDFLAGS = -version-info 1:0:1
- 
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
- drm_dec.c error.c filtbank.c \
 --- faad2/libfaad/decoder.c.orig       2007-11-01 13:33:30.000000000 +0100
 +++ faad2/libfaad/decoder.c    2007-11-04 12:36:41.315350439 +0100
 @@ -1115,3 +1115,57 @@

diff --git a/faad2-man.patch b/faad2-man.patch
deleted file mode 100644 (file)
index 3b08ebb..0000000
--- a/faad2-man.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- faad2-2.7/frontend/Makefile.am.orig        2010-10-25 20:33:12.575740205 +0200
-+++ faad2-2.7/frontend/Makefile.am     2010-10-25 21:05:15.419741043 +0200
-@@ -1,5 +1,5 @@
- bin_PROGRAMS = faad
--man_MANS = faad.man
-+man_MANS = faad.1
- 
- INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
-          -I$(top_srcdir)/common/mp4ff

diff --git a/faad2-mp4ff.patch b/faad2-mp4ff.patch
index 615d58b2a5971f5d72914be666e8895136f30753..da948ab416a1a8f44e5270dd12a58508797af3fc 100644 (file)
--- a/faad2-mp4ff.patch
+++ b/faad2-mp4ff.patch
@@ -1,28 +1,17 @@
---- faad2-2.7/common/mp4ff/Makefile.am.orig    2009-02-06 15:24:21.000000000 +0100
-+++ faad2-2.7/common/mp4ff/Makefile.am 2010-10-25 19:57:49.095738529 +0200
+--- faad2-2.8.6/common/mp4ff/Makefile.am.orig  2017-12-11 17:43:53.975769960 +0100
++++ faad2-2.8.6/common/mp4ff/Makefile.am       2017-12-11 17:54:59.092429032 +0100
 @@ -1,7 +1,7 @@
--lib_LIBRARIES = libmp4ff.a
--include_HEADERS = mp4ff.h mp4ffint.h
+-noinst_LIBRARIES = libmp4ff.a
+-noinst_HEADERS = mp4ff.h mp4ffint.h
 +lib_LTLIBRARIES = libmp4ff.la
-+include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
++include_HEADERS = mp4ff.h mp4ffint.h
  
 -libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
 +libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
  
 -libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
 +libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-                    mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
---- faad2-2.7/frontend/Makefile.am.orig        2009-02-06 17:03:37.000000000 +0100
-+++ faad2-2.7/frontend/Makefile.am     2010-10-25 20:08:54.015739367 +0200
-@@ -5,7 +5,7 @@
-          -I$(top_srcdir)/common/mp4ff
- 
- faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
--           $(top_builddir)/common/mp4ff/libmp4ff.a
-+           $(top_builddir)/common/mp4ff/libmp4ff.la
- 
- faad_SOURCES = main.c \
-              audio.c audio.h \
+                    mp4tagupdate.c mp4ff.h mp4ffint.h
 --- faad2-2.7/plugins/xmms/src/Makefile.am.orig        2010-10-25 20:09:20.343741882 +0200
 +++ faad2-2.7/plugins/xmms/src/Makefile.am     2010-10-25 20:32:37.203740205 +0200
 @@ -7,7 +7,7 @@

diff --git a/faad2-mpeg4ip.patch b/faad2-mpeg4ip.patch
index 97d6e3e527fd29b2257255fec9eb83a233771a0c..0c9efed35a5d56cf534b884b9df2ef99593acd57 100644 (file)
--- a/faad2-mpeg4ip.patch
+++ b/faad2-mpeg4ip.patch
@@ -99,8 +99,8 @@
  int aac_file_eof(codec_data_t *ifptr);
  
  void aac_file_used_for_frame(codec_data_t *ifptr,
---- faad2/configure.in.orig    2006-09-25 21:52:53.000000000 +0200
-+++ faad2/configure.in 2007-11-04 11:51:50.486008814 +0100
+--- faad2/configure.ac.orig    2006-09-25 21:52:53.000000000 +0200
++++ faad2/configure.ac 2007-11-04 11:51:50.486008814 +0100
 @@ -123,6 +123,8 @@
     if test x$external_mp4v2 = xyes; then
        AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, true)

diff --git a/faad2-soname.patch b/faad2-soname.patch
deleted file mode 100644 (file)
index 63d0094..0000000
--- a/faad2-soname.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- faad2/libfaad/Makefile.am.orig     2007-01-16 17:52:58.000000000 +0000
-+++ faad2/libfaad/Makefile.am  2007-01-16 17:53:29.000000000 +0000
-@@ -3,6 +3,7 @@
-                   $(top_srcdir)/include/neaacdec.h
- 
- libfaad_la_LIBADD = -lm
-+libfaad_la_LDFLAGS = -version-info 1:0:0
- 
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
- drm_dec.c error.c filtbank.c \

diff --git a/faad2.spec b/faad2.spec
index 9aaf1ef1510d4e3e423a1334a2d0f58aa5f3a671..bd77728b18bc79d13db9520aac40fdf2e3fdb211 100644 (file)
--- a/faad2.spec
+++ b/faad2.spec
@@ -9,18 +9,16 @@
 Summary:       Freeware Advanced Audio Decoder 2
 Summary(pl.UTF-8):     Darmowy zaawansowany dekoder audio
 Name:          faad2
-Version:       2.7
-Release:       6
+Version:       2.8.6
+Release:       1
 License:       GPL v2+
 Group:         Applications/Sound
-Source0:       http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.bz2
-# Source0-md5: 4c332fa23febc0e4648064685a3d4332
+Source0:       http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.gz
+# Source0-md5: 21aa96dd6d57fd0436bf81c3988969ce
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-mpeg4ip.patch
-Patch2:                %{name}-soname.patch
 Patch3:                %{name}-backward_compat.patch
 Patch4:                %{name}-mp4ff.patch
-Patch5:                %{name}-man.patch
 Patch6:                %{name}-mp4v2.patch
 URL:           http://www.audiocoding.com/
 %{?with_mpeg4ip:BuildRequires: SDL-devel}
@@ -32,7 +30,7 @@ BuildRequires:        libtool >= 2:1.4d-3
 BuildRequires: mp4v2-devel
 BuildRequires: mpeg4ip-devel >= 1:1.6
 %endif
-%{?with_xmms:BuildRequires:    rpmbuild(macros) >= 1.125}
+BuildRequires: rpmbuild(macros) >= 1.721
 %{?with_xmms:BuildRequires:    xmms-devel}
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -49,6 +47,9 @@ obsługujący profile LC, MAIN i LTP.
 Summary:       FAAD 2 libraries
 Summary(pl.UTF-8):     Biblioteki FAAD 2
 Group:         Libraries
+%if 0%{?_soname_prov:1}
+Provides:      %{_soname_prov libfaad.so.0}
+%endif
 Conflicts:     faad2 < 2.0-3
 
 %description libs
@@ -115,12 +116,9 @@ Wtyczka XMMS do plików AAC.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch6 -p1
-mv -f frontend/faad.{man,1}
 
 %build
 %{__libtoolize}
@@ -148,6 +146,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/mp4player_plugin/*.{la,a}
 %endif
 
+# for compatibility with apps using dlopen("libfaad.so.0")
+ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libfaad.so.2.*.*) $RPM_BUILD_ROOT%{_libdir}/libfaad.so.0
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -163,19 +164,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %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) %ghost %{_libdir}/libfaad.so.2
+# compat symlink
+%attr(755,root,root) %{_libdir}/libfaad.so.0
+%attr(755,root,root) %{_libdir}/libfaad_drm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libfaad_drm.so.2
 %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
+%attr(755,root,root) %{_libdir}/libfaad_drm.so
 %attr(755,root,root) %{_libdir}/libmp4ff.so
 %{_libdir}/libfaad.la
+%{_libdir}/libfaad_drm.la
 %{_libdir}/libmp4ff.la
 %{_includedir}/faad.h
 %{_includedir}/mp4ff.h
-%{_includedir}/mp4ff_int_types.h
 %{_includedir}/mp4ffint.h
 %{_includedir}/neaacdec.h
 
@@ -183,6 +189,7 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfaad.a
+%{_libdir}/libfaad_drm.a
 %{_libdir}/libmp4ff.a
 %endif