Hello community,
here is the log from the commit of package clanlib for openSUSE:Factory checked
in at 2013-11-08 08:34:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/clanlib (Old)
and /work/SRC/openSUSE:Factory/.clanlib.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clanlib"
Changes:
--------
--- /work/SRC/openSUSE:Factory/clanlib/clanlib-doc.changes 2012-08-08
11:09:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.clanlib.new/clanlib-doc.changes 2013-11-08
08:34:28.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Nov 7 15:25:14 UTC 2013 - sch...@suse.de
+
+- Remove obsolete options
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/clanlib/clanlib.changes 2013-03-21
22:02:15.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.clanlib.new/clanlib.changes 2013-11-08
08:34:28.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Nov 7 15:23:35 UTC 2013 - sch...@suse.de
+
+- clanlib-cpuid.patch: use cpuid only on x86
+- Remove obsolete clanlib-ppc.patch
+- Remove obsolete options
+
+-------------------------------------------------------------------
@@ -52 +58,0 @@
-
Old:
----
clanlib-ppc.patch
New:
----
clanlib-cpuid.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clanlib-doc.spec ++++++
--- /var/tmp/diff_new_pack.b7avE1/_old 2013-11-08 08:34:31.000000000 +0100
+++ /var/tmp/diff_new_pack.b7avE1/_new 2013-11-08 08:34:31.000000000 +0100
@@ -77,17 +77,7 @@
Examples/Game/TileMap/Resources/tileset.txt
%build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="$CFLAGS"
-%ifarch %arm
-export CFLAGS="$CFLAGS -DCL_ARM_PLATFORM"
-export CXXFLAGS="$CFLAGS -DCL_ARM_PLATFORM"
-%endif
-%ifarch %ix86
-%configure --with-pic --disable-static --enable-asm386 --enable-docs
-%else
-%configure --with-pic --disable-static --disable-asm386 --enable-docs
-%endif
+%configure --with-pic --disable-static --enable-docs
make %{?_smp_mflags} html
%install
++++++ clanlib.spec ++++++
--- /var/tmp/diff_new_pack.b7avE1/_old 2013-11-08 08:34:31.000000000 +0100
+++ /var/tmp/diff_new_pack.b7avE1/_new 2013-11-08 08:34:31.000000000 +0100
@@ -28,8 +28,8 @@
Source: ClanLib-%{version}.tgz
# PATCH-FIX-UPSTREAM -- fix compilation with new Mesa, co...@suse.de
Patch0: ClanLib-2.3.6-fix-opengl.patch
-# PATCH-FIX-OPENSUSE -- fix ppc build, dval...@suse.com
-Patch1: clanlib-ppc.patch
+# PATCH-FIX-UPSTREAM -- Use cpuid only on x86, sch...@suse.de
+Patch1: clanlib-cpuid.patch
BuildRequires: Mesa-devel
BuildRequires: alsa-devel
BuildRequires: dos2unix
@@ -79,21 +79,7 @@
%patch1 -p1
%build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="$CFLAGS"
-%ifarch %arm aarch64
-export CFLAGS="$CFLAGS -DCL_ARM_PLATFORM"
-export CXXFLAGS="$CFLAGS -DCL_ARM_PLATFORM"
-%endif
-%ifarch ppc ppc64
-export CFLAGS="$CFLAGS -DCL_PPC_PLATFORM"
-export CXXFLAGS="$CFLAGS -DCL_PPC_PLATFORM"
-%endif
-%ifarch %ix86
-%configure --with-pic --disable-static --enable-asm386 --disable-docs
-%else
-%configure --with-pic --disable-static --disable-asm386 --disable-docs
-%endif
+%configure --with-pic --disable-static --disable-docs
make %{?_smp_mflags}
%install
++++++ clanlib-cpuid.patch ++++++
Index: ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp
===================================================================
--- ClanLib-2.3.6.orig/Sources/Core/System/detect_cpu_ext.cpp
+++ ClanLib-2.3.6/Sources/Core/System/detect_cpu_ext.cpp
@@ -30,18 +30,6 @@
#include "Core/precomp.h"
#include "API/Core/System/system.h"
-#ifdef CL_ARM_PLATFORM
-bool CL_System::detect_cpu_extension(CL_CPU_ExtensionPPC ext)
-{
- throw ("Congratulations, you've just been selected to code this
feature!");
-}
-
-bool CL_System::detect_cpu_extension(CL_CPU_ExtensionX86 ext)
-{
- return false;
-}
-#else
-
#if (defined(WIN32) || defined(_WIN32) || defined(_WIN64)) && !defined
__MINGW32__
#include <intrin.h>
#endif
@@ -72,6 +60,7 @@ bool CL_System::detect_cpu_extension(CL_
bool CL_System::detect_cpu_extension(CL_CPU_ExtensionX86 ext)
{
+#if defined(__amd64__) || defined(__i386__)
unsigned int cpuinfo[4] = {0};
if(ext == mmx)
@@ -179,7 +168,6 @@ bool CL_System::detect_cpu_extension(CL_
__cpuid((int*)cpuinfo, 0x80000001);
return ((cpuinfo[2] & (1 << 16)) != 0);
}
+#endif
return false;
}
-
-#endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
