pool/supertuxkart
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 664031 from games

Browse Source 
- Add supertuxkart-mesa-18.3.patch: Fix build against Mesa 18.3
  (boo#1120986).

OBS-URL: https://build.opensuse.org/request/show/664031
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/supertuxkart?expand=0&rev=17
This commit is contained in:
Dominique Leuenberger 2019-01-10 14:22:46 +00:00 committed by Git OBS Bridge
commit 921b7bc39c
3 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
supertuxkart-mesa-18.3.patch Normal file
View File

@ -0,0 +1,32 @@
From 7cc4c92b31b0367623f39bed32dacc8cfea651f3 Mon Sep 17 00:00:00 2001
From: Deve <deveee@gmail.com>
Date: Wed, 14 Nov 2018 20:59:00 +0100
Subject: [PATCH] Fixed compilation with current mesa.
It fixes #3557.
---
lib/glew/include/GL/glew.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/glew/include/GL/glew.h b/lib/glew/include/GL/glew.h
index b5b6987fc7..a9f9e4b9ba 100644
--- a/lib/glew/include/GL/glew.h
+++ b/lib/glew/include/GL/glew.h
@@ -93,7 +93,7 @@
#if defined(__REGAL_H__)
#error Regal.h included before glew.h
#endif
-#if defined(__glext_h_) || defined(__GLEXT_H_)
+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
#error glext.h included before glew.h
#endif
#if defined(__gl_ATI_h_)
@@ -109,6 +109,7 @@
#define __X_GL_H
#define __glext_h_
#define __GLEXT_H_
+#define __gl_glext_h_
#define __gl_ATI_h_
#if defined(_WIN32)

6
supertuxkart.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jan 9 08:42:00 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Add supertuxkart-mesa-18.3.patch: Fix build against Mesa 18.3
(boo#1120986).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 7 11:28:46 UTC 2018 - dimstar@opensuse.org Mon May 7 11:28:46 UTC 2018 - dimstar@opensuse.org

7
supertuxkart.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package supertuxkart # spec file for package supertuxkart
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -27,6 +27,8 @@ Source: http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/
# Geeko kart add-on (CC-BY 3.0) # Geeko kart add-on (CC-BY 3.0)
Source1: http://stkaddons.net/dl/14e6ba25b17f0d.zip Source1: http://stkaddons.net/dl/14e6ba25b17f0d.zip
Source9: supertuxkart.6 Source9: supertuxkart.6
# PATCH-FIX-UPSTREAM supertuxkart-mesa-18.3.patch boo#1120986 dimstar@opensuse.org - Fix build against Mesa 18.3
Patch0: supertuxkart-mesa-18.3.patch
BuildRequires: cmake >= 3 BuildRequires: cmake >= 3
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -75,6 +77,7 @@ Data files for SuperTuxKart a Free 3d kart racing game.
%prep %prep
%setup -q %setup -q
%patch0 -p1
find -name '*~' -delete -print find -name '*~' -delete -print
find -name '.git*' -delete -print find -name '.git*' -delete -print