Author: baggins Date: Thu Apr 29 19:33:37 2010 GMT Module: packages Tag: HEAD ---- Log message: - workaround for gcc/gas fuckup with MMX movq on x86
---- Files affected: packages/avidemux: avidemux.spec (1.85 -> 1.86) , avidemux-gcc-bug-mmx-x86.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/avidemux/avidemux.spec diff -u packages/avidemux/avidemux.spec:1.85 packages/avidemux/avidemux.spec:1.86 --- packages/avidemux/avidemux.spec:1.85 Mon Apr 26 09:40:07 2010 +++ packages/avidemux/avidemux.spec Thu Apr 29 21:33:31 2010 @@ -19,7 +19,7 @@ Summary(pl.UTF-8): Mały edytor audio/wideo dla Linuksa Name: avidemux Version: 2.5.2 -Release: 2 +Release: 2.1 License: GPL v2+ Group: X11/Applications/Multimedia Source0: http://downloads.sourceforge.net/avidemux/%{name}_%{version}.tar.gz @@ -29,6 +29,7 @@ Patch0: gcc44.patch Patch1: types.patch Patch2: qtlocale.patch +Patch3: %{name}-gcc-bug-mmx-x86.patch #Patch1: %{name}-dts_internal.patch #Patch2: %{name}-sparc64.patch URL: http://fixounet.free.fr/avidemux/ @@ -104,6 +105,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 echo 'pt_BR' >> po/LINGUAS @@ -389,6 +391,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.86 2010/04/29 19:33:31 baggins +- workaround for gcc/gas fuckup with MMX movq on x86 + Revision 1.85 2010/04/26 07:40:07 arekm - release 2 ================================================================ Index: packages/avidemux/avidemux-gcc-bug-mmx-x86.patch diff -u /dev/null packages/avidemux/avidemux-gcc-bug-mmx-x86.patch:1.1 --- /dev/null Thu Apr 29 21:33:37 2010 +++ packages/avidemux/avidemux-gcc-bug-mmx-x86.patch Thu Apr 29 21:33:31 2010 @@ -0,0 +1,31 @@ +--- avidemux_2.5.2/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp~ 2010-04-29 20:25:15.862622029 +0200 ++++ avidemux_2.5.2/avidemux/ADM_coreImage/src/ADM_vidFieldASM.cpp 2010-04-29 21:30:35.374874733 +0200 +@@ -25,7 +25,7 @@ + + #include"ADM_vidField.h" + +-#ifdef ADM_CPU_X86 ++#ifdef ADM_CPU_X86_64 + // #define DEBUG_DEINT 1 + // #define MMX_TRACE 1 + #include "ADM_mmxMacros.h" +@@ -81,7 +81,7 @@ + } + } + } +-#ifdef ADM_CPU_X86 ++#ifdef ADM_CPU_X86_64 + void ADMVideoFields::hasMotion_MMX(uint8_t *p,uint8_t *c, + uint8_t *n, + uint8_t *e, +--- avidemux_2.5.2/avidemux/ADM_coreImage/src/ADM_vidFields.cpp~ 2010-04-29 20:25:15.871621667 +0200 ++++ avidemux_2.5.2/avidemux/ADM_coreImage/src/ADM_vidFields.cpp 2010-04-29 21:31:24.857871769 +0200 +@@ -103,7 +103,7 @@ + e2=_motionmask2+w; + //___________________ C version of motion detection ________________________ + // other line +-#if defined(ADM_CPU_X86) && defined(ASM_DEINT) ++#if defined(ADM_CPU_X86_64) && defined(ASM_DEINT) + if(CpuCaps::hasMMX()) + hasMotion_MMX(p,c,n,e,e2); + else ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/avidemux/avidemux.spec?r1=1.85&r2=1.86&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
