[faac] Spec file clean up
commit a56ff9841cec8465b89e588568c56635ce3741ef
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Oct 8 10:05:50 2018 +0100
Spec file clean up
faac-1.29.9.2-drm.patch | 24 ++++++++++++++++++++++++
faac.spec | 16 +++++++++++-----
2 files changed, 35 insertions(+), 5 deletions(-)
---
diff --git a/faac-1.29.9.2-drm.patch b/faac-1.29.9.2-drm.patch
new file mode 100644
index 0000000..685b6ce
--- /dev/null
+++ b/faac-1.29.9.2-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 3ca3ebe..02ef682 100644
--- a/faac.spec
+++ b/faac.spec
@@ -1,14 +1,15 @@
Name: faac
Version: 1.29.9.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Encoder and encoding library for MPEG2/4 AAC
-Group: Applications/Multimedia
License: LGPLv2+
URL: http://www.audiocoding.com/
Source0:
http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.t...
BuildRequires: libtool
+BuildRequires: autoconf
+Patch0: faac-1.29.9.2-drm.patch
%description
@@ -18,7 +19,6 @@ multichannel and gapless encoding.
%package devel
Summary: Development libraries of the FAAC AAC encoder
-Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@@ -30,11 +30,13 @@ This package contains development files and documentation for
libfaac.
%prep
%setup -q
+%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
%build
+autoreconf -fiv
%configure --disable-static
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g'
libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -45,13 +47,13 @@ sed -i
's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%make_install
#Remove libtool archives.
-find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
+find %buildroot -name '*.la' -or -name '*.a' | xargs rm -f
%ldconfig_scriptlets
-%files
+%files
%doc AUTHORS ChangeLog NEWS README TODO docs/*
%license COPYING
%{_bindir}/*
@@ -63,6 +65,10 @@ find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' |
xargs rm -f
%{_includedir}/*.h
%changelog
+* Mon Oct 08 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.29.9.2-4
+- Enable DRM support (rfbz#5043)
+- Spec file clean up
+
* Sun Aug 19 2018 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
1.29.9.2-3
- Rebuilt for Fedora 29 Mass Rebuild binutils issue