rpms/avidemux/devel avidemux-2.4-ppc.patch, NONE, 1.1 avidemux.spec, 1.4, 1.5
Author: firewing
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24309
Modified Files:
avidemux.spec
Added Files:
avidemux-2.4-ppc.patch
Log Message:
Fix ppc64 build
avidemux-2.4-ppc.patch:
--- NEW FILE avidemux-2.4-ppc.patch ---
--- avidemux/ADM_libraries/ADM_libMad/mad.h (revision 3703)
+++ avidemux/ADM_libraries/ADM_libMad/mad.h (working copy)
@@ -24,19 +24,14 @@
extern "C" {
# endif
-//# define FPM_DEFAULT
+# define FPM_INTEL
-#if 0 //MEANX
+
# define SIZEOF_INT 4
-# define SIZEOF_LONG 8
+# define SIZEOF_LONG 4
# define SIZEOF_LONG_LONG 8
-#else
-typedef int32_t mad_fixed_t ;
-typedef int32_t mad_fixed64hi_t ;
-typedef uint32_t mad_fixed64lo_t ;
-#endif //MEANX
/* Id: version.h,v 1.26 2004/01/23 09:41:33 rob Exp */
@@ -71,7 +66,7 @@
# ifndef LIBMAD_FIXED_H
# define LIBMAD_FIXED_H
-#if 0 //MEANX
+
# if SIZEOF_INT >= 4
typedef signed int mad_fixed_t;
@@ -83,7 +78,7 @@
typedef signed long mad_fixed64hi_t;
typedef unsigned long mad_fixed64lo_t;
# endif
-#endif
+
# if defined(_MSC_VER)
# define mad_fixed64_t signed __int64
# elif 1 || defined(__GNUC__)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- avidemux.spec 16 Aug 2008 20:07:42 -0000 1.4
+++ avidemux.spec 23 Aug 2008 00:06:58 -0000 1.5
@@ -4,7 +4,7 @@
Name: avidemux
Version: 2.4.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing tool
Group: Applications/Multimedia
@@ -18,6 +18,7 @@
Patch2: avidemux-2.4-i18n.patch
Patch3: avidemux-2.4-libdca.patch
Patch4: avidemux-2.4.3-lrelease.patch
+Patch5: avidemux-2.4-ppc.patch
#http://bugs.gentoo.org/attachment.cgi?id=160132&action=view
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,6 +113,7 @@
%patch2 -p1 -b .i18n
%patch3 -p1 -b .libdca
%patch4 -b .lrelease
+%patch5 -b .ppc
%build
%cmake
@@ -160,6 +162,9 @@
%endif
%changelog
+* Fri Aug 22 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-3
+- Add patch to fix ppc64 build
+
* Sat Aug 16 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-2
- retag