From b5fa433e0d7420175463b574d2088894c5d93cbd5dc1362cf2338e213ad427cc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 5 Jan 2014 21:48:57 +0000 Subject: [PATCH] Fix build with Mesa 10.0 OBS-URL: https://build.opensuse.org/package/show/games/supertuxkart?expand=0&rev=51 --- supertuxkart.changes | 6 ++++++ supertuxkart.spec | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/supertuxkart.changes b/supertuxkart.changes index 32216bf..430bce7 100644 --- a/supertuxkart.changes +++ b/supertuxkart.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 5 21:48:02 UTC 2014 - dimstar@opensuse.org + +- Use Mesa provided glext.h and glxext.h When building against + Mesa 10.0. The needed fixes (and more) are part of Mesa by now. + ------------------------------------------------------------------- Tue Nov 26 18:14:30 UTC 2013 - dimstar@opensuse.org diff --git a/supertuxkart.spec b/supertuxkart.spec index 0ab6dc9..3e11bda 100644 --- a/supertuxkart.spec +++ b/supertuxkart.spec @@ -1,7 +1,7 @@ # # spec file for package supertuxkart # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -68,6 +68,10 @@ Data files for SuperTuxKart a Free 3d kart racing game. %prep %setup -q -n SuperTuxKart-%{version} +# If we're building against Mesa 10.0 (dri), then we want to use system glext.h and glxext.h +if pkg-config --atleast-version 10.0 dri; then + cp /usr/include/GL/{glext,glxext}.h lib/irrlicht/source/Irrlicht/ +fi %build # We need an internal version of Irrlicht...