Control: tags -1 + confirmed patch
On Wed, Nov 12, 2014 at 11:16:05AM +0100, Lucas Nussbaum wrote:
[snip]
> Usertags: qa-ftbfs-20141112 qa-ftbfs
> Justification: FTBFS in jessie on i386
[snip]
> Relevant part (hopefully):
> > gcc -O3 -fomit-frame-pointer -malign-double -fstrict-aliasing -ffast-math
> > -march=pentiumpro -D_REENTRANT-I/usr/include -fomit-frame-pointer
> > -DSFFE_USING -DSFFE_CMPLX_GSL -I/«BUILDDIR»/xaos-3.5+ds1/src/include -c
> > -o zoom.o zoom.c
> > zoom.c:156:18: error: conflicting types for 'fillline_8'
> > #define fillline fillline_8
> > ^
> > zoomd.c:283:20: note: in expansion of macro 'fillline'
> > static INLINE void fillline(int line)
> > ^
> > zoom.c:144:13: note: previous declaration of 'fillline_8' was here
> > static void fillline_8(int line) REGISTERS(0);
[snip]
Hi Ansgar,
What do you think about the attached patch that adds a, well, a patch to
fix this failure to build by adding the REGISTERS(0) specification to
the function definitions, too, just as it is specified in the
prototypes?
The actual patch is in the first attachment; the second one is there
just to provide a sample changelog entry and to allow me to build the
package here :) Of course, if you agree, I could commit the change to
the pkg-games Git repo myself and then prepare a package and put it up
for sponsoring.
Thanks, both Ansgar and Lucas, for your unceasing Debian work!
G'luck,
Peter
--
Peter Pentchev r...@ringlet.net r...@freebsd.org p.penc...@storpool.com
PGP key:http://people.FreeBSD.org/~roam/roam.key.asc
Key fingerprint 2EE7 A7A5 17FC 124C F115 C354 651E EFB0 2527 DF13
From d99242d375ff983f2fd278c76a2c96bcea34c988 Mon Sep 17 00:00:00 2001
From: Peter Pentchev
Date: Wed, 12 Nov 2014 13:43:53 +0200
Subject: [PATCH 1/2] Fix the build on i386 - match the regparm attrs.
Add the REGISTERS(n) (a.k.a. __attribute__((regparm(n specification
to the definitions of two functions that already have it in their
prototypes.
Bug-Debian: https://bugs.debian.org/769238
---
debian/patches/engine-registers.patch | 26 ++
debian/patches/series | 1 +
2 files changed, 27 insertions(+)
create mode 100644 debian/patches/engine-registers.patch
diff --git a/debian/patches/engine-registers.patch
b/debian/patches/engine-registers.patch
new file mode 100644
index 000..057fac9
--- /dev/null
+++ b/debian/patches/engine-registers.patch
@@ -0,0 +1,26 @@
+Description: Fix the build on i386 - matching function definitions
+Debian-Bug: https://bugs.debian.org/769238
+Author: Peter Pentchev
+Forwarded: not-yet
+Last-Update: 2014-11-12
+
+--- a/src/engine/zoom.c
b/src/engine/zoom.c
+@@ -933,6 +933,7 @@
+ }
+
+ #ifndef USE_i386ASM
++REGISTERS(0)
+ static /*INLINE */ void
+ moveoldpoints(void /*@unused@ */ *data1,
+ struct taskinfo /*@unused@ */ *task,
+--- a/src/engine/zoomd.c
b/src/engine/zoomd.c
+@@ -280,6 +280,7 @@
+ #endif
+ #undef bpp1
+
++REGISTERS(0)
+ static INLINE void fillline(int line)
+ {
+ register unsigned char *RESTRICT vbuff = cimage.currlines[line];
diff --git a/debian/patches/series b/debian/patches/series
index 2a31258..10415a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ free-static-string.patch
make.patch
window-size.patch
spelling.patch
+engine-registers.patch
--
2.1.1
From 6a066a589c429e62467c01122b1451e99c095556 Mon Sep 17 00:00:00 2001
From: Peter Pentchev
Date: Wed, 12 Nov 2014 13:48:31 +0200
Subject: [PATCH 2/2] Add a changelog entry for the fix for #769238.
---
debian/changelog | 9 +
debian/control | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index bb2253f..3637c70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xaos (3.5+ds1-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Add myself to Uploaders.
+ * Add the engine-registers patch to fix the build on i386 - match two
+functions' definitions with their prototypes. (Closes: #769238)
+
+ -- Peter Pentchev Wed, 12 Nov 2014 13:46:54 +0200
+
xaos (3.5+ds1-1) unstable; urgency=low
* New upstream release. (Closes: #577739)
diff --git a/debian/control b/debian/control
index 26e5d8c..649373a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
Priority: optional
Build-Depends: debhelper (>= 7.0.50~), libaa1-dev, libx11-dev, libpng3-dev,
zlib1g-dev, libxext-dev, x11proto-core-dev, autoconf (>= 2.63), autotools-dev,
libtool, libgsl0-dev
Maintainer: Debian Games Team
-Uploaders: Ansgar Burchardt
+Uploaders: Ansgar Burchardt , Peter Pentchev
Standards-Version: 3.8.4
Homepage: http://wmi.math.u-szeged.hu/xaos/
Vcs-Git: git://git.debian.org/git/pkg-games/xaos.git
--
2.1.1
signature.asc
Description: Digital signature
