Hello community,
here is the log from the commit of package aranym for openSUSE:Factory checked
in at 2013-04-29 09:52:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aranym (Old)
and /work/SRC/openSUSE:Factory/.aranym.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aranym", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/aranym/aranym.changes 2013-04-17
06:59:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.aranym.new/aranym.changes 2013-04-29
09:52:34.000000000 +0200
@@ -1,0 +2,5 @@
+Sun Apr 28 12:35:52 UTC 2013 - sch...@linux-m68k.org
+
+- byteswap.patch: Avoid conflict with <byteswap.h> imported by SDL
+
+-------------------------------------------------------------------
New:
----
byteswap.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aranym.spec ++++++
--- /var/tmp/diff_new_pack.DgpIsC/_old 2013-04-29 09:52:37.000000000 +0200
+++ /var/tmp/diff_new_pack.DgpIsC/_new 2013-04-29 09:52:37.000000000 +0200
@@ -34,6 +34,7 @@
Release: 0
Source: %{name}-%{version}.tar.gz
Source1: afros-0.9.6-1.zip
+Patch1: byteswap.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -66,6 +67,7 @@
%prep
%setup -q -n %{name}-%{version} -a 1
+%patch1 -p1
# Don't remove -g from CFLAGS
sed -i -e 's,/-g,/-:,' configure
++++++ byteswap.patch ++++++
From: Andreas Schwab <sch...@linux-m68k.org>
Date: Sun, 28 Apr 2013 14:21:46 +0200
Subject: [PATCH] Avoid conflict with definitions from <byteswap.h>
diff --git a/src/uae_cpu/compiler/compemu.h b/src/uae_cpu/compiler/compemu.h
index d2a942c..233dca8 100644
--- a/src/uae_cpu/compiler/compemu.h
+++ b/src/uae_cpu/compiler/compemu.h
@@ -396,7 +396,9 @@ DECLARE_MIDFUNC(lea_l_rr_indexed(W4 d, R4 s, R4 index, IMM
factor));
DECLARE_MIDFUNC(mov_l_bRr(R4 d, R4 s, IMM offset));
DECLARE_MIDFUNC(mov_w_bRr(R4 d, R2 s, IMM offset));
DECLARE_MIDFUNC(mov_b_bRr(R4 d, R1 s, IMM offset));
+#undef bswap_32
DECLARE_MIDFUNC(bswap_32(RW4 r));
+#undef bswap_16
DECLARE_MIDFUNC(bswap_16(RW2 r));
DECLARE_MIDFUNC(mov_l_rr(W4 d, R4 s));
DECLARE_MIDFUNC(mov_l_mr(IMM d, R4 s));
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
