Request 3996 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 3996 (accepted)

- Update to 2.8.5
* another package fix
* minor fix to released packages
* better autotools support
* PNS bug fixed
* New MP4 input module
* NeAACDecGetVersion: new api function to get version and copyright strings
* seeking support for MP4 files
* patches and fixed bugs
- Drop faad2-reproducible-build.patch, upstream merge it.
- Update faad2-visibility.patch.

Created by hillwood about 7 years ago
In state accepted

Submit faad2

Submit package home:hillwood:branches:Essentials / faad2 to package Essentials / faad2

faad2.changes Changed

faad2.spec Changed

@@ -16,16 +16,15 @@
 %bcond_with mpeg4ip
 
 Name:           faad2
-Version:        2.7
+Version:        2.8.5
 Release:        1
 License:        GPL-2.0+
 Summary:        C library and frontend for decoding MPEG2/4 AAC
 Summary(de):    C Bibliothek und Frontend zum Decodieren von MPEG2/4 AAC
 Url:            http://www.audiocoding.com/
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Source0:        http://downloads.sourceforge.net/project/faac/faad2-src/faad2-%{version}/faad2-%{version}.tar.bz2
-Patch0:         faad2-visibility.patch
-Patch1:         faad2-reproducible-build.patch
+Source0:        http://downloads.sourceforge.net/project/faac/%{name}-src/%{name}-%{version}/%{name}-%{version}.tar.gz
+Patch0:         %{name}-visibility.patch
 Requires:       %{libname} = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with mpeg4ip}
@@ -44,7 +43,6 @@
 #Obsoletes:      faad2-drm
 #Provides:       faad2-drm
 
-
 %description
 FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
 written from scratch. FAAD 2 is licensed under the GPL.
@@ -57,8 +55,8 @@
 Summary(de):    Bibliotheken zu faad2
 Group:          System/Libraries
 Provides:       %{lib} = %{version}
-Provides:       libfaad2_2 = %{version}
-Obsoletes:      libfaad2_2 < %{version}
+Provides:       lib%{name}_2 = %{version}
+Obsoletes:      lib%{name}_2 < %{version}
 Provides:       libfaad-2 = %{version}
 Obsoletes:      libfaad-2 < %{version}
 
@@ -71,17 +69,27 @@
 FAAD 2 ist ein LC, MAIN und LTP profile, MPEG2 und MPEG-4 AAC Decoder.
 Die Bibliotheken zu faad2
 
+%package -n %{lib}_drm%{major}
+Summary:        DRM shared library part of faad2
+Group:          System/Libraries
+Provides:       %{lib} = %{version}
+
+%description -n %{lib}_drm%{major}
+FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
+written from scratch. FAAD 2 is licensed under the GPL.
+The shared library part of faad2-drm
+
 %package -n %{lib}-devel
 Summary:        Development files of the FAAD 2 AAC decoder
 Summary(de):    Entwicklerdateien des FAAD 2 AAC Dekoders
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version}
-Obsoletes:      libfaad2-devel < %{version}
-Provides:       libfaad2-devel = %{version}
-Obsoletes:      faad2-devel < %{version}
-Provides:       faad2-devel = %{version}
-Obsoletes:      faad2-drm-devel < %{version}
-Provides:       faad2-drm-devel = %{version}
+Obsoletes:      lib%{name}-devel < %{version}
+Provides:       lib%{name}-devel = %{version}
+Obsoletes:      %{name}-devel < %{version}
+Provides:       %{name}-devel = %{version}
+Obsoletes:      %{name}-drm-devel < %{version}
+Provides:       %{name}-drm-devel = %{version}
 
 %description -n %{lib}-devel
 FAAD 2 is a LC, MAIN and LTP profile, MPEG2 and MPEG-4 AAC decoder, completely
@@ -93,29 +101,28 @@
 Header-Dateien und Entwicklerdokumtation zur libfaad.
 
 %if %{with xmms}
-%package -n xmms-faad2
+%package -n xmms-%{name}
 Summary:        Xmms faad2 input plugin
 Summary(de):    Xmms faad2 Eingabeplugin
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{libname} = %{version}
 Requires:       xmms >= 1.2.8
-Obsoletes:      faad2-xmms-plugin < %{version}
-Provides:       faad2-xmms-plugin = %{version}
+Obsoletes:      %{name}-xmms-plugin < %{version}
+Provides:       %{name}-xmms-plugin = %{version}
 
-%description -n xmms-faad2
+%description -n xmms-%{name}
 The plugin read aac files with and without ID3tag(version 2.x), AAC files
 are MPEG2 or MPEG4 files that could be found in MPEG4 audio files (.mp4).
 
-%description -l de -n xmms-faad2
+%description -l de -n xmms-%{name}
 Das plugin für xmms liest AAC Dateien mit und ohne ID3-Tags (version 2.x).
 AAC Dateien sind MPEG2 oder MPEG4 Dateien, sie finden Verwendung in MPEG4
 Audodateien (.mp4).
 %endif
 
 %prep
-%setup -qn faad2-%{version}
+%setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 autoreconf -ifv
@@ -136,26 +143,33 @@
 %post -n %{libname} -p /sbin/ldconfig
 %postun -n %{libname} -p /sbin/ldconfig
 
+%post -n %{lib}_drm%{major} -p /sbin/ldconfig
+%postun -n %{lib}_drm%{major} -p /sbin/ldconfig
+
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_bindir}/*
-%{_mandir}/manm
+%{_bindir}/faad
+%{_mandir}/man1/faad.1.gz
 
 %files -n %{libname}
 %defattr(-,root,root)
 %{_libdir}/libfaad.so.%{major}*
 
+%files -n %{lib}_drm%{major}
+%defattr(-, root, root)
+%{_libdir}/libfaad_drm.so.%{major}*
+
 %files -n %{lib}-devel
 %defattr(-, root, root)
 %{_libdir}/*.so
 # Let it be static since I don't want to start worring about versioning. I'm not
 # even sure if it's supposed to be public...
-%{_libdir}/libmp4ff.a
+# %{_libdir}/libmp4ff.a
 %{_includedir}/*
 
 %if %{with xmms}
-%files -n xmms-faad2
+%files -n xmms-%{name}
 %defattr(-, root, root)
 %doc plugins/xmms/README
 %{_libdir}/xmms/Input/libmp4*

faad2-reproducible-build.patch Deleted

faad2-visibility.patch Changed

@@ -1,39 +1,7 @@
---- faad2-2.7.orig/include/neaacdec.h
-+++ faad2-2.7/include/neaacdec.h
-@@ -31,6 +31,8 @@
- #ifndef __NEAACDEC_H__
- #define __NEAACDEC_H__
- 
-+#pragma GCC visibility push(default)
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
-@@ -254,5 +256,5 @@ char NEAACDECAPI NeAACDecAudioSpecificCo
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
--
-+#pragma GCC visibility pop
- #endif
---- faad2-2.7.orig/libfaad/Makefile.am
-+++ faad2-2.7/libfaad/Makefile.am
-@@ -1,10 +1,10 @@
- lib_LTLIBRARIES = libfaad.la
- 
--AM_CFLAGS	= -iquote $(top_srcdir)/include
-+AM_CFLAGS	= -fvisibility=hidden -iquote $(top_srcdir)/include
- include_HEADERS = $(top_srcdir)/include/faad.h \
- 		  $(top_srcdir)/include/neaacdec.h
- 
--libfaad_la_LDFLAGS = -version-info 2:0:0
-+libfaad_la_LDFLAGS = -no-undefined -version-info 2:0:0
- libfaad_la_LIBADD = -lm
- 
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
---- faad2-2.7.orig/configure.in
-+++ faad2-2.7/configure.in
-@@ -15,7 +15,9 @@ AC_PROG_LIBTOOL
+diff -Nur faad2-2.8.5/configure.ac faad2-2.8.5-new/configure.ac
+--- faad2-2.8.5/configure.ac	2017-09-30 15:42:38.000000000 +0800
++++ faad2-2.8.5-new/configure.ac	2017-10-09 16:21:20.093673596 +0800
+@@ -16,7 +16,9 @@
  AC_SUBST(LIBTOOL_DEPS)
  
  dnl Checks for programs.
@@ -44,7 +12,7 @@
  AM_PROG_CC_C_O
  AC_PROG_CPP
  dnl disable for mpeg4ip plugin
-@@ -74,43 +76,7 @@ AC_DEFUN([MY_CHECK_TYPEDEF_FROM_INCLUDE]
+@@ -75,43 +77,7 @@
  fi
  ])
  
@@ -89,3 +57,22 @@
  
  MY_CHECK_TYPEDEF_FROM_INCLUDE([float32_t temp],
          [#include <sys/types.h>,
+diff -Nur faad2-2.8.5/include/neaacdec.h faad2-2.8.5-new/include/neaacdec.h
+--- faad2-2.8.5/include/neaacdec.h	2017-07-20 18:12:08.000000000 +0800
++++ faad2-2.8.5-new/include/neaacdec.h	2017-10-09 16:18:42.381314655 +0800
+@@ -31,6 +31,8 @@
+ #ifndef __NEAACDEC_H__
+ #define __NEAACDEC_H__
+ 
++#pragma GCC visibility push(default)
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -262,5 +264,6 @@
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
++#pragma GCC visibility pop
+ 
+ #endif

faad2-2.7.tar.bz2 -> faad2-2.8.5.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 3996 0

Request History

hillwood created request about 7 years ago

olh accepted request about 7 years ago