packages: faad2/faad2-backward_compat.patch, faad2/faad2-make.patch, faad2/...

qboosh qboosh at pld-linux.org
Mon Oct 25 22:40:39 CEST 2010 

Author: qboosh                       Date: Mon Oct 25 20:40:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.7
- updated backward_compat,make,mp4ff patches
- removed obsolete ac patch
- added man patch and mv to install man page as faad2(1)

---- Files affected:
packages/faad2:
   faad2-backward_compat.patch (1.2 -> 1.3) , faad2-make.patch (1.3 -> 1.4) , faad2-mp4ff.patch (1.2 -> 1.3) , faad2.spec (1.36 -> 1.37) , faad2-man.patch (NONE -> 1.1)  (NEW), faad2-ac.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/faad2/faad2-backward_compat.patch
diff -u packages/faad2/faad2-backward_compat.patch:1.2 packages/faad2/faad2-backward_compat.patch:1.3
--- packages/faad2/faad2-backward_compat.patch:1.2	Sun Nov  4 13:09:11 2007
+++ packages/faad2/faad2-backward_compat.patch	Mon Oct 25 22:40:33 2010
@@ -11,7 +11,7 @@
  drm_dec.c error.c filtbank.c \
 --- faad2/libfaad/decoder.c.orig	2007-11-01 13:33:30.000000000 +0100
 +++ faad2/libfaad/decoder.c	2007-11-04 12:36:41.315350439 +0100
-@@ -1115,3 +1115,47 @@
+@@ -1115,3 +1115,57 @@
  
      return NULL;
  }
@@ -19,40 +19,50 @@
 +#ifndef NO_BACKWARD_COMPAT
 +#  define ALIAS(type, func, target) type NEAACDECAPI func __attribute__((alias(#target)))
 +
++#undef faacDecGetErrorMessage
 +ALIAS(char*, faacDecGetErrorMessage(uint8_t errcode),
 +	NeAACDecGetErrorMessage);
 +
++#undef faacDecSetConfiguration
 +ALIAS(uint8_t, faacDecSetConfiguration(NeAACDecHandle hDecoder,
 +				       NeAACDecConfigurationPtr config),
 +	NeAACDecSetConfiguration);
 +
++#undef faacDecGetCurrentConfiguration
 +ALIAS(NeAACDecConfigurationPtr, faacDecGetCurrentConfiguration(NeAACDecHandle hDecoder),
 +	NeAACDecGetCurrentConfiguration);
 +
++#undef faacDecInit
 +ALIAS(int32_t, faacDecInit(NeAACDecHandle hDecoder, uint8_t *buffer,
 +			   uint32_t buffer_size, uint32_t *samplerate, uint8_t *channels),
 +	NeAACDecInit);
 +
++#undef faacDecInit2
 +ALIAS(int8_t, faacDecInit2(NeAACDecHandle hDecoder, uint8_t *pBuffer,
 +			   uint32_t SizeOfDecoderSpecificInfo,
 +			   uint32_t *samplerate, uint8_t *channels),
 +	NeAACDecInit2);
 +
 +#ifdef DRM
++#undef faacDecInitDRM
 +ALIAS(int8_t, faacDecInitDRM(NeAACDecHandle *hDecoder, uint32_t samplerate,
 +			     uint8_t channels),
 +	NeAACDecInitDRM);
 +#endif
 +
++#undef faacDecPostSeekReset
 +ALIAS(void, faacDecPostSeekReset(NeAACDecHandle hDecoder, int32_t frame),
 +	NeAACDecPostSeekReset);
 +
++#undef faacDecOpen
 +ALIAS(NeAACDecHandle, faacDecOpen(void),
 +	NeAACDecOpen);
 +
++#undef faacDecClose
 +ALIAS(void, faacDecClose(NeAACDecHandle hDecoder),
 +	NeAACDecClose);
 +
++#undef faacDecDecode
 +ALIAS(void*, faacDecDecode(NeAACDecHandle hDecoder,
 +			   NeAACDecFrameInfo *hInfo,
 +			   uint8_t *buffer, uint32_t buffer_size),
@@ -61,7 +71,7 @@
 +#endif
 --- faad2/libfaad/mp4.c.orig	2007-11-01 13:33:32.000000000 +0100
 +++ faad2/libfaad/mp4.c	2007-11-04 12:35:57.860874110 +0100
-@@ -296,3 +296,13 @@
+@@ -296,3 +296,14 @@
  
      return result;
  }
@@ -69,6 +79,7 @@
 +#ifndef NO_BACKWARD_COMPAT
 +#  define ALIAS(type, func, target) type NEAACDECAPI func __attribute__((alias(#target)))
 +
++#undef AudioSpecificConfig
 +ALIAS(int8_t, AudioSpecificConfig(uint8_t *pBuffer,
 +				  uint32_t buffer_size,
 +				  mp4AudioSpecificConfig *mp4ASC),

================================================================
Index: packages/faad2/faad2-make.patch
diff -u packages/faad2/faad2-make.patch:1.3 packages/faad2/faad2-make.patch:1.4
--- packages/faad2/faad2-make.patch:1.3	Sun Nov  4 13:08:17 2007
+++ packages/faad2/faad2-make.patch	Mon Oct 25 22:40:33 2010
@@ -1,14 +1,3 @@
---- faad2/libfaad/Makefile.am.orig	2004-11-08 09:06:09.000000000 +0100
-+++ faad2/libfaad/Makefile.am	2007-11-04 11:44:26.132686561 +0100
-@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libfaad.la
- include_HEADERS = $(top_srcdir)/include/faad.h \
-                   $(top_srcdir)/include/neaacdec.h
- 
--libfaad_la_LDFLAGS = -lm
-+libfaad_la_LIBADD = -lm
- 
- libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
- drm_dec.c error.c filtbank.c \
 --- faad2/plugins/xmms/src/Makefile.am.orig	2006-09-25 21:52:53.000000000 +0200
 +++ faad2/plugins/xmms/src/Makefile.am	2007-11-04 11:45:59.870028348 +0100
 @@ -1,7 +1,7 @@

================================================================
Index: packages/faad2/faad2-mp4ff.patch
diff -u packages/faad2/faad2-mp4ff.patch:1.2 packages/faad2/faad2-mp4ff.patch:1.3
--- packages/faad2/faad2-mp4ff.patch:1.2	Wed Oct 28 19:16:31 2009
+++ packages/faad2/faad2-mp4ff.patch	Mon Oct 25 22:40:33 2010
@@ -1,15 +1,36 @@
---- faad2/common/mp4ff/Makefile.am.wiget	2009-10-28 18:54:29.000000000 +0100
-+++ faad2/common/mp4ff/Makefile.am	2009-10-28 18:56:28.000000000 +0100
-@@ -1,8 +1,9 @@
--noinst_LTLIBRARIES = libmp4ff.la
+--- faad2-2.7/common/mp4ff/Makefile.am.orig	2009-02-06 15:24:21.000000000 +0100
++++ faad2-2.7/common/mp4ff/Makefile.am	2010-10-25 19:57:49.095738529 +0200
+@@ -1,7 +1,7 @@
+-lib_LIBRARIES = libmp4ff.a
+-include_HEADERS = mp4ff.h mp4ffint.h
 +lib_LTLIBRARIES = libmp4ff.la
-+
-+include_HEADERS = mp4ff.h mp4ff_int_types.h
++include_HEADERS = mp4ff.h mp4ffint.h mp4ff_int_types.h
  
- libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+-libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
++libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
+ 
+-libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
++libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
+ 		     mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
+--- faad2-2.7/frontend/Makefile.am.orig	2009-02-06 17:03:37.000000000 +0100
++++ faad2-2.7/frontend/Makefile.am	2010-10-25 20:08:54.015739367 +0200
+@@ -5,7 +5,7 @@
+ 	   -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+-	     $(top_builddir)/common/mp4ff/libmp4ff.a
++	     $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ faad_SOURCES = main.c \
+ 	       audio.c audio.h \
+--- faad2-2.7/plugins/xmms/src/Makefile.am.orig	2010-10-25 20:09:20.343741882 +0200
++++ faad2-2.7/plugins/xmms/src/Makefile.am	2010-10-25 20:32:37.203740205 +0200
+@@ -7,7 +7,7 @@
+        -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+ 
+ libmp4_la_LIBADD = $(top_builddir)/libfaad/libfaad.la \
+-       $(top_builddir)/common/mp4ff/libmp4ff.a
++       $(top_builddir)/common/mp4ff/libmp4ff.la
+ 
+ libmp4_la_LDFLAGS = -module -avoid-version $(local_LDFLAGS) -lpthread
  
- libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
--   mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h \
-+   mp4tagupdate.c mp4ffint.h \
-    drms.h drms.c drmstables.h
--

================================================================
Index: packages/faad2/faad2.spec
diff -u packages/faad2/faad2.spec:1.36 packages/faad2/faad2.spec:1.37
--- packages/faad2/faad2.spec:1.36	Tue Aug 24 11:27:39 2010
+++ packages/faad2/faad2.spec	Mon Oct 25 22:40:33 2010
@@ -10,18 +10,18 @@
 Summary:	Freeware Advanced Audio Decoder 2
 Summary(pl.UTF-8):	Darmowy zaawansowany dekoder audio
 Name:		faad2
-Version:	2.6.1
-Release:	6
-License:	GPL
+Version:	2.7
+Release:	1
+License:	GPL v2+
 Group:		Applications/Sound
-Source0:	http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.gz
-# Source0-md5:	74e92df40c270f216a8305fc87603c8a
+Source0:	http://downloads.sourceforge.net/faac/%{name}-%{version}.tar.bz2
+# Source0-md5:	4c332fa23febc0e4648064685a3d4332
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-mpeg4ip.patch
 Patch2:		%{name}-soname.patch
 Patch3:		%{name}-backward_compat.patch
-Patch4:		%{name}-ac.patch
-Patch5:		%{name}-mp4ff.patch
+Patch4:		%{name}-mp4ff.patch
+Patch5:		%{name}-man.patch
 URL:		http://www.audiocoding.com/
 %{?with_mpeg4ip:BuildRequires:	SDL-devel}
 BuildRequires:	autoconf
@@ -109,13 +109,14 @@
 Wtyczka XMMS do plików AAC.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+mv -f frontend/faad.{man,1}
 
 %build
 %{__libtoolize}
@@ -136,8 +137,8 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.{la,a}
-rm -f $RPM_BUILD_ROOT%{_libdir}/mp4player_plugin/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{xmms_input_plugindir}/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/mp4player_plugin/*.{la,a}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -148,6 +149,7 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/faad
+%{_mandir}/man1/faad.1*
 
 %files libs
 %defattr(644,root,root,755)
@@ -166,6 +168,7 @@
 %{_includedir}/faad.h
 %{_includedir}/mp4ff.h
 %{_includedir}/mp4ff_int_types.h
+%{_includedir}/mp4ffint.h
 %{_includedir}/neaacdec.h
 
 %if %{with static_libs}
@@ -193,6 +196,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2010/10/25 20:40:33  qboosh
+- updated to 2.7
+- updated backward_compat,make,mp4ff patches
+- removed obsolete ac patch
+- added man patch and mv to install man page as faad2(1)
+
 Revision 1.36  2010/08/24 09:27:39  glen
 - release 6
 

================================================================
Index: packages/faad2/faad2-man.patch
diff -u /dev/null packages/faad2/faad2-man.patch:1.1
--- /dev/null	Mon Oct 25 22:40:39 2010
+++ packages/faad2/faad2-man.patch	Mon Oct 25 22:40:33 2010
@@ -0,0 +1,9 @@
+--- faad2-2.7/frontend/Makefile.am.orig	2010-10-25 20:33:12.575740205 +0200
++++ faad2-2.7/frontend/Makefile.am	2010-10-25 21:05:15.419741043 +0200
+@@ -1,5 +1,5 @@
+ bin_PROGRAMS = faad
+-man_MANS = faad.man
++man_MANS = faad.1
+ 
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
+ 	   -I$(top_srcdir)/common/mp4ff
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/faad2/faad2-backward_compat.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/faad2/faad2-make.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/faad2/faad2-mp4ff.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/faad2/faad2.spec?r1=1.36&r2=1.37&f=u

More information about the pld-cvs-commit mailing list