rpms/pixman
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Actually build with the altivec detection fix (rh #472000, #451831)

Browse Source
This commit is contained in:
Daniel Williams 2008-11-18 21:26:23 +00:00
parent 1f23b919cc
commit 1379f7c463
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pixman-0.11.4-altivec.patch
View File

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

7
pixman.spec
View File

@ -3,7 +3,7 @@
Name: pixman Name: pixman
Version: 0.12.0 Version: 0.12.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: Pixel manipulation library Summary: Pixel manipulation library
Group: System Environment/Libraries Group: System Environment/Libraries
@ -15,6 +15,7 @@ URL: http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{ver
Source0: pixman-%{version}.tar.gz Source0: pixman-%{version}.tar.gz
Source1: make-pixman-snapshot.sh Source1: make-pixman-snapshot.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: pixman-0.11.4-altivec.patch
# BuildRequires: automake autoconf libtool pkgconfig # BuildRequires: automake autoconf libtool pkgconfig
@ -32,6 +33,7 @@ Development library for pixman.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .altivec
%build %build
%configure --disable-static %configure --disable-static
@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/pixman-1.pc %{_libdir}/pkgconfig/pixman-1.pc
%changelog %changelog
* Tue Nov 18 2008 Dan Williams <dcbw@redhat.com> 0.12.0-2
- Actually build with the altivec detection fix (rh #472000, #451831)
* Wed Sep 17 2008 Soren Sandmann <sandmann@redhat.com> 0.12.0-1 * Wed Sep 17 2008 Soren Sandmann <sandmann@redhat.com> 0.12.0-1
- Upgrade to 0.12.0. Drop stripes patch. - Upgrade to 0.12.0. Drop stripes patch.