From 15d878ef68fe0616acf8516218d0ffee43506557 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Tue, 5 May 2020 14:54:45 +0100 Subject: [PATCH] Update to 2.9.2 --- .gitignore | 1 + faad2.spec | 14 +++++++++----- readd_files_xmms.patch | 4 ++-- sources | 2 +- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a7d5b70..2657acc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ faad2-2.7.tar.bz2 /faad2-2.8.1.tar.bz2 /faad2-2.8.8.tar.gz /faad2-2_9_1.tar.gz +/faad2-2_9_2.tar.gz diff --git a/faad2.spec b/faad2.spec index abfb0ce..6017c34 100644 --- a/faad2.spec +++ b/faad2.spec @@ -4,13 +4,13 @@ %global xmmsinputplugindir %(xmms-config --input-plugin-dir 2>/dev/null) %endif %endif -%global _version 2_9_1 +%global _version 2_9_2 Summary: Library and frontend for decoding MPEG2/4 AAC Name: faad2 Epoch: 1 -Version: 2.9.1 -Release: 3%{?dist} +Version: 2.9.2 +Release: 1%{?dist} License: GPLv2+ URL: http://www.audiocoding.com/faad2.html Source: https://github.com/knik0/faad2/archive/%{_version}/%{name}-%{_version}.tar.gz @@ -25,8 +25,8 @@ BuildRequires: automake BuildRequires: libtool BuildRequires: libsysfs-devel %{?_with_xmms: -BuildRequires: id3lib-devel -BuildRequires: xmms-devel +BuildRequires: id3lib-devel +BuildRequires: xmms-devel } BuildRequires: zlib-devel @@ -113,6 +113,7 @@ 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: @@ -122,6 +123,9 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f } %changelog +* Tue May 05 2020 Leigh Scott - 1:2.9.2-1 +- Update to 2.9.2 + * Thu Mar 12 2020 Leigh Scott - 1:2.9.1-3 - Rebuilt for i686 diff --git a/readd_files_xmms.patch b/readd_files_xmms.patch index 5cf6fa7..078f02b 100644 --- a/readd_files_xmms.patch +++ b/readd_files_xmms.patch @@ -5838,15 +5838,15 @@ diff --git a/configure.ac b/configure.ac index a03cafe..547071f 100644 --- a/configure.ac +++ b/configure.ac -@@ -156,8 +156,6 @@ if test x$WITHDRM = xyes; then +@@ -159,8 +159,6 @@ if test x$WITHDRM = xyes; then fi AC_CONFIG_FILES(libfaad/Makefile) -AC_CONFIG_FILES(common/Makefile) -AC_CONFIG_FILES(common/mp4ff/Makefile) + AC_CONFIG_FILES(libfaad/faad2.pc) AC_CONFIG_FILES(plugins/Makefile) AC_CONFIG_FILES(plugins/xmms/Makefile) - AC_CONFIG_FILES(plugins/xmms/src/Makefile) diff --git a/project/msvc/aacinfo.vcxproj b/project/msvc/aacinfo.vcxproj deleted file mode 100644 index 4cca6d6..0000000 diff --git a/sources b/sources index a56205d..d02dbb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (faad2-2_9_1.tar.gz) = 1015f5b49baebf6c9404cfcd7b9d524cc76a57abcd1a46bb851463ae5226bfd8b80155b661708f66548466422855cd7aeec5676463cd1346c5fb1dc0821621ce +SHA512 (faad2-2_9_2.tar.gz) = 996c279a56c6abde13da964b91d4ff87ac4c611e889f1dd59882fa3898093dec68ab0714cf106db10a5e24952e2d6dddc049ec9bf4f07ff68378a705d5debee2