Hello community, here is the log from the commit of package vegastrike for openSUSE:Factory checked in at 2016-08-12 15:42:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2015-08-07 00:24:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.vegastrike.new/vegastrike.changes 2016-08-12 15:42:03.000000000 +0200 @@ -1,0 +2,11 @@ +Fri Jun 17 19:39:14 UTC 2016 - [email protected] + +- add patch vegastrike-src-0.5.1.r1-gcc6_compat.patch + Fixes build with GCC 6 due to redefinition of copysign, + uncastable return values in pk3 and name clashes +- add patch vegastrike-src-0.5.1.r1-gcc6_math_h.patch + Fixes detection of math.h system include file +- add autoconf and automake build dependencies +- add autoreconf at build time + +------------------------------------------------------------------- New: ---- vegastrike-src-0.5.1.r1-gcc6_compat.patch vegastrike-src-0.5.1.r1-gcc6_math_h.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vegastrike.spec ++++++ --- /var/tmp/diff_new_pack.cB7pH3/_old 2016-08-12 15:42:04.000000000 +0200 +++ /var/tmp/diff_new_pack.cB7pH3/_new 2016-08-12 15:42:04.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package vegastrike # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,7 +42,13 @@ # PATCH-FIX-UPSTREAM vegastrike-src-0.5.1.r1-boost150_compat.patch -- fix build with latest boost (seemingly unrelated change but boost makes it blow without) Patch6: vegastrike-src-0.5.1.r1-boost150_compat.patch Patch7: vegastrike-aarch64.patch +# PATCH-FIX-UPSTREAM vegastrike-src-0.5.1.r1-gcc6_compat.patch -- GCC 6 compatibility fixes, already upstreamed, not yet in tarball +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 BuildRequires: SDL_mixer-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: boost-devel BuildRequires: freealut-devel BuildRequires: freeglut-devel @@ -102,6 +108,8 @@ %patch5 -p0 %patch6 -p1 %patch7 -p1 +%patch8 -p0 +%patch9 -p0 iconv -f ISO-8859-1 -t UTF-8 README > README.tmp touch -r README README.tmp mv README.tmp README @@ -110,6 +118,7 @@ rm objconv/mesher/expat.h %build +autoreconf -fi %configure --with-data-dir=%{_datadir}/%{name} --with-boost=system \ --enable-release --enable-flags="%{optflags} -DBOOST_PYTHON_NO_PY_SIGNATURES" \ --disable-ffmpeg --disable-ogre --enable-stencil-buffer ++++++ vegastrike-src-0.5.1.r1-gcc6_compat.patch ++++++ Index: src/cmd/unit_generic.cpp =================================================================== --- src/cmd/unit_generic.cpp (revision 13699) +++ src/cmd/unit_generic.cpp (working copy) @@ -38,6 +38,7 @@ #include "universe_generic.h" #include "csv.h" #include "vs_random.h" +#include "vs_math.h" #include "galaxy_xml.h" #include "gfx/camera.h" @@ -655,6 +656,7 @@ jump.drive = -1; } +#if !defined(HAVE_MATH_H) float copysign( float x, float y ) { if (y > 0) @@ -662,6 +664,7 @@ else return -x; } +#endif //!defined(HAVE_MATH_H) float rand01() { Index: src/physics.h =================================================================== --- src/physics.h (revision 13699) +++ src/physics.h (working copy) @@ -22,12 +22,13 @@ #ifndef PHYSICS_H #define PHYSICS_H +#include "vs_math.h" + #include "gfx/vec.h" static const float oocc = (float) 0.0000000000000000111265005605; //1/c^2 static const float c = (float) 299792458.0; static const float co10 = (float) 29979245.8; -float copysign( float x, float y ); struct Force { Index: src/vs_math.h =================================================================== --- src/vs_math.h (revision 13699) +++ src/vs_math.h (working copy) @@ -43,6 +43,8 @@ #if defined (HAVE_MATH_H) #include <math.h> +#else + float copysign( float x, float y ); #endif #if defined (HAVE_FINITE) || defined (BSD) #define FINITE( x ) ( finite( x ) ) Index: src/pk3.cpp =================================================================== --- src/pk3.cpp 2016-06-17 19:11:35.291170055 -0300 +++ src/pk3.cpp 2016-06-17 19:11:43.374169816 -0300 @@ -356,7 +356,7 @@ } //if the file isn't in the archive if (index == -1) - return false; + return NULL; int flength = GetFileLen( index ); buffer = new char[flength]; Index: src/ship_commands.cpp =================================================================== --- src/ship_commands.cpp (revision 13699) +++ src/ship_commands.cpp (working copy) @@ -5,11 +5,11 @@ #include "universe_util.h" #include "gldrv/winsys.h" -static inline float fmin( float a, float b ) +static inline float vs_fmin( float a, float b ) { return (a < b) ? a : b; } -static inline float fmax( float a, float b ) +static inline float vs_fmax( float a, float b ) { return (a > b) ? a : b; } @@ -132,7 +132,7 @@ else kps /= display_in_meters ? 1.0f : 3.6f; - player->GetComputerData().set_speed = fmin( player->GetComputerData().max_speed(), kps ); + player->GetComputerData().set_speed = vs_fmin( player->GetComputerData().max_speed(), kps ); } } Index: src/gfx/cockpit_xml.cpp =================================================================== --- src/gfx/cockpit_xml.cpp 2010-12-15 05:53:40.000000000 -0300 +++ src/gfx/cockpit_xml.cpp 2016-06-17 20:26:22.744037465 -0300 @@ -315,7 +315,7 @@ for (counter = 0; counter < 4; ++counter) if (!replaced[counter]) { delete Pit[counter]; - Pit[counter] = false; + Pit[counter] = NULL; } break; case UnitImages< void >::SHIELD4: Index: src/cmd/unit_physics.h =================================================================== --- src/cmd/unit_physics.h 2012-03-19 05:20:14.000000000 -0300 +++ src/cmd/unit_physics.h 2016-06-17 20:47:41.934999670 -0300 @@ -30,6 +30,7 @@ #include "audiolib.h" #include "configxml.h" #include "vs_globals.h" +#include "vs_math.h" #ifdef FIX_TERRAIN #include "gfx/planetary_transform.h" @@ -41,8 +42,6 @@ #include "networking/lowlevel/vsnet_clientstate.h" #include "networking/netclient.h" -extern float copysign( float x, float y ); - extern unsigned int apply_float_to_unsigned_int( float tmp ); //short fix template < class UnitType > Index: objconv/basemaker/base_maker.cpp =================================================================== --- objconv/basemaker/base_maker.cpp 2010-12-23 17:16:48.000000000 -0300 +++ objconv/basemaker/base_maker.cpp 2016-06-17 21:21:23.802939930 -0300 @@ -2060,7 +2060,7 @@ int main( int argc, char **argv ) { printf( "Loading...\n" ); - Base::CurrentBase = false; + Base::CurrentBase = NULL; glutInit( &argc, argv ); glutInitWindowSize( 800, 600 ); g_game.x_resolution = 800; ++++++ vegastrike-src-0.5.1.r1-gcc6_math_h.patch ++++++ Index: configure.ac =================================================================== --- configure.ac 2010-08-01 01:17:41.000000000 -0300 +++ configure.ac 2016-06-17 18:35:11.499234579 -0300 @@ -122,7 +122,7 @@ AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([OS.h arpa/inet.h fcntl.h fenv.h float.h inttypes.h limits.h malloc.h memory.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h values.h wchar.h wctype.h]) +AC_CHECK_HEADERS([OS.h arpa/inet.h fcntl.h fenv.h float.h inttypes.h limits.h malloc.h memory.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h values.h wchar.h wctype.h math.h]) if test "x$slabcheck" = "xyes"; then Index: config.h.in =================================================================== --- config.h.in 2012-03-31 22:53:54.000000000 -0300 +++ config.h.in 2016-06-17 18:37:29.000000000 -0300 @@ -139,6 +139,9 @@ /* Define to 1 if you have the <malloc.h> header file. */ #undef HAVE_MALLOC_H +/* Define to 1 if you have the <math.h> header file. */ +#undef HAVE_MATH_H + /* Define to 1 if you have the `mblen' function. */ #undef HAVE_MBLEN
