[svn] r3145 - trunk/rpms/faad2

packagers at lists.rpmforge.net packagers at lists.rpmforge.net
Wed Apr 20 14:12:25 CEST 2005


Author: thias
Date: 2005-04-20 14:12:23 +0200 (Wed, 20 Apr 2005)
New Revision: 3145

Added:
   trunk/rpms/faad2/faad2-2.0-configure-mpeg4ip.patch
   trunk/rpms/faad2/faad2-2.0-gcc34.patch
   trunk/rpms/faad2/faad2-2.0-gcc4.patch
   trunk/rpms/faad2/faad2-2.0-xmms-noext.patch
Modified:
   trunk/rpms/faad2/faad2.spec
Log:
Downgrade to 2.0 release to fix some known issues, include Gentoo patches to fix build on FC4.


Added: trunk/rpms/faad2/faad2-2.0-configure-mpeg4ip.patch
===================================================================
--- trunk/rpms/faad2/faad2-2.0-configure-mpeg4ip.patch	2005-04-20 12:10:53 UTC (rev 3144)
+++ trunk/rpms/faad2/faad2-2.0-configure-mpeg4ip.patch	2005-04-20 12:12:23 UTC (rev 3145)
@@ -0,0 +1,11 @@
+--- configure.in.orig	2004-03-13 15:24:19.783147336 +0100
++++ configure.in	2004-03-13 15:24:48.430792232 +0100
+@@ -67,7 +67,7 @@
+         [HAVE_FPOS_T_POS])
+ 
+ 
+-external_mp4v2=yes
++AC_CHECK_PROG(external_mp4v2, mpeg4ip-config, yes, no)
+ AC_CHECK_LIB(mp4v2, MP4Create, , external_mp4v2=no, -lstdc++)
+ AC_CHECK_LIB(mp4v2, MP4MetadataDelete, , external_mp4v2=no, -lstdc++)
+ AC_CHECK_HEADER(mp4.h, , external_mp4v2=no)

Added: trunk/rpms/faad2/faad2-2.0-gcc34.patch
===================================================================
--- trunk/rpms/faad2/faad2-2.0-gcc34.patch	2005-04-20 12:10:53 UTC (rev 3144)
+++ trunk/rpms/faad2/faad2-2.0-gcc34.patch	2005-04-20 12:12:23 UTC (rev 3145)
@@ -0,0 +1,10 @@
+--- faad2/common/mp4v2/mp4property.h	2004-04-14 20:53:58.582017392 -0400
++++ faad2/common/mp4v2/mp4property_.h	2004-04-14 20:51:21.955828192 -0400
+@@ -21,6 +21,7 @@
+ 
+ #ifndef __MP4_PROPERTY_INCLUDED__
+ #define __MP4_PROPERTY_INCLUDED__
++#define NULL 0
+ 
+ // forward declarations
+ class MP4Atom;

Added: trunk/rpms/faad2/faad2-2.0-gcc4.patch
===================================================================
--- trunk/rpms/faad2/faad2-2.0-gcc4.patch	2005-04-20 12:10:53 UTC (rev 3144)
+++ trunk/rpms/faad2/faad2-2.0-gcc4.patch	2005-04-20 12:12:23 UTC (rev 3145)
@@ -0,0 +1,12 @@
+diff -ur faad2-orig/common/mp4ff/mp4ffint.h faad2/common/mp4ff/mp4ffint.h
+--- faad2-orig/common/mp4ff/mp4ffint.h	2005-02-12 23:38:28.828890793 -0500
++++ faad2/common/mp4ff/mp4ffint.h	2005-02-12 23:41:01.618473068 -0500
+@@ -301,7 +301,7 @@
+ mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f);
+ #endif
+ void mp4ff_close(mp4ff_t *ff);
+-void mp4ff_track_add(mp4ff_t *f);
++static void mp4ff_track_add(mp4ff_t *f);
+ int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size);
+ int32_t parse_atoms(mp4ff_t *f);
+ 

Added: trunk/rpms/faad2/faad2-2.0-xmms-noext.patch
===================================================================
--- trunk/rpms/faad2/faad2-2.0-xmms-noext.patch	2005-04-20 12:10:53 UTC (rev 3144)
+++ trunk/rpms/faad2/faad2-2.0-xmms-noext.patch	2005-04-20 12:12:23 UTC (rev 3145)
@@ -0,0 +1,30 @@
+--- faad2/plugins/xmms/src/libmp4.c.orig	2004-03-25 20:41:17.000000000 -0800
++++ faad2/plugins/xmms/src/libmp4.c	2004-03-25 21:01:50.000000000 -0800
+@@ -34,6 +34,9 @@
+ static int	mp4_isFile(char *);
+ static void*	mp4Decode(void *);
+ 
++void getMP4info(char* file);
++int getAACTrack(MP4FileHandle file);
++
+ InputPlugin mp4_ip =
+   {
+     0,	// handle
+@@ -112,11 +115,13 @@
+     gchar*	extention;
+ 
+     extention = strrchr(filename, '.');
++
+     if (extention &&
+-	!strcasecmp(extention, ".mp4") ||	// official extention
+-	!strcasecmp(extention, ".m4a") ||	// Apple mp4 extention
+-	!strcasecmp(extention, ".aac")		// old MPEG2/4-AAC extention
+-	){
++        (!strcasecmp(extention, ".mp4") ||	// official extention
++         !strcasecmp(extention, ".m4a") ||	// Apple mp4 extention
++         !strcasecmp(extention, ".aac")		  // old MPEG2/4-AAC extention
++        ))
++    {
+       return (1);
+     }
+   }

Modified: trunk/rpms/faad2/faad2.spec
===================================================================
--- trunk/rpms/faad2/faad2.spec	2005-04-20 12:10:53 UTC (rev 3144)
+++ trunk/rpms/faad2/faad2.spec	2005-04-20 12:12:23 UTC (rev 3145)
@@ -3,12 +3,12 @@
 
 %define xmmsinputdir %(xmms-config --input-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/Input)
 #define prever       rc3
-%define date         20040923
+#define date         20040923
 
 Summary: Library and frontend for decoding MPEG2/4 AAC
 Name: faad2
 Version: 2.0
-Release: %{?prever:0.%{prever}.}2%{?date:.%{date}}
+Release: 3%{?prever:.%{prever}}%{?date:.%{date}}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.audiocoding.com/
@@ -18,10 +18,14 @@
 %else
 Source: http://dl.sf.net/faac/%{name}-%{version}%{?prever:-%{prever}}.tar.gz
 %endif
-Patch: faad2-2.0-Makefile-separator.patch
+Patch0: faad2-2.0-Makefile-separator.patch
+Patch1: faad2-2.0-gcc34.patch
+Patch2: faad2-2.0-xmms-noext.patch
+Patch3: faad2-2.0-gcc4.patch
+Patch4: faad2-2.0-configure-mpeg4ip.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: autoconf, automake, libtool, gcc-c++, zlib-devel
-BuildRequires: libsndfile-devel >= 1.0.0, libstdc++-devel
+BuildRequires: autoconf, automake, libtool
+BuildRequires: gcc-c++, zlib-devel, libsndfile-devel >= 1.0.0
 BuildRequires: xmms-devel, id3lib-devel, gtk+-devel
 
 %description
@@ -59,19 +63,24 @@
 %setup -n %{name}-%{date}
 %else
 %setup -n %{name}
-%patch -p1 -b .makefilesep
 %endif
+%patch0 -p1 -b .makefilesep
+%patch1 -p1 -b .gcc34
+%patch2 -p1 -b .noext
+%patch3 -p1 -b .gcc4
+%patch4 -p0 -b .mpeg4ip
 
 
 %build
-#sh bootstrap
+test -x configure || sh bootstrap
 %configure \
     --disable-static \
     --with-xmms \
-    --with-mpeg4ip
-#   --with-drm \
-#   --with-mp4v2
-%{__make} %{?_smp_mflags} CFLAGS="%{optflags} -fPIC"
+    --with-mpeg4ip \
+    --with-drm \
+    --with-mp4v2
+%{__make} %{?_smp_mflags}
+# CFLAGS="%{optflags} -fPIC"
 
 
 %install
@@ -117,6 +126,11 @@
 
 
 %changelog
+* Wed Apr 20 2005 Matthias Saou <http://freshrpms.net/> 2.0-3
+- Downgrade to 2.0 with gcc 3.4 and 4 patches from dev.gentoo.org, the libmp4v2
+  is now internal again, no need for the external mpeg4ip mess... should fix
+  many issues, like gtkpod AAC support.
+
 * Wed Nov  3 2004 Matthias Saou <http://freshrpms.net/> 2.0-2.20040923
 - Use the snapshot from 20040923 that videolan provides.
 




More information about the commits mailing list