- removed no_altivec.patch, outdated long time ago

Changed files:
    liboil-no_altivec.patch -> 1.6
    liboil.spec -> 1.36

diff --git a/liboil-no_altivec.patch b/liboil-no_altivec.patch
deleted file mode 100644 (file)
index e07ff20..0000000
--- a/liboil-no_altivec.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur liboil-0.3.1/configure.ac liboil-0.3.1.orig/configure.ac
---- liboil-0.3.1/configure.ac  2005-03-25 10:20:35.000000000 +0100
-+++ liboil-0.3.1.orig/configure.ac     2005-03-25 10:15:58.000000000 +0100
-@@ -158,11 +158,11 @@
-     [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Wa,-mregnames"],
-     true)
- fi
--if test x$HAVE_CPU_POWERPC = xyes ; then
--  AS_COMPILER_FLAG(["-Wa,-maltivec"],
--    [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Wa,-maltivec"],
--    true)
--fi
-+#if test x$HAVE_CPU_POWERPC = xyes ; then
-+#  AS_COMPILER_FLAG(["-Wa,-maltivec"],
-+#    [LIBOIL_CFLAGS="$LIBOIL_CFLAGS -Wa,-maltivec"],
-+#    true)
-+#fi
- 
- LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200112L -I\$(top_srcdir)"
- AC_SUBST(LIBOIL_CFLAGS)
-diff -ur liboil-0.3.1/liboil/copy/Makefile.am liboil-0.3.1.orig/liboil/copy/Makefile.am
---- liboil-0.3.1/liboil/copy/Makefile.am       2005-03-25 11:05:39.000000000 +0100
-+++ liboil-0.3.1.orig/liboil/copy/Makefile.am  2004-12-06 09:39:58.000000000 +0100
-@@ -7,12 +7,12 @@
- 
- noinst_LTLIBRARIES = libcopy.la $(opt_libs)
- 
--if HAVE_CPU_POWERPC
--powerpc_sources = \
--      copy_powerpc.c
--else
-+#if HAVE_CPU_POWERPC
-+#powerpc_sources = \
-+#     copy_powerpc.c
-+#else
- powerpc_sources =
--endif
-+#endif
- 
- if HAVE_CPU_I386
- i386_sources = \
-diff -ur liboil-0.3.1.orig/liboil/liboilcpu.c liboil-0.3.1/liboil/liboilcpu.c
---- liboil-0.3.1.orig/liboil/liboilcpu.c       2005-03-17 21:06:25.000000000 +0100
-+++ liboil-0.3.1/liboil/liboilcpu.c    2005-03-25 11:46:45.000000000 +0100
-@@ -127,6 +127,7 @@
- #endif
- 
- #ifdef __powerpc__
-+/*
- static void
- test_altivec (void * ignored)
- {
-@@ -136,16 +137,19 @@
-       "  lvx %%v0, %0, %%r0  \n"
-       :: "r" (x));
- }
-+*/
- 
- static void
- oil_cpu_powerpc_getflags(void)
- {
- 
-   oil_cpu_fault_check_enable ();
-+/*
-   if (oil_cpu_fault_check_try(test_altivec, NULL)) {
-     OIL_DEBUG ("cpu flag altivec");
-     oil_cpu_flags |= OIL_IMPL_FLAG_ALTIVEC;
-   }
-+*/
-   oil_cpu_fault_check_disable ();
- }
- #endif

diff --git a/liboil.spec b/liboil.spec
index 3f6d6391f6a148d1fa0c1c863a9881502bb80c5e..b6ed6ee6fea3deab29722c3bfebeefe9b83aea27 100644 (file)
--- a/liboil.spec
+++ b/liboil.spec
@@ -1,6 +1,5 @@
 #
 # Conditional build:
-%bcond_without altivec         # without Altivec support (on ppc)
 %bcond_without static_libs     # don't build static libraries
 %bcond_without tests           # don't perform "make check"
 #
@@ -16,7 +15,6 @@ Source0:      http://liboil.freedesktop.org/download/%{name}-%{version}.tar.gz
 # Source0-md5: febb1d9f9bc4c440fcf622dc90f8b6b7
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-fixes.patch
-Patch2:                %{name}-no_altivec.patch
 URL:           http://liboil.freedesktop.org/wiki/
 BuildRequires: autoconf >= 2.58
 BuildRequires: automake >= 1.6
@@ -89,7 +87,6 @@ Statyczna biblioteka liboil.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%{!?with_altivec:%patch2 -p1}
 
 %build
 %{__libtoolize}