Author: belegdol Update of /cvs/free/rpms/mplayer/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19666 Modified Files: mplayer.spec Added Files: mplayer-cpudetect.patch Log Message: * Fri Jun 07 2013 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-10.20130416svn - Fixed cpu detection (mplayer #2141) mplayer-cpudetect.patch: cpudetect.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) --- NEW FILE mplayer-cpudetect.patch --- Index: cpudetect.c =================================================================== --- cpudetect.c (wersja 36298) +++ cpudetect.c (wersja 36300) @@ -56,7 +56,7 @@ #if CONFIG_RUNTIME_CPUDETECT /* I believe this code works. However, it has only been used on a PII and PIII */ -#if defined(__linux__) && defined(_POSIX_SOURCE) && !ARCH_X86_64 +#if defined(__linux__) && !ARCH_X86_64 static void sigill_handler_sse( int signal, struct sigcontext sc ) { mp_msg(MSGT_CPUDETECT,MSGL_V, "SIGILL, " ); @@ -75,7 +75,7 @@ gCpuCaps.hasSSE=0; } -#endif /* __linux__ && _POSIX_SOURCE */ +#endif /* __linux__ */ #if (defined(__MINGW32__) || defined(__CYGWIN__)) && !ARCH_X86_64 LONG CALLBACK win32_sig_handler_sse(EXCEPTION_POINTERS* ep) @@ -177,7 +177,6 @@ mp_msg(MSGT_CPUDETECT,MSGL_V, gCpuCaps.hasSSE ? "yes.\n" : "no!\n" ); } #elif defined(__linux__) -#if defined(_POSIX_SOURCE) struct sigaction saved_sigill; /* Save the original signal handlers. @@ -210,13 +209,6 @@ */ mp_msg(MSGT_CPUDETECT,MSGL_V, "Tests of OS support for SSE %s\n", gCpuCaps.hasSSE ? "passed." : "failed!" ); #else - /* We can't use POSIX signal handling to test the availability of - * SSE, so we disable it by default. - */ - mp_msg(MSGT_CPUDETECT,MSGL_WARN, "Cannot test OS support for SSE, disabling to be safe.\n" ); - gCpuCaps.hasSSE=0; -#endif /* _POSIX_SOURCE */ -#else /* Do nothing on other platforms for now. */ mp_msg(MSGT_CPUDETECT,MSGL_WARN, "Cannot test OS support for SSE, leaving disabled.\n" ); Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- mplayer.spec 8 May 2013 05:38:45 -0000 1.70 +++ mplayer.spec 7 Jun 2013 19:11:28 -0000 1.71 @@ -6,7 +6,7 @@ Name: mplayer Version: 1.1 -Release: 9.%{?pre}%{?dist} +Release: 10.%{?pre}%{?dist} Summary: Movie player playing most video formats and DVDs %if 0%{!?_without_amr:1} @@ -24,6 +24,7 @@ Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2 Source10: mplayer-snapshot.sh Patch0: mplayer-asx-parser.patch +Patch1: mplayer-cpudetect.patch # set defaults for Fedora Patch2: %{name}-config.patch # use roff include statements instead of symlinks @@ -223,6 +224,7 @@ rm -rf ffmpeg libdvdcss libdvdnav libdvdread4 %endif %patch0 -p0 -b .asx-parser +%patch1 -p0 -b .cpudetect %patch2 -p1 -b .config %patch8 -p1 -b .manlinks %patch14 -p1 -b .nodvdcss @@ -382,6 +384,9 @@ %{_datadir}/mplayer/*.fp %changelog +* Fri Jun 07 2013 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-10.20130416svn +- Fixed cpu detection (mplayer #2141) + * Wed May 08 2013 Julian Sikorski <belegdol(a)fedoraproject.org&gt; - 1.1-9.20130416svn - Fixed dangerous playlist parsing