Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3489273469a8195a0349d38fec8b41df8f13fc62
commit 3489273469a8195a0349d38fec8b41df8f13fc62 Author: bouleetbil <bouleet...@frogdev.info> Date: Tue Aug 3 13:05:33 2010 +0200 mplayer-1.0rc3-2-ppc *fixed ppc build diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild index 40531bf..b8d9eb2 100644 --- a/source/xapps/mplayer/FrugalBuild +++ b/source/xapps/mplayer/FrugalBuild @@ -31,13 +31,16 @@ source=(http://www.mplayerhq.hu/MPlayer/releases/$_F_archive_name-$pkgver.tar.bz http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-cp1250.tar.bz2 \ http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-1.tar.bz2 \ http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 \ - http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2) + http://www.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-7.tar.bz2 \ + ppc-altivec.diff) + sha1sums=('f533ea1eb2c540402bace0f0fe2317721361510d' \ '45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9' \ 'ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68' \ '152c40bf20de34aa8802d7f80d34d673b0b67212' \ '7b99bbe0e9ba89a57eccbea8f93c453c4f268181' \ - '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d') + '2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d' \ + 'df375f7afe673ff1d960139253c93a5927e0f7fb') if Fuse $USE_DEVEL; then source=(${source[1]} ${source[2]} ${source[3]} ${source[4]} ${source[5]}) @@ -67,7 +70,7 @@ build() Fcd $_F_archive_name-$pkgver fi unset CFLAGS -# Fpatchall + Fpatchall if ! Fuse $USE_DEVEL; then Fconfopts="$Fconfopts --disable-vidix" fi diff --git a/source/xapps/mplayer/ppc-altivec.diff b/source/xapps/mplayer/ppc-altivec.diff new file mode 100644 index 0000000..d56a716 --- /dev/null +++ b/source/xapps/mplayer/ppc-altivec.diff @@ -0,0 +1,71 @@ +--- MPlayer-1.0rc3/libswscale/swscaleold.c 2010-08-03 11:45:53.000000000 +0000 ++++ MPlayer-1.0rc3/libswscale/swscale.c 2010-08-03 12:39:52.000000000 +0000 +@@ -960,8 +960,7 @@ + #endif + + #if ARCH_PPC +-#if (HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL +-#undef COMPILE_C ++#if HAVE_ALTIVEC + #define COMPILE_ALTIVEC + #endif + #endif //ARCH_PPC +@@ -1636,41 +1635,44 @@ + } + + static SwsFunc getSwsFunc(int flags){ ++#if CONFIG_RUNTIME_CPUDETECT ++ int flags = c->flags; + +-#if defined(RUNTIME_CPUDETECT) && CONFIG_GPL + #if ARCH_X86 + // ordered per speed fastest first +- if (flags & SWS_CPU_CAPS_MMX2) ++ if (flags & SWS_CPU_CAPS_MMX2) { + return swScale_MMX2; +- else if (flags & SWS_CPU_CAPS_3DNOW) ++ } else if (flags & SWS_CPU_CAPS_3DNOW) { + return swScale_3DNow; +- else if (flags & SWS_CPU_CAPS_MMX) ++ } else if (flags & SWS_CPU_CAPS_MMX) { + return swScale_MMX; +- else ++ } else { + return swScale_C; ++ } + + #else +-#if ARCH_PPC +- if (flags & SWS_CPU_CAPS_ALTIVEC) ++#ifdef COMPILE_ALTIVEC ++ if (flags & SWS_CPU_CAPS_ALTIVEC) { + return swScale_altivec; +- else ++ } else { + return swScale_C; ++ } + #endif + return swScale_C; + #endif /* ARCH_X86 */ +-#else //RUNTIME_CPUDETECT +-#if HAVE_MMX2 ++#else //CONFIG_RUNTIME_CPUDETECT ++#if COMPILE_TEMPLATE_MMX2 + return swScale_MMX2; +-#elif HAVE_AMD3DNOW ++#elif COMPILE_TEMPLATE_AMD3DNOW + return swScale_3DNow; +-#elif HAVE_MMX ++#elif COMPILE_TEMPLATE_MMX + return swScale_MMX; +-#elif HAVE_ALTIVEC ++#elif COMPILE_TEMPLATE_ALTIVEC + return swScale_altivec; + #else + return swScale_C; + #endif +-#endif //!RUNTIME_CPUDETECT ++#endif //!CONFIG_RUNTIME_CPUDETECT + } + + static int PlanarToNV12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
