Hello community, here is the log from the commit of package supertuxkart for openSUSE:Factory checked in at 2014-09-28 19:54:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/supertuxkart (Old) and /work/SRC/openSUSE:Factory/.supertuxkart.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "supertuxkart" Changes: -------- --- /work/SRC/openSUSE:Factory/supertuxkart/supertuxkart.changes 2014-03-09 20:27:10.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.supertuxkart.new/supertuxkart.changes 2014-09-28 19:54:48.000000000 +0200 @@ -1,0 +2,10 @@ +Sat Sep 27 00:58:07 UTC 2014 - [email protected] + +- Added: + * 0001-fix_opengl_driver.patch + + Please see: https://github.com/supertuxkart/stk-code/commit/244d00280c1b082ca164f92337773e9e4e1a3898 Allows for building against Mesa >10.0 + * 0002-fix_implicit_definitions.patch + + Fixes implicit definition warning from rpmlint +- Added CFLAGS and CXXFLAGS to clear warnings about not using RPM_OPT_FLAGS, and gcc compatibility, using -fno-strict-aliasing going forward + +------------------------------------------------------------------- New: ---- 0001-fix_opengl_driver.patch 0002-fix_implicit_definitions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ supertuxkart.spec ++++++ --- /var/tmp/diff_new_pack.1KubB1/_old 2014-09-28 19:54:52.000000000 +0200 +++ /var/tmp/diff_new_pack.1KubB1/_new 2014-09-28 19:54:52.000000000 +0200 @@ -28,6 +28,10 @@ Source1: http://stkaddons.net/dl/14e6ba25b17f0d.zip # appdata file, to show in gnome-software Source2: supertuxkart.appdata.xml +# PATCH-FIX-UPSTREAM 0001-fix_opengl_driver.patch [email protected] -- Patch to fix building against Mesa >10.0 +Patch0: 0001-fix_opengl_driver.patch +# PATCH-FIX-OPENSUSE 0002-fix_implicit_definitions.patch [email protected] -- Patch fixes implicit definitions warning from rpmlint +Patch1: 0002-fix_implicit_definitions.patch BuildRequires: bluez-devel BuildRequires: cmake BuildRequires: curl-devel @@ -70,12 +74,16 @@ %prep %setup -q -n SuperTuxKart-%{version} +%patch0 -p1 +%patch1 -p1 # If we're building against Mesa 10.0 (gl), then we want to use system glext.h and glxext.h if pkg-config --atleast-version 10.0 gl; then cp /usr/include/GL/{glext,glxext}.h lib/irrlicht/source/Irrlicht/ fi %build +export CFLAGS="%{optflags} -fno-strict-aliasing" +export CXXFLAGS="$CFLAGS" # We need an internal version of Irrlicht... pushd lib/irrlicht/source/Irrlicht NDEBUG=1 make %{?_smp_mflags} ++++++ 0001-fix_opengl_driver.patch ++++++ Index: SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h =================================================================== --- SuperTuxKart-0.8.1.orig/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h +++ SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h @@ -21,6 +21,7 @@ #endif #include <GL/gl.h> #if defined(_IRR_OPENGL_USE_EXTPOINTER_) + typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); #include "glext.h" #endif #include "wglext.h" @@ -36,6 +37,7 @@ #endif #include <OpenGL/gl.h> #if defined(_IRR_OPENGL_USE_EXTPOINTER_) + typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); #include "glext.h" #endif #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_) @@ -49,6 +51,7 @@ #define NO_SDL_GLEXT #include <SDL/SDL_video.h> #include <SDL/SDL_opengl.h> + typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); #include "glext.h" #else #if defined(_IRR_OPENGL_USE_EXTPOINTER_) @@ -61,6 +64,7 @@ #include <GL/gl.h> #include <GL/glx.h> #if defined(_IRR_OPENGL_USE_EXTPOINTER_) + typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); #include "glext.h" #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h #include "glxext.h" ++++++ 0002-fix_implicit_definitions.patch ++++++ Index: SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzlib.c =================================================================== --- SuperTuxKart-0.8.1.orig/lib/irrlicht/source/Irrlicht/zlib/gzlib.c +++ SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzlib.c @@ -4,6 +4,10 @@ */ #include "gzguts.h" +#include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <sys/socket.h> #if defined(_WIN32) && !defined(__BORLANDC__) # define LSEEK _lseeki64 Index: SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzread.c =================================================================== --- SuperTuxKart-0.8.1.orig/lib/irrlicht/source/Irrlicht/zlib/gzread.c +++ SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzread.c @@ -4,6 +4,10 @@ */ #include "gzguts.h" +#include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <sys/socket.h> /* Local functions */ local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); Index: SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzwrite.c =================================================================== --- SuperTuxKart-0.8.1.orig/lib/irrlicht/source/Irrlicht/zlib/gzwrite.c +++ SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzwrite.c @@ -5,6 +5,11 @@ #include "gzguts.h" +#include <string.h> +#include <stdio.h> +#include <unistd.h> +#include <sys/socket.h> + /* Local functions */ local int gz_init OF((gz_statep)); local int gz_comp OF((gz_statep, int)); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
