rpms/mplayer/F-10 mplayer-ppc-compile.patch, NONE, 1.1 mplayer.spec, 1.13, 1.14

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/mplayer/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27689

Modified Files:
	mplayer.spec 
Added Files:
	mplayer-ppc-compile.patch 
Log Message:
- fixed build on ppc

mplayer-ppc-compile.patch:

--- NEW FILE mplayer-ppc-compile.patch ---
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


Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-10/mplayer.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mplayer.spec	12 Feb 2009 00:01:14 -0000	1.13
+++ mplayer.spec	13 Feb 2009 19:41:24 -0000	1.14
@@ -20,6 +20,7 @@
 %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
@@ -192,6 +193,7 @@
 %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
@@ -348,6 +350,7 @@
 - dropped .sh extension from shell scripts in %%{_bindir}
 - BR: yasm for more asm optimizations
 - dropped redundant altivec CFLAGS on ppc
+- fixed build on ppc
 
 * Sun Nov 23 2008 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.103.20080903svn
 - fix broken terminal after using dvb input (bug #117)