rpms
/
faad2
21
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:el9
Branches Tags
rpms:i10ce
rpms:i10fe
rpms:i8cr
rpms:i9cr
rpms:el9
rpms:el8
...
pull from: rpms:i8cr
Branches Tags
rpms:i10ce
rpms:i10fe
rpms:i8cr
rpms:i9cr
rpms:el9
rpms:el8

No commits in common. 'el9' and 'i8cr' have entirely different histories.
el9 ... i8cr

7 changed files with 108 additions and 53 deletions
Show Stats

1
.faad2.metadata
Unescape View File

@ -0,0 +1 @@
0d49c516d4a83c39053a9bd214fddba72cbc34ad SOURCES/faad2-2.8.8.tar.gz

3
.gitignore vendored
Unescape View File

@ -1,2 +1 @@
faad2-*.tar.bz2 SOURCES/faad2-2.8.8.tar.gz
faad2-*.tar.gz

25
SOURCES/faad2-fix-overflows.patch
Unescape View File

@ -0,0 +1,25 @@
--- 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

23
SOURCES/faad2-pic.patch
Unescape View File

@ -0,0 +1,23 @@
--- 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

12
SOURCES/fix_undefined_version.patch
Unescape View File

@ -0,0 +1,12 @@
--- 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

96
faad2.spec → SPECS/faad2.spec
Unescape View File

@ -1,19 +1,33 @@
%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 Summary: Library and frontend for decoding MPEG2/4 AAC
Name: faad2 Name: faad2
Epoch: 1 Epoch: 1
Version: 2.10.1 Version: 2.8.8
Release: 1%{?dist} Release: 6%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://www.audiocoding.com/faad2.html URL: http://www.audiocoding.com/faad2.html
Source: https://github.com/knik0/faad2/archive/%{version}/%{name}-%{version}.tar.gz Source: http://downloads.sourceforge.net/sourceforge/faac/%{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: gcc-c++
BuildRequires: automake BuildRequires: libsysfs-devel
BuildRequires: libtool %{?_with_xmms:
BuildRequires: libsysfs-devel BuildRequires: id3lib-devel
BuildRequires: xmms-devel
}
BuildRequires: zlib-devel
%{!?_with_xmms:
Obsoletes: %{name}-xmms < %{version}-%{release} Obsoletes: %{name}-xmms < %{version}-%{release}
}
%description %description
FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
@ -39,13 +53,27 @@ written from scratch.
This package contains development files and documentation for libfaad. 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 %prep
%autosetup -p1 %autosetup -p1
./bootstrap
%build %build
%configure \ %configure \
--disable-static --disable-static \
%{?_with_xmms:--with-xmms}
# remove rpath from libtool # remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@ -76,49 +104,17 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
%doc TODO %doc TODO
%{_includedir}/faad.h %{_includedir}/faad.h
%{_includedir}/neaacdec.h %{_includedir}/neaacdec.h
%{_libdir}/pkgconfig/faad2.pc
%{_libdir}/libfaad*.so %{_libdir}/libfaad*.so
%changelog %{?_with_xmms:
* Fri Oct 21 2022 Leigh Scott <leigh123linux@gmail.com> - 1:2.10.1-1 %files -n xmms-%{name}
- Update to 2.10.1 %doc plugins/xmms/{AUTHORS,NEWS,ChangeLog,README,TODO}
%{xmmsinputplugindir}/libmp4.so
* 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 %changelog
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild * Tue Feb 27 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1:2.8.8-6
- Rebuilt for MSVSphere 8.9
* 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 * Fri Jun 07 2019 Nicolas Chauvet <kwizart@gmail.com> - 1:2.8.8-6
- Fix overflows - Fix overflows

1
sources
Unescape View File

@ -1 +0,0 @@
SHA512 (faad2-2.10.1.tar.gz) = 8df69278350c68dd770c4bc482e42bc95eb04cd784eeea3f3fc58d615833c8b07dc3c72029bb7e5bfed612b7c1b8daefc9cb57be9789befb587120ef115e55b3
Write Preview
Loading…
Cancel
Save