SPECS: libmovtar.spec - gcc4 fix, nfy.

[pluto]

Author: pluto                        Date: Sun Mar 12 11:53:17 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- gcc4 fix, nfy.

---- Files affected:
SPECS:
   libmovtar.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/libmovtar.spec
diff -u SPECS/libmovtar.spec:1.9 SPECS/libmovtar.spec:1.10
--- SPECS/libmovtar.spec:1.9	Mon Jun  6 16:07:58 2005
+++ SPECS/libmovtar.spec	Sun Mar 12 12:53:12 2006
@@ -1,16 +1,17 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	mmx	# use MMX on i[56]86 (no runtime detection!)
-#
-%ifarch athlon
-%define		with_mmx 1
+%bcond_with	mmx	# use MMX on ix86 (no runtime detection!)
+
+%ifnarch athlon pentium2 pentium3 pentium4
+%undefine	with_mmx
 %endif
+
 Summary:	Support library for the movtar video format
 Summary(pl):	Biblioteka obsługująca format obrazu movtar
 Name:		libmovtar
 Version:	0.1.3
-Release:	4
+Release:	4.1
 License:	GPL
 Group:		Libraries
 Source0:	http://dl.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
@@ -19,6 +20,7 @@
 Patch1:		%{name}-nommx.patch
 Patch2:		%{name}-glib.patch
 Patch3:		%{name}-am18.patch
+Patch4:		%{name}-gcc4.patch
 URL:		http://mjpeg.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.1.3
 BuildRequires:	autoconf
@@ -85,17 +87,19 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__libtoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
-CPPFLAGS="-I/usr/X11R6/include"
+
+# for movtar_play.
+%{?with_mmx:CPPFLAGS="-DHAVE_MMX_ATT_MNEMONICS"}
+
 %configure \
-%ifarch i586 i686 athlon
 	%{?with_mmx:--with-mmx}
-%endif
 
 %{__make}
 
@@ -141,6 +145,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2006/03/12 11:53:12  pluto
+- gcc4 fix, nfy.
+
 Revision 1.9  2005/06/06 14:07:58  zbyniu
 - BR: pkgconfig
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libmovtar.spec?r1=1.9&r2=1.10&f=u