rpms/libmad/F-10 libmad-0.15.1b-ppc.patch, NONE, 1.1 libmad.spec, 1.5, 1.6

[David Juran]

Author: juran

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

Modified Files:
	libmad.spec 
Added Files:
	libmad-0.15.1b-ppc.patch 
Log Message:
- ppc asm patch from David Woodhouse (Bz 730)
- rpmlint warnings



libmad-0.15.1b-ppc.patch:

--- NEW FILE libmad-0.15.1b-ppc.patch ---
--- libmad-0.15.1b/fixed.h~	2004-02-17 02:02:03.000000000 +0000
+++ libmad-0.15.1b/fixed.h	2009-07-19 13:03:08.000000000 +0100
@@ -379,8 +379,8 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t
        asm ("addc %0,%2,%3\n\t"  \
 	    "adde %1,%4,%5"  \
 	    : "=r" (lo), "=r" (hi)  \
-	    : "%r" (lo), "r" (__lo),  \
-	      "%r" (hi), "r" (__hi)  \
+	    : "0" (lo), "r" (__lo), \
+	      "1" (hi), "r" (__hi) \
 	    : "xer");  \
     })
 #  endif


Index: libmad.spec
===================================================================
RCS file: /cvs/free/rpms/libmad/F-10/libmad.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libmad.spec	1 Jul 2009 18:21:24 -0000	1.5
+++ libmad.spec	21 Jul 2009 17:52:15 -0000	1.6
@@ -1,14 +1,15 @@
-Name:           libmad
-Version:        0.15.1b
-Release:        11%{?dist}
-Summary:        MPEG audio decoder library
-
-Group:          System Environment/Libraries
-License:        GPLv2
-URL:            http://www.underbit.com/products/mad/
-Source0:        http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
-Patch0: 	libmad-0.15.1b-multiarch.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+Name:		libmad
+Version:	0.15.1b
+Release:	12%{?dist}
+Summary:	MPEG audio decoder library
+
+Group:		System Environment/Libraries
+License:	GPLv2
+URL:		http://www.underbit.com/products/mad/
+Source0:	http://download.sourceforge.net/mad/%{name}-%{version}.tar.gz
+Patch0:		libmad-0.15.1b-multiarch.patch
+Patch1:		libmad-0.15.1b-ppc.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	automake
 BuildRequires:	autoconf
@@ -22,18 +23,20 @@
 and Layer III a.k.a. MP3) are fully implemented.
 
 %package        devel
-Summary:        MPEG audio decoder library development files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig
+Summary:	MPEG audio decoder library development files
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+Requires:	pkgconfig
 
-%description    devel
+%description	devel
 %{summary}.
 
 
 %prep
 %setup -q
 %patch0 -p1 -b .multiarch
+%patch1 -p1 -b .ppc
+
 sed -i -e /-fforce-mem/d configure* # -fforce-mem gone in gcc 4.2, noop earlier
 touch -r aclocal.m4 configure.ac NEWS AUTHORS ChangeLog
 
@@ -58,12 +61,12 @@
 autoreconf -sfi
 %configure \
 %ifarch x86_64 ia64 ppc64
-    --enable-fpm=64bit \
+	--enable-fpm=64bit \
 %endif
-    --disable-dependency-tracking \
-    --enable-accuracy \
-    --disable-debugging \
-    --disable-static    
+	--disable-dependency-tracking \
+	--enable-accuracy \
+	--disable-debugging \
+	--disable-static    
 
 make %{?_smp_mflags} CPPFLAGS="$RPM_OPT_FLAGS"
 
@@ -96,6 +99,10 @@
 
 
 %changelog
+* Tue Jul 21 2009 David Juran <david at juran.se> - 0.15.1b-12
+- ppc asm patch from David Woodhouse (Bz 730)
+- rpmlint warnings
+
 * Wed Jul  1 2009 David Juran <david at juran.se> - 0.15.1b-11
 - fix typo in multiarch patch
 - fix ppc64 version (Bz 691)