Hello community, here is the log from the commit of package zhu3d for openSUSE:Factory checked in at 2013-01-02 13:02:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zhu3d (Old) and /work/SRC/openSUSE:Factory/.zhu3d.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zhu3d", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/zhu3d/zhu3d.changes 2012-12-28 22:52:12.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.zhu3d.new/zhu3d.changes 2013-01-02 13:02:39.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Dec 29 00:39:52 UTC 2012 - [email protected] + +- use label number not a name for ppc asm call. + fixes symbol `loop' is already defined (zhu3d-ppc.patch) + +------------------------------------------------------------------- New: ---- zhu3d-ppc.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zhu3d.spec ++++++ --- /var/tmp/diff_new_pack.wU28Qm/_old 2013-01-02 13:02:40.000000000 +0100 +++ /var/tmp/diff_new_pack.wU28Qm/_new 2013-01-02 13:02:40.000000000 +0100 @@ -32,11 +32,13 @@ Patch1: %{name}-4.2.4-glu-link.patch # PATCH-FIX-OPENSUSE zhu3d-no-compilation-date.patch - fix "W: file-contains-current-date" Patch2: %{name}-no-compilation-date.patch +# PATCH-FIX-OPENSUSE zhu3d-ppc.patch - fixes ppc build +Patch3: zhu3d-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: fdupes BuildRequires: Mesa-devel +BuildRequires: fdupes %if 0%{?suse_version} >= 1220 BuildRequires: Mesa-libGLU-devel %endif @@ -64,6 +66,7 @@ %patch0 %patch1 %patch2 -p1 +%patch3 -p1 find . -type f -print0|xargs -0 chmod -x sed -i 's/\r//' readme.txt license.gpl ++++++ zhu3d-ppc.patch ++++++ Index: zhu3d-4.2.4/src/tsc.h =================================================================== --- zhu3d-4.2.4.orig/src/tsc.h +++ zhu3d-4.2.4/src/tsc.h @@ -134,12 +134,12 @@ inline TSC_UINT TSC::fetch() { inline TSC_UINT TSC::fetch(void) { unsigned int high, low, tmp; __asm__ volatile( - "loop: \n\t" + "0: \n\t" "mftbu %0 \n\t" "mftb %1 \n\t" "mftbu %2 \n\t" "cmpw %2,%0 \n\t" - "bne loop \n\t" + "bne 0 \n\t" : "=r"(high), "=r"(low), "=r"(tmp) ); return ((TSC_UINT)high << 32) | low; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
