Hello community,
here is the log from the commit of package vegastrike for openSUSE:Factory
checked in at 2016-10-13 11:27:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vegastrike (Old)
and /work/SRC/openSUSE:Factory/.vegastrike.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vegastrike"
Changes:
--------
--- /work/SRC/openSUSE:Factory/vegastrike/vegastrike.changes 2016-08-12
15:42:03.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.vegastrike.new/vegastrike.changes
2016-10-13 11:27:50.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Aug 30 12:07:07 UTC 2016 - norm...@linux.vnet.ibm.com
+
+- new vegastrike_ppc64.patch
+
+-------------------------------------------------------------------
New:
----
vegastrike_ppc64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vegastrike.spec ++++++
--- /var/tmp/diff_new_pack.2V5Qeh/_old 2016-10-13 11:27:52.000000000 +0200
+++ /var/tmp/diff_new_pack.2V5Qeh/_new 2016-10-13 11:27:52.000000000 +0200
@@ -46,6 +46,7 @@
Patch8: vegastrike-src-0.5.1.r1-gcc6_compat.patch
# PATCH-FIX-OPENSUSE vegastrike-src-0.5.1.r1-gcc6_math_h.patch -- GCC 6
compatibility fixes, not upstreamable, autotools build system deprecated by
upstream
Patch9: vegastrike-src-0.5.1.r1-gcc6_math_h.patch
+Patch10: vegastrike_ppc64.patch
BuildRequires: SDL_mixer-devel
BuildRequires: autoconf
BuildRequires: automake
@@ -110,6 +111,7 @@
%patch7 -p1
%patch8 -p0
%patch9 -p0
+%patch10 -p1
iconv -f ISO-8859-1 -t UTF-8 README > README.tmp
touch -r README README.tmp
mv README.tmp README
++++++ vegastrike_ppc64.patch ++++++
From: Michel Normand <norm...@linux.vnet.ibm.com>
Subject: vegastrike ppc64
Date: Tue, 30 Aug 2016 14:04:17 +0200
patch to avoid PowerPC build error.
* The tcoord changed from char to signed char not yet upstream.
* The move of not used variables are already upstream.
Signed-off-by: Michel Normand <norm...@linux.vnet.ibm.com>
---
src/gfx/background.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Index: vegastrike-src-0.5.1.r1/src/gfx/background.cpp
===================================================================
--- vegastrike-src-0.5.1.r1.orig/src/gfx/background.cpp
+++ vegastrike-src-0.5.1.r1/src/gfx/background.cpp
@@ -209,7 +209,7 @@ void Background::Draw()
{
Texture *tex;
float vertices[4][3]; //will be *= size
- char tcoord[4][4]; //S-T-S-T: 0 >= min, 1 =>
max
+ signed char tcoord[4][4]; //S-T-S-T: 0 >= min, 1
=> max
}
skybox_rendering_sequence[6] = {
#ifdef NV_CUBE_MAP
@@ -337,13 +337,10 @@ void Background::Draw()
skybox_rendering_sequence[5].tex = down;
for (size_t skr = 0; skr < sizeof
(skybox_rendering_sequence)/sizeof (skybox_rendering_sequence[0]); skr++) {
Texture *tex = skybox_rendering_sequence[skr].tex;
- int lyr;
#ifdef NV_CUBE_MAP
if (tex == NULL)
tex = _Universe->getLightMap();
- const int numlayers = 1;
- const bool multitex = true;
const int numpasses = 1;
static const float edge_fixup =
XMLSupport::parse_float( vs_config->getVariable(
"graphics", "background_edge_fixup", "0" ) );
@@ -357,6 +354,7 @@ void Background::Draw()
_Universe->activateLightMap( 0 );
GFXToggleTexture( true, 0, CUBEMAP );
#else
+ int lyr;
int numlayers = tex->numLayers();
bool multitex = (numlayers > 1);
int numpasses = tex->numPasses();
