rpms/pixman/devel pixman-0.11.4-altivec.patch, 1.1, 1.2 pixman.spec, 1.22, 1.23

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/pixman/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17587

Modified Files:
	pixman-0.11.4-altivec.patch pixman.spec 
Log Message:
* Tue Nov 18 2008 Dan Williams <dcbw at redhat.com> 0.12.0-2
- Actually build with the altivec detection fix (rh #472000, #451831)



pixman-0.11.4-altivec.patch:

Index: pixman-0.11.4-altivec.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman-0.11.4-altivec.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pixman-0.11.4-altivec.patch	17 Jun 2008 18:16:54 -0000	1.1
+++ pixman-0.11.4-altivec.patch	18 Nov 2008 21:26:23 -0000	1.2
@@ -1,6 +1,8 @@
---- pixman-0.11.4/pixman/pixman-pict.c~	2008-06-09 06:56:34.000000000 +0100
-+++ pixman-0.11.4/pixman/pixman-pict.c	2008-06-17 18:38:34.000000000 +0100
-@@ -1920,7 +1920,59 @@ pixman_bool_t pixman_have_vmx (void) {
+diff --git a/pixman/pixman-pict.c b/pixman/pixman-pict.c
+index e2fd235..49a50c7 100644
+--- a/pixman/pixman-pict.c
++++ b/pixman/pixman-pict.c
+@@ -1987,7 +1987,59 @@ pixman_bool_t pixman_have_vmx (void) {
      return have_vmx;
  }
  
@@ -39,7 +41,7 @@
 +		
 +		if (buf[i] == AT_HWCAP) {
 +		    have_vmx = !!(buf[i+1] & PPC_FEATURE_HAS_ALTIVEC);
-+		    initialized = 1;
++		    initialized = TRUE;
 +		    break;
 +		} else if (buf[i] == AT_NULL) {
 +		    break;
@@ -52,12 +54,12 @@
 +	/* Something went wrong. Assume 'no' rather than playing 
 +	   fragile tricks with catching SIGILL. */
 +	have_vmx = FALSE;
-+	initialized = 1;
++	initialized = TRUE;
 +    }
 +       
 +    return have_vmx;
 +}
 +#else /* !__APPLE__ && !__linux__ */
  #include <signal.h>
+ #include <setjmp.h>
  
- static void vmx_test(int sig, siginfo_t *si, void *unused) {


Index: pixman.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pixman/devel/pixman.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- pixman.spec	17 Sep 2008 18:48:03 -0000	1.22
+++ pixman.spec	18 Nov 2008 21:26:23 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:           pixman
 Version:        0.12.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
@@ -15,6 +15,7 @@
 Source0:        pixman-%{version}.tar.gz
 Source1:	make-pixman-snapshot.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		pixman-0.11.4-altivec.patch
 
 # BuildRequires:  automake autoconf libtool pkgconfig
 
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .altivec
 
 %build
 %configure --disable-static
@@ -61,6 +63,9 @@
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Tue Nov 18 2008 Dan Williams <dcbw at redhat.com> 0.12.0-2
+- Actually build with the altivec detection fix (rh #472000, #451831)
+
 * Wed Sep 17 2008 Soren Sandmann <sandmann at redhat.com> 0.12.0-1
 - Upgrade to 0.12.0. Drop stripes patch.