From b86a34d412baf3e261dd7679119d3b2c0c9f333c Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Fri, 13 Feb 2009 19:05:48 +0000 Subject: [PATCH] - fixed build on ppc --- mplayer-ppc-compile.patch | 18 ++++++++++++++++++ mplayer.spec | 3 +++ 2 files changed, 21 insertions(+) create mode 100644 mplayer-ppc-compile.patch diff --git a/mplayer-ppc-compile.patch b/mplayer-ppc-compile.patch new file mode 100644 index 0000000..0d9d60e --- /dev/null +++ b/mplayer-ppc-compile.patch @@ -0,0 +1,18 @@ +diff -up mplayer-export-2009-02-04/libswscale/swscale.c.ppc-compile mplayer-export-2009-02-04/libswscale/swscale.c +--- mplayer-export-2009-02-04/libswscale/swscale.c.ppc-compile 2009-01-25 20:58:33.000000000 +0100 ++++ mplayer-export-2009-02-04/libswscale/swscale.c 2009-02-13 15:00:57.000000000 +0100 +@@ -955,13 +955,12 @@ static inline void yuv2rgbXinC_full(SwsC + + //Note: we have C, X86, MMX, MMX2, 3DNOW versions, there is no 3DNOW+MMX2 one + //Plain C versions +-#if !HAVE_MMX || defined (RUNTIME_CPUDETECT) || !CONFIG_GPL ++#if !HAVE_MMX || !HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT) || !CONFIG_GPL + #define COMPILE_C + #endif + + #if ARCH_PPC + #if (HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL +-#undef COMPILE_C + #define COMPILE_ALTIVEC + #endif + #endif //ARCH_PPC diff --git a/mplayer.spec b/mplayer.spec index 7114b80..8878d78 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -20,6 +20,7 @@ Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{pre %endif Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 Source10: mplayer-snapshot.sh +Patch1: %{name}-ppc-compile.patch Patch2: %{name}-config.patch Patch5: %{name}-x86_32-compile.patch Patch8: %{name}-manlinks.patch @@ -189,6 +190,7 @@ MPlayer documentation in various languages. %else %setup -q -n MPlayer-%{version}%{pre} %endif +%patch1 -p1 -b .ppc-compile %patch2 -p1 -b .config %patch5 -p1 -b .compile %patch8 -p1 -b .manlinks @@ -344,6 +346,7 @@ rm -rf $RPM_BUILD_ROOT - dropped obsolete patch - dropped obsolete BR - dropped redundant altivec CFLAGS on ppc +- fixed build on ppc * Wed Jan 07 2009 Dominik Mierzejewski - 1.0-0.105.20090107svn - 20090107 snapshot