commit 14cf5096c3c81c606cf7852f367bd1bc4a07c804 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Jan 1 00:52:39 2020 +0000 Update to 1.30 .gitignore | 1 + faac-1.29.9.2-drm.patch | 152 ------------------------------------------------ faac-1.30-drm.patch | 24 ++++++++ faac.spec | 18 ++++-- sources | 2 +- 5 files changed, 39 insertions(+), 158 deletions(-) --- diff --git a/.gitignore b/.gitignore index ada72a8..41e8681 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ faac-1.28.tar.bz2 /faac-1.29.3.tar.gz /faac-1.29.9.2.tar.gz +/faac-1_30.tar.gz diff --git a/faac-1.30-drm.patch b/faac-1.30-drm.patch new file mode 100644 index 0000000..685b6ce --- /dev/null +++ b/faac-1.30-drm.patch @@ -0,0 +1,24 @@ +diff --git a/libfaac/Makefile.am b/libfaac/Makefile.am +index 6211c82..044b372 100644 +--- a/libfaac/Makefile.am ++++ b/libfaac/Makefile.am +@@ -6,18 +6,14 @@ if CPUSSE + common_CFLAGS += -msse2 + endif + +-if USE_DRM +-lib_LTLIBRARIES = libfaac_drm.la ++lib_LTLIBRARIES = libfaac_drm.la libfaac.la + libfaac_drm_la_SOURCES = ${common_SOURCES} ${common_INCLUDES} kiss_fft/kiss_fftr.c kiss_fft/kiss_fft.c kiss_fft/kiss_fft.h + EXTRA_libfaac_drm_la_SOURCES = kiss_fft/_kiss_fft_guts.h kiss_fft/kiss_fftr.h kiss_fft/README kiss_fft/README.kiss_fft + libfaac_drm_la_LIBADD = ${common_LIBADD} + libfaac_drm_la_CFLAGS = ${common_CFLAGS} -DDRM +-else +-lib_LTLIBRARIES = libfaac.la + libfaac_la_SOURCES = ${common_SOURCES} ${common_INCLUDES} + libfaac_la_LIBADD = ${common_LIBADD} + libfaac_la_CFLAGS = ${common_CFLAGS} +-endif + + libfaac_la_LDFLAGS = -no-undefined + if MINGW diff --git a/faac.spec b/faac.spec index ec13f0a..aea712a 100644 --- a/faac.spec +++ b/faac.spec @@ -1,14 +1,18 @@ +%global _version 1_30 + Name: faac -Version: 1.29.9.2 -Release: 7%{?dist} +Version: 1.30 +Release: 1%{?dist} Summary: Encoder and encoding library for MPEG2/4 AAC License: LGPLv2+ URL: http://www.audiocoding.com/ -Source0: http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.t... +Source0: https://github.com/knik0/faac/archive/%{_version}/%{name}-%{_version}.tar.gz BuildRequires: gcc -Patch0: faac-1.29.9.2-drm.patch +BuildRequires: automake +BuildRequires: libtool +Patch0: faac-1.30-drm.patch %description @@ -28,7 +32,8 @@ multichannel and gapless encoding. This package contains development files and documentation for libfaac. %prep -%setup -q +%setup -q -n %{name}-%{_version} +./bootstrap %patch0 -p1 -b .drm #fix encoding /usr/bin/iconv -f iso8859-1 -t utf-8 AUTHORS > AUTHORS.conv && touch -r AUTHORS AUTHORS.conv && /bin/mv -f AUTHORS.conv AUTHORS @@ -63,6 +68,9 @@ find %buildroot -name '*.la' -or -name '*.a' | xargs rm -f %{_includedir}/*.h %changelog +* Wed Jan 01 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 1.30-1 +- Update to 1.30 + * Sat Aug 10 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 1.29.9.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2516908..dd7833a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b58d621fad8fda879f07b7cad8bfe10 faac-1.29.9.2.tar.gz +SHA512 (faac-1_30.tar.gz) = 8582cd580dba2a347d15dc4fab42020d7120d0552c54ab74cfaf59ba1b270abb94c67e39d42459a14cbc6e98f3fd00cbda589e1b4f0c7278e41bdef6ae7b6554