Hello community,
here is the log from the commit of package liboil
checked in at Sun Mar 16 19:56:51 CET 2008.
--------
--- liboil/liboil.changes 2008-03-10 15:23:15.000000000 +0100
+++ /mounts/work_src_done/STABLE/liboil/liboil.changes 2008-03-16 19:19:47.000000000 +0100
@@ -1,0 +2,6 @@
+Sun Mar 16 18:59:33 CET 2008 - rguenther@suse.de
+
+- Add patches from Fedora SRPM. [bnc#370121]
+- Run the testsuite.
+
+-------------------------------------------------------------------
Old:
----
s390.patch
New:
----
liboil-0.3.13-better-altivec-detect.patch
liboil-0.3.13-clobber-ecx.patch
liboil-0.3.13-disable-ppc64-opts.patch
liboil-0.3.13-s390.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ liboil.spec ++++++
--- /var/tmp/diff_new_pack.P30955/_old 2008-03-16 19:56:05.000000000 +0100
+++ /var/tmp/diff_new_pack.P30955/_new 2008-03-16 19:56:05.000000000 +0100
@@ -14,7 +14,7 @@
Name: liboil
BuildRequires: glib2-devel gtk-doc sgml-skel
Version: 0.3.13
-Release: 1
+Release: 3
Url: http://liboil.freedesktop.org/wiki/
Group: System/Libraries
License: Other uncritical OpenSource License
@@ -22,9 +22,12 @@
Source: %{name}-%{version}.tar.bz2
AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Patch1: s390.patch
+Patch1: liboil-0.3.13-s390.patch
Patch2: liboil-random-data-warning.patch
Patch3: liboil-disable-sse.patch
+Patch4: liboil-0.3.13-clobber-ecx.patch
+Patch5: liboil-0.3.13-disable-ppc64-opts.patch
+Patch6: liboil-0.3.13-better-altivec-detect.patch
%description
Liboil is a library of simple functions that are optimized for various
@@ -98,9 +101,12 @@
%prep
%setup
-#%patch1
+%patch1 -p1
%patch2
%patch3
+%patch4 -p1
+%patch5
+%patch6
%build
autoreconf -f -i
@@ -108,6 +114,11 @@
# does nor work for liboil-0.3.9:
#make %{?jobs:-j%jobs}
make
+# Do NOT! disable running the testsuite or make failures
+# non-fatal for the build!
+
+%check
+make check
%install
make DESTDIR=$RPM_BUILD_ROOT install
@@ -137,6 +148,9 @@
%{_datadir}/gtk-doc/html/liboil
%changelog
+* Sun Mar 16 2008 rguenther@suse.de
+- Add patches from Fedora SRPM. [bnc#370121]
+- Run the testsuite.
* Mon Mar 10 2008 maw@suse.de
- Update to version 0.3.13:
+ Lots of new classes and implementations were added for
++++++ liboil-0.3.13-better-altivec-detect.patch ++++++
Index: liboil/liboilcpu-powerpc.c
===================================================================
RCS file: /cvs/liboil/liboil/liboil/liboilcpu-powerpc.c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 liboilcpu-powerpc.c
--- liboil/liboilcpu-powerpc.c 14 Nov 2007 09:30:20 -0000 1.1
+++ liboil/liboilcpu-powerpc.c 11 Mar 2008 15:07:22 -0000
@@ -44,6 +44,21 @@
//#include
//#include
+#if defined(__linux__)
+#include
+#include
+#include
+#include
+#include
+#include
+
+#ifndef PPC_FEATURE_HAS_ALTIVEC
+/* From linux-2.6/include/asm-powerpc/cputable.h */
+#define PPC_FEATURE_HAS_ALTIVEC 0x10000000
+#endif
+
+#endif
+
#if defined(__FreeBSD__)
#include
#include
@@ -67,7 +82,7 @@ test_altivec (void * ignored)
}
#if defined(__FreeBSD__)
-void
+static void
oil_check_altivec_sysctl (void)
{
int ret, av;
@@ -81,6 +96,61 @@ oil_check_altivec_sysctl (void)
}
#endif
+#if defined(__linux__)
+static void
+oil_check_altivec_proc (void)
+{
+ static int available = -1;
+ int new_avail = 0;
+ char fname[64];
+ unsigned long buf[64];
+ ssize_t count;
+ pid_t pid;
+ int fd, i;
+
+ /* Flags already set */
+ if (available != -1) {
+ return;
+ }
+
+ pid = getpid();
+ snprintf(fname, sizeof(fname)-1, "/proc/%d/auxv", pid);
+
+ fd = open(fname, O_RDONLY);
+ if (fd < 0) {
+ goto out;
+ }
+
+more:
+ count = read(fd, buf, sizeof(buf));
+ if (count < 0) {
+ goto out_close;
+ }
+
+ for (i=0; i < (count / sizeof(unsigned long)); i += 2) {
+ if (buf[i] == AT_HWCAP) {
+ new_avail = !!(buf[i+1] & PPC_FEATURE_HAS_ALTIVEC);
+ goto out_close;
+ } else if (buf[i] == AT_NULL) {
+ goto out_close;
+ }
+ }
+
+ if (count == sizeof(buf)) {
+ goto more;
+ }
+
+out_close:
+ close(fd);
+
+out:
+ available = new_avail;
+ if (available) {
+ oil_cpu_flags |= OIL_IMPL_FLAG_ALTIVEC;
+ }
+}
+#endif
+
void
oil_check_altivec_fault (void)
{
@@ -97,6 +167,8 @@ oil_cpu_detect_arch(void)
{
#if defined(__FreeBSD__)
oil_check_altivec_sysctl();
+#elif defined(__linux__)
+ oil_check_altivec_proc();
#else
oil_check_altivec_fault();
#endif
@@ -104,5 +176,3 @@ oil_cpu_detect_arch(void)
_oil_profile_stamp = oil_profile_stamp_tb;
}
-
-
++++++ liboil-0.3.13-clobber-ecx.patch ++++++
diff -up liboil-0.3.13/liboil/i386_amd64/copy.c.clobber-ecx liboil-0.3.13/liboil/i386_amd64/copy.c
--- liboil-0.3.13/liboil/i386_amd64/copy.c.clobber-ecx 2008-02-26 20:29:07.000000000 -0500
+++ liboil-0.3.13/liboil/i386_amd64/copy.c 2008-02-26 20:29:31.000000000 -0500
@@ -375,7 +375,8 @@ static void splat_u16_ns_mmx (uint16_t *
" emms\n"
: [dest] "+r" (dest),
[n] "+r" (n)
- : [src] "r" (src));
+ : [src] "r" (src)
+ : "ecx");
}
OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
@@ -401,7 +402,8 @@ static void splat_u16_ns_mmx_2 (uint16_t
" emms\n"
: [dest] "+r" (dest),
[n] "+r" (n)
- : [src] "r" (src));
+ : [src] "r" (src)
+ : "ecx");
}
OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx_2, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
@@ -429,7 +431,8 @@ static void splat_u16_ns_mmx_3 (uint16_t
" emms\n"
: [dest] "+r" (dest),
[n] "+r" (n)
- : [src] "r" (src));
+ : [src] "r" (src)
+ : "ecx");
}
OIL_DEFINE_IMPL_FULL (splat_u16_ns_mmx_3, splat_u16_ns, OIL_IMPL_FLAG_MMX|OIL_IMPL_FLAG_MMXEXT);
++++++ liboil-0.3.13-disable-ppc64-opts.patch ++++++
Index: configure
===================================================================
--- configure.orig 2008-02-22 21:56:03.000000000 +0100
+++ configure 2008-03-16 19:07:48.000000000 +0100
@@ -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
Index: m4/as-host-defines.m4
===================================================================
--- m4/as-host-defines.m4.orig 2008-02-22 20:59:17.000000000 +0100
+++ m4/as-host-defines.m4 2008-03-16 19:10:31.000000000 +0100
@@ -19,7 +19,7 @@ AC_DEFUN([AS_HOST_DEFINES],
HAVE_AMD64=yes
AC_DEFINE(HAVE_AMD64, 1, [Defined if host is amd64])
;;
- xpowerpc|xppc|xpowerpc64|xppc64)
+ xpowerpc|xppc)
HAVE_POWERPC=yes
AC_DEFINE(HAVE_POWERPC, 1, [Defined if host is powerpc])
;;
++++++ liboil-0.3.13-s390.patch ++++++
diff -up liboil-0.3.13/liboil/liboilcpu-misc.c.s390 liboil-0.3.13/liboil/liboilcpu-misc.c
--- liboil-0.3.13/liboil/liboilcpu-misc.c.s390 2008-02-22 14:59:17.000000000 -0500
+++ liboil-0.3.13/liboil/liboilcpu-misc.c 2008-02-22 22:38:36.000000000 -0500
@@ -87,7 +87,7 @@ static unsigned long
oil_profile_stamp_s390(void)
{
uint64_t ts;
- __asm__ __volatile__ ("STCK %0\n" : : "m" (ts));
+ __asm__ __volatile__ ("STCK %0(%0)\n" : : "r" (&ts));
return ts;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org