Accepting request 292527 from games

1

OBS-URL: https://build.opensuse.org/request/show/292527
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/supertuxkart?expand=0&rev=8

supertuxkart-cmake-3.2.patch

@@ -0,0 +1,33 @@
+From 0f56a4f6d344d6db8357e614cca0bd04fe93cf2b Mon Sep 17 00:00:00 2001
+From: Deve <deveee@gmail.com>
+Date: Sun, 22 Feb 2015 10:01:46 +0100
+Subject: [PATCH] Fixed compilation with cmake 3.2
+
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: SuperTuxKart-0.8.1/CMakeLists.txt
+===================================================================
+--- SuperTuxKart-0.8.1.orig/CMakeLists.txt
++++ SuperTuxKart-0.8.1/CMakeLists.txt
+@@ -130,6 +130,9 @@ find_package(OpenGL REQUIRED)
+ include_directories(${OPENGL_INCLUDE_DIR})
+ 
+ if(UNIX AND NOT APPLE)
++    find_package(X11 REQUIRED)
++    include_directories(${X11_INCLUDE_DIR})
++
+     find_library(IRRLICHT_XF86VM_LIBRARY Xxf86vm)
+     mark_as_advanced(IRRLICHT_XF86VM_LIBRARY)
+ else()
+@@ -231,7 +234,8 @@ target_link_libraries(supertuxkart
+     ${OGGVORBIS_LIBRARIES}
+     ${IRRLICHT_XF86VM_LIBRARY}
+     ${OPENAL_LIBRARY}
+-    ${OPENGL_LIBRARIES})
++    ${OPENGL_LIBRARIES}
++    ${X11_LIBRARIES})
+ 
+ if(APPLE)
+     # In theory it would be cleaner to let CMake detect the right dependencies. In practice, this means that if a OSX user has

supertuxkart.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar 23 18:36:31 UTC 2015 - dimstar@opensuse.org
+
+- Add supertuxkart-cmake-3.2.patch: Fix build against cmake 3.2.
+
 -------------------------------------------------------------------
 Sat Sep 27 00:58:07 UTC 2014 - sfalken@opensuse.org
 

supertuxkart.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package supertuxkart
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -32,6 +32,8 @@ Source2:        supertuxkart.appdata.xml
 Patch0:         0001-fix_opengl_driver.patch
 # PATCH-FIX-OPENSUSE 0002-fix_implicit_definitions.patch sfalken@opensuse.org -- Patch fixes implicit definitions warning from rpmlint
 Patch1:         0002-fix_implicit_definitions.patch
+# PATCH-FIX-UPSTREAM supertuxkart-cmake-3.2.patch dimstar@opensuse.org -- Fix build with cmake 3.2
+Patch2:         supertuxkart-cmake-3.2.patch
 BuildRequires:  bluez-devel
 BuildRequires:  cmake
 BuildRequires:  curl-devel
@@ -76,6 +78,7 @@ Data files for SuperTuxKart a Free 3d kart racing game.
 %setup -q -n SuperTuxKart-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -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/