Update to 2.10.1

Signed-off-by: Sérgio M. Basto <sergio@serjux.com>

.gitignore

@@ -1,3 +1,2 @@
-faad2-2.7.tar.bz2
+faad2-*.tar.bz2
-/faad2-2.8.1.tar.bz2
+faad2-*.tar.gz
-/faad2-2.8.8.tar.gz

faad2-fix-overflows.patch

@@ -1,25 +0,0 @@
---- faad2/libfaad/bits.c	2007-11-01 13:33:29.000000000 +0100
-+++ faad2.new/libfaad/bits.c	2019-03-25 17:29:26.134199188 +0100
-@@ -167,7 +167,10 @@
-     int words = bits >> 5;
-     int remainder = bits & 0x1F;
- 
--    ld->bytes_left = ld->buffer_size - words*4;
-+    if (ld->buffer_size < words * 4)
-+        ld->bytes_left = 0;
-+    else
-+        ld->bytes_left = ld->buffer_size - words*4;
- 
-     if (ld->bytes_left >= 4)
-     {
---- faad2/libfaad/syntax.c	2019-03-25 17:57:36.930937066 +0100
-+++ faad2.new/libfaad/syntax.c	2019-03-25 17:49:26.135368525 +0100
-@@ -2292,6 +2292,8 @@
-     while ((drc->additional_excluded_chns[n-1] = faad_get1bit(ld
-         DEBUGVAR(1,104,"excluded_channels(): additional_excluded_chns"))) == 1)
-     {
-+        if (i >= MAX_CHANNELS - num_excl_chan - 7)
-+            return n;
-         for (i = num_excl_chan; i < num_excl_chan+7; i++)
-         {
-             drc->exclude_mask[i] = faad_get1bit(ld

faad2-pic.patch

@@ -1,23 +0,0 @@
---- a/common/mp4ff/Makefile.am
-+++ b/common/mp4ff/Makefile.am
-@@ -1,7 +1,7 @@
- noinst_LIBRARIES = libmp4ff.a
- noinst_HEADERS = mp4ff.h mp4ffint.h
- 
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 -DPIC -fPIC
- 
- libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- 		     mp4tagupdate.c mp4ff.h mp4ffint.h
-
---- a/common/mp4ff/Makefile.in
-+++ b/common/mp4ff/Makefile.in
-@@ -308,7 +307,7 @@
- top_srcdir = @top_srcdir@
- noinst_LIBRARIES = libmp4ff.a
- noinst_HEADERS = mp4ff.h mp4ffint.h
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_a_CFLAGS = -DUSE_TAGGING=1 -DPIC -fPIC
- libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
- 		     mp4tagupdate.c mp4ff.h mp4ffint.h
- 

faad2.spec

@@ -1,33 +1,19 @@
-%if 0%{?fedora} || 0%{?el7}
-%global _with_xmms 1
-%global	xmmsinputplugindir %(xmms-config --input-plugin-dir 2>/dev/null)
-%endif
-
 Summary:	Library and frontend for decoding MPEG2/4 AAC
 Name:		faad2
 Epoch:		1
-Version:	2.8.8
+Version:	2.10.1
-Release:	6%{?dist}
+Release:	1%{?dist}
 License:	GPLv2+
 URL:		http://www.audiocoding.com/faad2.html
-Source:		http://downloads.sourceforge.net/sourceforge/faac/%{name}-%{version}.tar.gz
+Source:		https://github.com/knik0/faad2/archive/%{version}/%{name}-%{version}.tar.gz
-# fix non-PIC objects in libmp4ff.a
+
-Patch0:		%{name}-pic.patch
-Patch1:		fix_undefined_version.patch
-# Security issue from videolan contribs
-Patch2:         faad2-fix-overflows.patch
 
 BuildRequires:	gcc-c++
-BuildRequires:	libsysfs-devel
+BuildRequires:  automake
-%{?_with_xmms:
+BuildRequires:  libtool
-BuildRequires: id3lib-devel
+BuildRequires:  libsysfs-devel
-BuildRequires: xmms-devel
+
-}
-BuildRequires:	zlib-devel
-
-%{!?_with_xmms:
 Obsoletes:	%{name}-xmms < %{version}-%{release}
-}
 
 %description
 FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
@@ -53,27 +39,13 @@ written from scratch.
 
 This package contains development files and documentation for libfaad.
 
-%{?_with_xmms:
-%package -n xmms-%{name}
-Summary:	AAC XMMS Input Plugin
-Requires:	%{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
-Provides:	xmms-aac%{?_isa} = %{version}-%{release}
-Obsoletes:	xmms-aac < 2.6.1
-
-%description -n xmms-%{name}
-FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
-written from scratch.
-
-This package contains an input plugin for xmms.
-}
-
 %prep
 %autosetup -p1
+./bootstrap
 
 %build
 %configure \
-    --disable-static \
+    --disable-static
-    %{?_with_xmms:--with-xmms}
 
 # remove rpath from libtool
 sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -104,15 +76,50 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
 %doc TODO
 %{_includedir}/faad.h
 %{_includedir}/neaacdec.h
+%{_libdir}/pkgconfig/faad2.pc
 %{_libdir}/libfaad*.so
 
-%{?_with_xmms:
-%files -n xmms-%{name}
-%doc plugins/xmms/{AUTHORS,NEWS,ChangeLog,README,TODO}
-%{xmmsinputplugindir}/libmp4.so
-}
-
 %changelog
+* Fri Oct 21 2022 Leigh Scott <leigh123linux@gmail.com> - 1:2.10.1-1
+- Update to 2.10.1
+
+* Sun Aug 07 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1:2.10.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
+  5.1
+
+* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 1:2.10.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 21 2021 Sérgio Basto <sergio@serjux.com> - 1:2.10.0-1
+- Update to 2.10.0
+
+* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.9.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 18 2020 Leigh Scott <leigh123linux@gmail.com> - 1:2.9.2-3
+- Rebuilt for i686
+
+* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.9.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 05 2020 Leigh Scott <leigh123linux@gmail.com> - 1:2.9.2-1
+- Update to 2.9.2
+
+* Thu Mar 12 2020 Leigh Scott <leigh123linux@gmail.com> - 1:2.9.1-3
+- Rebuilt for i686
+
+* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.9.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jan 01 2020 Leigh Scott <leigh123linux@googlemail.com> - 1:2.9.1-1
+- Update to 2.9.1
+
+* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1:2.8.8-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Fri Jun 07 2019 Nicolas Chauvet <kwizart@gmail.com> - 1:2.8.8-6
 - Fix overflows
 - Conditionalize xmms

fix_undefined_version.patch

@@ -1,12 +0,0 @@
---- a/include/neaacdec.h
-+++ b/include/neaacdec.h
-@@ -67,7 +67,7 @@
-   #define NEAACDECAPI
- #endif
- 
--#define FAAD2_VERSION "unknown"
-+#define FAAD2_VERSION "2.8.8"
- 
- /* object types for AAC */
- #define MAIN       1
-

sources

@@ -1 +1 @@
-28f6116efdbe9378269f8a6221767d1f  faad2-2.8.8.tar.gz
+SHA512 (faad2-2.10.1.tar.gz) = 8df69278350c68dd770c4bc482e42bc95eb04cd784eeea3f3fc58d615833c8b07dc3c72029bb7e5bfed612b7c1b8daefc9cb57be9789befb587120ef115e55b3