Author: firewing Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv31710 Modified Files: avidemux.spec Added Files: avidemux-2.4-ppc-libmad.patch avidemux-2.4.3-ppc-ptr.patch Removed Files: avidemux-2.4-ppc.patch Log Message: Rename old ppc patch, add new patch for ppc64 pointer type avidemux-2.4-ppc-libmad.patch: --- NEW FILE avidemux-2.4-ppc-libmad.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__) avidemux-2.4.3-ppc-ptr.patch: --- NEW FILE avidemux-2.4.3-ppc-ptr.patch --- --- ADM_mpeg.cpp.orig 2008-09-08 11:23:38.000000000 -0400 +++ ADM_mpeg.cpp 2008-09-18 16:14:10.000000000 -0400 @@ -434,8 +434,8 @@ i = (uint64_t) id; #else - uint32_t i; - i = (uint32_t) id; + intptr_t i; + i = (intptr_t) id; #endif yv12_instance_t *instance = (yv12_instance_t *) _instance; Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- avidemux.spec 23 Aug 2008 00:06:58 -0000 1.5 +++ avidemux.spec 18 Sep 2008 21:00:01 -0000 1.6 @@ -4,7 +4,7 @@ Name: avidemux Version: 2.4.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Graphical video editing tool Group: Applications/Multimedia @@ -18,7 +18,8 @@ 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 +Patch5: avidemux-2.4-ppc-libmad.patch +Patch6: avidemux-2.4.3-ppc-ptr.patch #http://bugs.gentoo.org/attachment.cgi?id=160132&action=view BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -113,7 +114,10 @@ %patch2 -p1 -b .i18n %patch3 -p1 -b .libdca %patch4 -b .lrelease -%patch5 -b .ppc +%patch5 -b .ppc_libmad +pushd avidemux/ADM_codecs/ +%patch6 -b .ppc_ptr +popd %build %cmake @@ -162,6 +166,10 @@ %endif %changelog +* Thu Sep 18 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-4 +- Add another patch to fix ppc64 build (pointer type), first + patch was for libmad + * Fri Aug 22 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-3 - Add patch to fix ppc64 build --- avidemux-2.4-ppc.patch DELETED ---