diff --git a/liboil-0.3.13-disable-ppc64-opts.patch b/liboil-0.3.13-disable-ppc64-opts.patch new file mode 100644 index 0000000..9e0cdc6 --- /dev/null +++ b/liboil-0.3.13-disable-ppc64-opts.patch @@ -0,0 +1,29 @@ +--- configure.old 2008-03-12 17:30:29.000000000 +0000 ++++ configure 2008-03-12 17:34:06.000000000 +0000 +@@ -10534,7 +10534,7 @@ cat >>confdefs.h <<\_ACEOF + _ACEOF + + ;; +- xpowerpc|xppc|xpowerpc64|xppc64) ++ xpowerpc|xppc) + HAVE_POWERPC=yes + + cat >>confdefs.h <<\_ACEOF +@@ -10631,7 +10631,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- flag_ok=yes ++ flag_ok=no + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 +@@ -10641,7 +10641,7 @@ fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +- if test "X$flag_ok" = Xyes ; then ++ if test "X$flag_ok" = Xyes -a "X$HAVE_POWERPC" = "Xyes" ; then + HAVE_GCC_ASM_POWERPC_FPU=yes + true + else diff --git a/liboil.spec b/liboil.spec index 40d556e..8d33591 100644 --- a/liboil.spec +++ b/liboil.spec @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil Version: 0.3.13 -Release: 5%{?dist} +Release: 6%{?dist} # See COPYING which details everything, various BSD licenses apply License: BSD Group: System Environment/Libraries @@ -12,6 +12,8 @@ Patch1: liboil-0.3.13-s390.patch Patch2: liboil-0.3.13-better-altivec-detect.patch # from upstream git Patch3: clobber-ecx.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=435771 +Patch4: liboil-0.3.13-disable-ppc64-opts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: glib2-devel @@ -43,6 +45,7 @@ extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.). %patch1 -p1 -b .s390 %patch2 -p0 -b .better-altivec-detect %patch3 -p1 -b .clobber-ecx +%patch4 -p0 -b .disable-ppc64-opts # Disable Altivec, so that liboil doesn't SIGILL on non-Altivec PPCs # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=252179#c15 @@ -90,6 +93,9 @@ rm -rf %{buildroot} %changelog +* Wed Mar 12 2008 - Bastien Nocera - 0.3.13-6 +- Disable PPC64 optimisations as rgb2bgr_ppc() crashes on 64-bit + * Tue Mar 11 2008 - Bastien Nocera - 0.3.13-5 - Detect Altivec using /proc instead of causing a SIGILL fault