- pre5

- MMX is conditional (causes SIGILL on non-MMX)

Changed files:
    mplayer-confpath.patch -> 1.2
    mplayer.spec -> 1.21

diff --git a/mplayer-confpath.patch b/mplayer-confpath.patch
index d109cd4db75bddf54bc5a7a4faa26b5b57c4d141..a79929fd681a0b9c5b9593aef854ac0f2b10252e 100644 (file)
--- a/mplayer-confpath.patch
+++ b/mplayer-confpath.patch
@@ -1,6 +1,6 @@
-diff -durN MPlayer-0.18pre4.orig/mplayer.c MPlayer-0.18pre4/mplayer.c
---- MPlayer-0.18pre4.orig/mplayer.c    Mon Jul  2 21:25:34 2001
-+++ MPlayer-0.18pre4/mplayer.c Fri Jul  6 11:40:53 2001
+diff -durN MPlayer-0.18pre5.orig/mplayer.c MPlayer-0.18pre5/mplayer.c
+--- MPlayer-0.18pre5.orig/mplayer.c    Mon Jul  2 21:25:34 2001
++++ MPlayer-0.18pre5/mplayer.c Fri Jul  6 11:40:53 2001
 @@ -466,7 +466,7 @@
  {
  char *conffile;
@@ -15,7 +15,7 @@ diff -durN MPlayer-0.18pre4.orig/mplayer.c MPlayer-0.18pre4/mplayer.c
  // check codec.conf
  if(!parse_codec_cfg(get_path("codecs.conf"))){
 +    if (!parse_codec_cfg("/etc/mplayer/codecs.conf")) {
-     printf("(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n");
+     fprintf(stderr,"(copy/link DOCS/codecs.conf to ~/.mplayer/codecs.conf)\n");
      GUI_MSG( mplCodecConfNotFound )
      exit(1);
 +    }

diff --git a/mplayer.spec b/mplayer.spec
index 173cc2e402252db0702cebb3925edf45cd3da034..72ebfa368df9a0b7114f6952424d56d1db838eaf 100644 (file)
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -1,8 +1,9 @@
 #
 # Conditional build:
-# _with_3dnow  - with 3dnow support
-# _with_sse            - with sse support
-# _with_mmx2           - with mmx2 support
+# _with_3dnow  - with 3Dnow! support
+# _with_sse            - with SSE support
+# _with_mmx            - with MMX support
+# _with_mmx2           - with MMX2 support
 # _without_select      - disable audio select() support ( for example required this option ALSA or Vortex2 driver )
 #
 
@@ -12,12 +13,12 @@ Summary:    Yet another movie player for linux
 Summary(pl):   Jeszcze jeden odtwarzacz filmów dla linuxa
 Name:          mplayer
 Version:       0.18
-Release:       1.pre3
+Release:       1.pre5
 License:       GPL
 Group:         X11/Applications/Multimedia
 Group(de):     X11/Applikationen/Multimedia
 Group(pl):     X11/Aplikacje/Multimedia
-Source0:       http://mplayerhq.banki.hu/MPlayer/releases/%{sname}-%{version}pre.tgz
+Source0:       http://mplayerhq.banki.hu/MPlayer/releases/%{sname}-%{version}pre5.tgz
 Source1:       %{name}.conf
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-confpath.patch
@@ -56,7 +57,7 @@ rozszerzeniem SHM, X11 z rozszerzeniem Xvideo, renderer OpenGL, Matrox
 G400 u¿ywaj±c framebuffera, Voodoo2/3, SDL v1.1.7 itp.
 
 %prep
-%setup  -q -n %{sname}-%{version}pre4
+%setup  -q -n %{sname}-%{version}pre5
 %patch0 -p1
 %patch1 -p1
 
@@ -64,7 +65,7 @@ G400 u
 %configure \
        --with-win32libdir="/usr/lib/win32" \
 %ifarch i586 i686
-       --enable-mmx \
+%{?_with_mmx:  --enable-mmx} \
 %{?_with_3dnow:        --enable-3dnow} \
 %{?_with_sse:  --enable-sse} \
 %{?_with_mmx2: --enable-mmx2} \