diff --git a/.cvsignore b/.cvsignore index 17dd48e..a94ae34 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -liboil-0.3.15.tar.gz +liboil-0.3.16.tar.gz diff --git a/import.log b/import.log index 5f52a87..a78a02d 100644 --- a/import.log +++ b/import.log @@ -1 +1,2 @@ mingw32-liboil-0_3_15-2:HEAD:mingw32-liboil-0.3.15-2.src.rpm:1237540314 +mingw32-liboil-0_3_16-1_el5:HEAD:mingw32-liboil-0.3.16-1.el5.src.rpm:1238067935 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/mingw32-liboil.spec b/mingw32-liboil.spec index 306932e..9939873 100644 --- a/mingw32-liboil.spec +++ b/mingw32-liboil.spec @@ -6,19 +6,18 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: mingw32-liboil -Version: 0.3.15 -Release: 2%{?dist} +Version: 0.3.16 +Release: 1%{?dist} # See COPYING which details everything, various BSD licenses apply License: BSD Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ -Source: liboil-%{version}.tar.gz +Source: http://liboil.freedesktop.org/download/liboil-%{version}.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=435771 -#Patch4: liboil-0.3.13-disable-ppc64-opts.patch +Patch4: liboil-0.3.13-disable-ppc64-opts.patch -#BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -44,17 +43,22 @@ extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.). #Requires: %{name} = %{version}-%{release}, pkgconfig #%description devel +#Liboil is a library of simple functions that are optimized for various CPUs. +#These functions are generally loops implementing simple algorithms, such as +#converting an array of N integers to floating-poing numbers or multiplying +#and summing an array of N numbers. Clearly such functions are candidates for +#significant optimization using various techniques, especially by using +#extended instructions provided by modern CPUs (Altivec, MMX, SSE, etc.). %prep %setup -q -n liboil-%{version} -#%patch4 -p0 -b .disable-ppc64-opts +%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 #sed -i 's/CFLAGS="$CFLAGS "-maltivec""/CFLAGS="$CFLAGS "-fno-tree-vectorize -Wa,-maltivec""/' configure #sed -i 's/LIBOIL_CFLAGS -maltivec/LIBOIL_CFLAGS -fno-tree-vectorize -Wa,-maltivec/' configure - %build %{_mingw32_configure} # Remove standard rpath from oil-bugreport @@ -65,10 +69,9 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool # /bin/sh: ./build_prototypes_doc: No such file or directory make %{?_smp_mflags} - %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} # Remove static libraries but DON'T remove *.dll.a files. rm $RPM_BUILD_ROOT%{_mingw32_libdir}/liboil-0.3.a @@ -81,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT%{_mingw_mandir} rm -rf $RPM_BUILD_ROOT%{_mingw32_datadir}/gtk-doc %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files @@ -98,12 +101,26 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 26 2009 Levente Farkas - 0.3.16-1 +- add mingw32 changes + +* Thu Mar 26 2009 - Behdad Esfahbod - 0.3.16-1 +- Update to 0.3.16 +- Remove upstreamed patches +- Resolves #489861 + * Wed Mar 18 2009 Levente Farkas - 0.3.15-2 - Add new BRs * Mon Mar 11 2009 Zoltan Seress - 0.3.15-1 - Windows cross compilation +* Wed Feb 25 2009 Fedora Release Engineering - 0.3.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Dec 11 2008 Caolán McNamara - 0.3.14-2 +- rebuild to get provides pkgconfig(liboil-0.3) + * Mon Apr 07 2008 Colin Walters - 0.3.14-1 - New upstream version - Drop upstreamed liboil-0.3.13-better-altivec-detect.patch diff --git a/sources b/sources index c7b73c0..ca4110e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11dd39b1ca13ce2e0618d4df8303f137 liboil-0.3.15.tar.gz +febb1d9f9bc4c440fcf622dc90f8b6b7 liboil-0.3.16.tar.gz