Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xonotic for openSUSE:Factory checked
in at 2021-07-12 21:40:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xonotic (Old)
and /work/SRC/openSUSE:Factory/.xonotic.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xonotic"
Mon Jul 12 21:40:29 2021 rev:7 rq:905829 version:0.8.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/xonotic/xonotic.changes 2021-03-15
10:55:14.593249340 +0100
+++ /work/SRC/openSUSE:Factory/.xonotic.new.2625/xonotic.changes
2021-07-12 21:41:04.727710586 +0200
@@ -1,0 +2,5 @@
+Sun Jul 11 16:45:49 UTC 2021 - Aaron Puchert <aaronpuch...@alice-dsl.net>
+
+- Add gcc11-typedef-alignment.patch to fix build with GCC 11.
+
+-------------------------------------------------------------------
New:
----
gcc11-typedef-alignment.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xonotic.spec ++++++
--- /var/tmp/diff_new_pack.D0HlXr/_old 2021-07-12 21:41:08.859678017 +0200
+++ /var/tmp/diff_new_pack.D0HlXr/_new 2021-07-12 21:41:08.863677985 +0200
@@ -30,6 +30,8 @@
Source3: xonotic.init
Source4: %{name}.changes
Source100: xonotic.appdata.xml
+# PATCH-FIX-UPSTREAM gcc11-typedef-alignment.patch -- Fix build with GCC 11 on
x86_64: https://gitlab.com/xonotic/darkplaces/-/issues/361
+Patch1: gcc11-typedef-alignment.patch
BuildRequires: SDL2-devel
BuildRequires: alsa-devel
BuildRequires: d0_blind_id-devel
@@ -79,6 +81,9 @@
%prep
%setup -q -n Xonotic
+pushd source/darkplaces
+%patch1 -p1
+popd
rm -rf misc/buildfiles/ # use system libs
sed -i \
-e "/^EXE_/s:darkplaces:%{name}-%{version}:" \
++++++ gcc11-typedef-alignment.patch ++++++
Fix build with GCC 11 on x86_64: the alignment attribute is used on a typedef
alias instead of the actual struct type, meaning it doesn't affect alignment
of the type, only of the type used through that alias. However, for arrays
using the typedef that means that while the first element is aligned, further
elements are not aligned. GCC 11 produces an error because this is probably
not intended. The fix is to apply the attribute on the struct itself.
This change should be upstreamable, but maybe upstream wants to do this for
all structs. Discussion: https://gitlab.com/xonotic/darkplaces/-/issues/361.
diff --git a/dpsoftrast.c b/dpsoftrast.c
index d9c72720..3536b1d3 100644
--- a/dpsoftrast.c
+++ b/dpsoftrast.c
@@ -198,7 +198,7 @@ DPSOFTRAST_State_Triangle);
#define DPSOFTRAST_DRAW_MAXSUBSPAN 16
-typedef ALIGN(struct DPSOFTRAST_State_Span_s
+typedef ALIGN(struct) DPSOFTRAST_State_Span_s
{
int triangle; // triangle this span was generated by
int x; // framebuffer x coord
@@ -209,7 +209,7 @@ typedef ALIGN(struct DPSOFTRAST_State_Span_s
int depthbase; // depthbuffer value at x (add depthslope*startx to get
first pixel's depthbuffer value)
int depthslope; // depthbuffer value pixel delta
}
-DPSOFTRAST_State_Span);
+DPSOFTRAST_State_Span;
#define DPSOFTRAST_DRAW_MAXSPANS 1024
#define DPSOFTRAST_DRAW_MAXTRIANGLES 128
