Hello community,
here is the log from the commit of package supertuxkart for openSUSE:Factory
checked in at 2015-03-25 10:01:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-09-28 19:54:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.supertuxkart.new/supertuxkart.changes
2015-03-25 10:01:16.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Mar 23 18:36:31 UTC 2015 - dims...@opensuse.org
+
+- Add supertuxkart-cmake-3.2.patch: Fix build against cmake 3.2.
+
+-------------------------------------------------------------------
New:
----
supertuxkart-cmake-3.2.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ supertuxkart.spec ++++++
--- /var/tmp/diff_new_pack.2zw3JA/_old 2015-03-25 10:01:23.000000000 +0100
+++ /var/tmp/diff_new_pack.2zw3JA/_new 2015-03-25 10:01:23.000000000 +0100
@@ -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 @@
Patch0: 0001-fix_opengl_driver.patch
# PATCH-FIX-OPENSUSE 0002-fix_implicit_definitions.patch sfal...@opensuse.org
-- Patch fixes implicit definitions warning from rpmlint
Patch1: 0002-fix_implicit_definitions.patch
+# PATCH-FIX-UPSTREAM supertuxkart-cmake-3.2.patch dims...@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 @@
%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/
++++++ supertuxkart-cmake-3.2.patch ++++++
>From 0f56a4f6d344d6db8357e614cca0bd04fe93cf2b Mon Sep 17 00:00:00 2001
From: Deve <dev...@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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
