[supertuxkart] enable wiimote support (asked in stk-owner@)
Igor Gnatenko
ignatenkobrain at fedoraproject.org
Sun May 11 19:28:03 UTC 2014
commit 66a8681bc78dbf97a7f105f1beb918f795366bca
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Sun May 11 23:28:13 2014 +0400
enable wiimote support (asked in stk-owner@)
Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
...ix-.desktop-file-and-install-destinations.patch | 42 ++-
...patch => 0002-fix-srcs-for-new-bullet-API.patch | 36 ++-
0003-unbundle-all-libs.patch | 348 ++++++++++++++++++++
SuperTuxKart-0.8-new-bullet.patch | 37 --
supertuxkart-0.8.1-bundled.patch | 198 -----------
supertuxkart.spec | 15 +-
6 files changed, 416 insertions(+), 260 deletions(-)
---
diff --git a/supertuxkart-0.8.1-desktop.patch b/0001-fix-.desktop-file-and-install-destinations.patch
similarity index 61%
rename from supertuxkart-0.8.1-desktop.patch
rename to 0001-fix-.desktop-file-and-install-destinations.patch
index fbeadbb..242fdfd 100644
--- a/supertuxkart-0.8.1-desktop.patch
+++ b/0001-fix-.desktop-file-and-install-destinations.patch
@@ -1,7 +1,22 @@
-diff -uNr SuperTuxKart-0.8.1/CMakeLists.txt SuperTuxKart-0.8.1.desktop/CMakeLists.txt
---- SuperTuxKart-0.8.1/CMakeLists.txt 2013-11-25 01:54:13.000000000 +0400
-+++ SuperTuxKart-0.8.1.desktop/CMakeLists.txt 2013-11-28 16:53:02.072142700 +0400
-@@ -292,9 +292,8 @@
+From 434083d5647ae052693eff559acbd08de09cbc37 Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
+Date: Sun, 11 May 2014 22:58:04 +0400
+Subject: [PATCH 1/3] fix .desktop file and install destinations
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
+---
+ CMakeLists.txt | 7 +++----
+ data/supertuxkart.desktop | 13 +++++++++++++
+ data/supertuxkart_desktop.template | 14 --------------
+ 3 files changed, 16 insertions(+), 18 deletions(-)
+ create mode 100644 data/supertuxkart.desktop
+ delete mode 100644 data/supertuxkart_desktop.template
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 09edd58..2d87a98 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -292,9 +292,8 @@ endif()
# ==== Install target ====
install(TARGETS supertuxkart RUNTIME DESTINATION ${STK_INSTALL_BINARY_DIR} BUNDLE DESTINATION .)
install(DIRECTORY ${STK_DATA_DIR} DESTINATION ${STK_INSTALL_DATA_DIR} PATTERN ".svn" EXCLUDE)
@@ -14,9 +29,11 @@ diff -uNr SuperTuxKart-0.8.1/CMakeLists.txt SuperTuxKart-0.8.1.desktop/CMakeList
set(PREFIX ${CMAKE_INSTALL_PREFIX})
-configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
-add_dependencies(supertuxkart supertuxkart.desktop)
-diff -uNr SuperTuxKart-0.8.1/data/supertuxkart.desktop SuperTuxKart-0.8.1.desktop/data/supertuxkart.desktop
---- SuperTuxKart-0.8.1/data/supertuxkart.desktop 1970-01-01 03:00:00.000000000 +0300
-+++ SuperTuxKart-0.8.1.desktop/data/supertuxkart.desktop 2013-11-28 16:53:56.000766633 +0400
+diff --git a/data/supertuxkart.desktop b/data/supertuxkart.desktop
+new file mode 100644
+index 0000000..5fd69ee
+--- /dev/null
++++ b/data/supertuxkart.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=SuperTuxKart
@@ -31,9 +48,11 @@ diff -uNr SuperTuxKart-0.8.1/data/supertuxkart.desktop SuperTuxKart-0.8.1.deskto
+StartupNotify=false
+Type=Application
+Categories=Game;ActionGame;ArcadeGame;
-diff -uNr SuperTuxKart-0.8.1/data/supertuxkart_desktop.template SuperTuxKart-0.8.1.desktop/data/supertuxkart_desktop.template
---- SuperTuxKart-0.8.1/data/supertuxkart_desktop.template 2013-08-30 22:46:11.000000000 +0400
-+++ SuperTuxKart-0.8.1.desktop/data/supertuxkart_desktop.template 1970-01-01 03:00:00.000000000 +0300
+diff --git a/data/supertuxkart_desktop.template b/data/supertuxkart_desktop.template
+deleted file mode 100644
+index aeb48ab..0000000
+--- a/data/supertuxkart_desktop.template
++++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=SuperTuxKart
@@ -49,3 +68,6 @@ diff -uNr SuperTuxKart-0.8.1/data/supertuxkart_desktop.template SuperTuxKart-0.8
-Type=Application
-TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart
-Categories=Game;ArcadeGame;
+--
+1.9.0
+
diff --git a/supertuxkart-0.8.1-bullet.patch b/0002-fix-srcs-for-new-bullet-API.patch
similarity index 59%
rename from supertuxkart-0.8.1-bullet.patch
rename to 0002-fix-srcs-for-new-bullet-API.patch
index b486e91..afbce20 100644
--- a/supertuxkart-0.8.1-bullet.patch
+++ b/0002-fix-srcs-for-new-bullet-API.patch
@@ -1,7 +1,19 @@
-diff -up ./src/physics/btKartRaycast.cpp.bullet ./src/physics/btKartRaycast.cpp
---- ./src/physics/btKartRaycast.cpp.bullet 2013-11-15 07:52:39.000000000 -0500
-+++ ./src/physics/btKartRaycast.cpp 2014-02-09 13:20:22.480925667 -0500
-@@ -63,7 +63,7 @@ void* btKartRaycaster::castRay(const btV
+From 9cf53410cf6500cb087fc9686a86f1e9cadbec7a Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
+Date: Sun, 11 May 2014 22:59:28 +0400
+Subject: [PATCH 2/3] fix srcs for new bullet API
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
+---
+ src/physics/btKartRaycast.cpp | 4 ++--
+ src/physics/physics.cpp | 7 ++-----
+ 2 files changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/physics/btKartRaycast.cpp b/src/physics/btKartRaycast.cpp
+index 13b310f..7c00d42 100644
+--- a/src/physics/btKartRaycast.cpp
++++ b/src/physics/btKartRaycast.cpp
+@@ -63,7 +63,7 @@ void* btKartRaycaster::castRay(const btVector3& from, const btVector3& to,
if (rayCallback.hasHit())
{
@@ -10,7 +22,7 @@ diff -up ./src/physics/btKartRaycast.cpp.bullet ./src/physics/btKartRaycast.cpp
if (body && body->hasContactResponse())
{
result.m_hitPointInWorld = rayCallback.m_hitPointWorld;
-@@ -88,7 +88,7 @@ void* btKartRaycaster::castRay(const btV
+@@ -88,7 +88,7 @@ void* btKartRaycaster::castRay(const btVector3& from, const btVector3& to,
result.m_hitNormalInWorld.getZ());
#endif
}
@@ -19,10 +31,11 @@ diff -up ./src/physics/btKartRaycast.cpp.bullet ./src/physics/btKartRaycast.cpp
}
}
return 0;
-diff -up ./src/physics/physics.cpp.bullet ./src/physics/physics.cpp
---- ./src/physics/physics.cpp.bullet 2013-11-15 07:52:39.000000000 -0500
-+++ ./src/physics/physics.cpp 2014-02-09 13:21:03.961470413 -0500
-@@ -438,7 +438,6 @@ btScalar Physics::solveGroup(btCollision
+diff --git a/src/physics/physics.cpp b/src/physics/physics.cpp
+index fcff1f0..2d800cd 100644
+--- a/src/physics/physics.cpp
++++ b/src/physics/physics.cpp
+@@ -438,7 +438,6 @@ btScalar Physics::solveGroup(btCollisionObject** bodies, int numBodies,
constraints,
numConstraints, info,
debugDrawer,
@@ -30,7 +43,7 @@ diff -up ./src/physics/physics.cpp.bullet ./src/physics/physics.cpp
dispatcher);
int currentNumManifolds = m_dispatcher->getNumManifolds();
// We can't explode a rocket in a loop, since a rocket might collide with
-@@ -450,10 +449,8 @@ btScalar Physics::solveGroup(btCollision
+@@ -450,10 +449,8 @@ btScalar Physics::solveGroup(btCollisionObject** bodies, int numBodies,
btPersistentManifold* contact_manifold =
m_dynamics_world->getDispatcher()->getManifoldByIndexInternal(i);
@@ -43,3 +56,6 @@ diff -up ./src/physics/physics.cpp.bullet ./src/physics/physics.cpp
unsigned int num_contacts = contact_manifold->getNumContacts();
if(!num_contacts) continue; // no real collision
+--
+1.9.0
+
diff --git a/0003-unbundle-all-libs.patch b/0003-unbundle-all-libs.patch
new file mode 100644
index 0000000..9df349d
--- /dev/null
+++ b/0003-unbundle-all-libs.patch
@@ -0,0 +1,348 @@
+From f86ed73c08f40878754f705a796615387d02f02e Mon Sep 17 00:00:00 2001
+From: Igor Gnatenko <i.gnatenko.brain at gmail.com>
+Date: Sun, 11 May 2014 23:12:38 +0400
+Subject: [PATCH 3/3] unbundle all libs
+
+Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
+---
+ CMakeLists.txt | 32 ++++++++--------
+ cmake/FindENet.cmake | 48 +++++++++++++++++++++++
+ cmake/FindIrrlicht.cmake | 94 +++++++++++++++++++++++++++++++++++++++++++++
+ cmake/FindWiiUse.cmake | 99 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 256 insertions(+), 17 deletions(-)
+ create mode 100644 cmake/FindENet.cmake
+ create mode 100644 cmake/FindIrrlicht.cmake
+ create mode 100644 cmake/FindWiiUse.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d87a98..8fa33bd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,27 +36,27 @@ set(STK_INSTALL_BINARY_DIR "bin" CACHE
+ set(STK_INSTALL_DATA_DIR "share/supertuxkart" CACHE
+ STRING "Install data folder to this directory, absolute or relative to CMAKE_INSTALL_PREFIX")
+
++INCLUDE (FindPkgConfig)
++
+ # Build the Bullet physics library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
++pkg_search_module(BULLET REQUIRED bullet)
++include_directories(${BULLET_INCLUDE_DIRS})
+
+ # Build the ENet UDP network library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/enet")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/enet/include")
++find_package(ENet REQUIRED)
++include_directories(${ENet_INCLUDE_DIRS})
+
+ # Build the irrlicht library
+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
+-include_directories("${PROJECT_SOURCE_DIR}/lib/irrlicht/include")
++find_package(Irrlicht REQUIRED)
++include_directories(${IRRLICHT_INCLUDE_DIR})
+
+ # Build the Wiiuse library
+ # Note: wiiuse MUST be declared after irrlicht, since otherwise
+ # (at least on VS) irrlicht will find wiiuse io.h file because
+ # of the added include directory.
+ if(USE_WIIUSE)
+- if(WIIUSE_BUILD)
+- add_subdirectory("${PROJECT_SOURCE_DIR}/lib/wiiuse")
+- endif()
+- include_directories("${PROJECT_SOURCE_DIR}/lib/wiiuse")
++ find_package(WiiUse REQUIRED)
++ include_directories(${WIIUSE_INCLUDE_DIR})
+ endif()
+
+
+@@ -222,14 +222,12 @@ endif()
+
+ # Common library dependencies
+ target_link_libraries(supertuxkart
+- bulletdynamics
+- bulletcollision
+- bulletmath
+- enet
+- stkirrlicht
++ ${BULLET_LIBRARIES}
++ ${ENet_LIBRARIES}
++ ${IRRLICHT_LIBRARIES}
++ IrrXML
+ ${CURL_LIBRARIES}
+ ${OGGVORBIS_LIBRARIES}
+- ${IRRLICHT_XF86VM_LIBRARY}
+ ${OPENAL_LIBRARY}
+ ${OPENGL_LIBRARIES})
+
+@@ -261,7 +259,7 @@ if(USE_WIIUSE)
+ target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/wiiuse.lib)
+ endif()
+ else()
+- target_link_libraries(supertuxkart wiiuse bluetooth)
++ target_link_libraries(supertuxkart ${WIIUSE_LIBRARIES})
+ endif()
+ add_definitions(-DENABLE_WIIUSE)
+
+diff --git a/cmake/FindENet.cmake b/cmake/FindENet.cmake
+new file mode 100644
+index 0000000..91c2527
+--- /dev/null
++++ b/cmake/FindENet.cmake
+@@ -0,0 +1,48 @@
++# - Try to find enet
++# Once done this will define
++#
++# ENET_FOUND - system has enet
++# ENet_INCLUDE_DIRS - the enet include directory
++# ENet_LIBRARIES - the libraries needed to use enet
++#
++# $ENETDIR is an environment variable used for finding enet.
++#
++# Borrowed from The Mana World
++# http://themanaworld.org/
++#
++# Several changes and additions by Fabian 'x3n' Landau
++# Lots of simplifications by Adrian Friedli
++# > www.orxonox.net <
++
++FIND_PATH(ENet_INCLUDE_DIRS enet/enet.h
++ PATHS
++ $ENV{ENETDIR}
++ /usr/local
++ /usr
++ PATH_SUFFIXES include
++ )
++
++FIND_LIBRARY(ENet_LIBRARY
++ NAMES enet
++ PATHS
++ $ENV{ENETDIR}
++ /usr/local
++ /usr
++ PATH_SUFFIXES lib
++ )
++
++# handle the QUIETLY and REQUIRED arguments and set ENET_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(ENet DEFAULT_MSG ENet_LIBRARY ENet_INCLUDE_DIRS)
++
++IF (ENET_FOUND)
++ IF(WIN32)
++ SET(WINDOWS_ENET_DEPENDENCIES "ws2_32;winmm")
++ SET(ENet_LIBRARIES ${ENet_LIBRARY} ${WINDOWS_ENET_DEPENDENCIES})
++ ELSE(WIN32)
++ SET(ENet_LIBRARIES ${ENet_LIBRARY})
++ ENDIF(WIN32)
++ENDIF (ENET_FOUND)
++
++MARK_AS_ADVANCED(ENet_LIBRARY ENet_LIBRARIES ENet_INCLUDE_DIRS)
+diff --git a/cmake/FindIrrlicht.cmake b/cmake/FindIrrlicht.cmake
+new file mode 100644
+index 0000000..a1adc4b
+--- /dev/null
++++ b/cmake/FindIrrlicht.cmake
+@@ -0,0 +1,94 @@
++#FindIrrlicht.cmake
++
++set(IRRLICHT_SOURCE_DIR "" CACHE PATH "Path to irrlicht source directory (optional)")
++
++if( UNIX )
++ # Unix
++else( UNIX )
++ # Windows
++endif( UNIX )
++
++# Find include directory
++
++if(NOT IRRLICHT_SOURCE_DIR STREQUAL "")
++ set(IRRLICHT_SOURCE_DIR_INCLUDE
++ "${IRRLICHT_SOURCE_DIR}/include"
++ )
++
++ set(IRRLICHT_LIBRARY_NAMES libIrrlicht.a Irrlicht Irrlicht.lib)
++
++ if(WIN32)
++ if(MSVC)
++ set(IRRLICHT_SOURCE_DIR_LIBS "${IRRLICHT_SOURCE_DIR}/lib/Win32-visualstudio")
++ set(IRRLICHT_LIBRARY_NAMES Irrlicht.lib)
++ else()
++ set(IRRLICHT_SOURCE_DIR_LIBS "${IRRLICHT_SOURCE_DIR}/lib/Win32-gcc")
++ set(IRRLICHT_LIBRARY_NAMES libIrrlicht.a libIrrlicht.dll.a)
++ endif()
++ else()
++ set(IRRLICHT_SOURCE_DIR_LIBS "${IRRLICHT_SOURCE_DIR}/lib/Linux")
++ set(IRRLICHT_LIBRARY_NAMES libIrrlicht.a)
++ endif()
++
++ FIND_PATH(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
++ PATHS
++ ${IRRLICHT_SOURCE_DIR_INCLUDE}
++ NO_DEFAULT_PATH
++ )
++
++ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES ${IRRLICHT_LIBRARY_NAMES}
++ PATHS
++ ${IRRLICHT_SOURCE_DIR_LIBS}
++ NO_DEFAULT_PATH
++ )
++
++else()
++
++ FIND_PATH(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
++ PATHS
++ /usr/local/include/irrlicht
++ /usr/include/irrlicht
++ )
++
++ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so Irrlicht
++ PATHS
++ /usr/local/lib
++ /usr/lib
++ /usr/lib64
++ )
++endif()
++
++MESSAGE(STATUS "IRRLICHT_SOURCE_DIR = ${IRRLICHT_SOURCE_DIR}")
++MESSAGE(STATUS "IRRLICHT_INCLUDE_DIR = ${IRRLICHT_INCLUDE_DIR}")
++MESSAGE(STATUS "IRRLICHT_LIBRARY = ${IRRLICHT_LIBRARY}")
++
++# On windows, find the dll for installation
++if(WIN32)
++ if(MSVC)
++ FIND_FILE(IRRLICHT_DLL NAMES Irrlicht.dll
++ PATHS
++ "${IRRLICHT_SOURCE_DIR}/bin/Win32-VisualStudio"
++ DOC "Path of the Irrlicht dll (for installation)"
++ )
++ else()
++ FIND_FILE(IRRLICHT_DLL NAMES Irrlicht.dll
++ PATHS
++ "${IRRLICHT_SOURCE_DIR}/bin/Win32-gcc"
++ DOC "Path of the Irrlicht dll (for installation)"
++ )
++ endif()
++ MESSAGE(STATUS "IRRLICHT_DLL = ${IRRLICHT_DLL}")
++endif(WIN32)
++
++# handle the QUIETLY and REQUIRED arguments and set IRRLICHT_FOUND to TRUE if
++# all listed variables are TRUE
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(IRRLICHT DEFAULT_MSG IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR)
++
++IF(IRRLICHT_FOUND)
++ SET(IRRLICHT_LIBRARIES ${IRRLICHT_LIBRARY})
++ELSE(IRRLICHT_FOUND)
++ SET(IRRLICHT_LIBRARIES)
++ENDIF(IRRLICHT_FOUND)
++
++MARK_AS_ADVANCED(IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR IRRLICHT_DLL)
+diff --git a/cmake/FindWiiUse.cmake b/cmake/FindWiiUse.cmake
+new file mode 100644
+index 0000000..2657cbb
+--- /dev/null
++++ b/cmake/FindWiiUse.cmake
+@@ -0,0 +1,99 @@
++# - try to find WiiUse library
++#
++# Cache Variables: (probably not for direct use in your scripts)
++# WIIUSE_INCLUDE_DIR
++# WIIUSE_LIBRARY
++#
++# Non-cache variables you might use in your CMakeLists.txt:
++# WIIUSE_FOUND
++# WIIUSE_INCLUDE_DIRS
++# WIIUSE_LIBRARIES
++# WIIUSE_RUNTIME_LIBRARIES - aka the dll for installing
++# WIIUSE_RUNTIME_LIBRARY_DIRS
++#
++# Requires these CMake modules:
++# FindPackageHandleStandardArgs (known included with CMake >=2.6.2)
++#
++# Original Author:
++# 2009-2010 Ryan Pavlik <rpavlik at iastate.edu> <abiryan at ryand.net>
++# http://academic.cleardefinition.com
++# Iowa State University HCI Graduate Program/VRAC
++#
++# Copyright Iowa State University 2009-2010.
++# Distributed under the Boost Software License, Version 1.0.
++# (See accompanying file LICENSE_1_0.txt or copy at
++# http://www.boost.org/LICENSE_1_0.txt)
++
++set(WIIUSE_ROOT_DIR
++ "${WIIUSE_ROOT_DIR}"
++ CACHE
++ PATH
++ "Directory to search for WiiUse")
++
++if(CMAKE_SIZEOF_VOID_P MATCHES "8")
++ set(_LIBSUFFIXES /lib64 /lib)
++else()
++ set(_LIBSUFFIXES /lib)
++endif()
++
++find_library(WIIUSE_LIBRARY
++ NAMES
++ wiiuse
++ PATHS
++ "${WIIUSE_ROOT_DIR}"
++ PATH_SUFFIXES
++ "${_LIBSUFFIXES}")
++
++get_filename_component(_libdir "${WIIUSE_LIBRARY}" PATH)
++
++find_path(WIIUSE_INCLUDE_DIR
++ NAMES
++ wiiuse.h
++ HINTS
++ "${_libdir}"
++ "${_libdir}/.."
++ PATHS
++ "${WIIUSE_ROOT_DIR}"
++ PATH_SUFFIXES
++ include/)
++
++set(_deps_check)
++if(WIN32)
++ find_file(WIIUSE_RUNTIME_LIBRARY
++ NAMES
++ wiiuse.dll
++ HINTS
++ "${_libdir}"
++ "${_libdir}/.."
++ PATH_SUFFIXES
++ bin)
++
++ set(WIIUSE_RUNTIME_LIBRARIES "${WIIUSE_RUNTIME_LIBRARY}")
++ get_filename_component(WIIUSE_RUNTIME_LIBRARY_DIRS
++ "${WIIUSE_RUNTIME_LIBRARY}"
++ PATH)
++ list(APPEND _deps_check WIIUSE_RUNTIME_LIBRARY)
++else()
++ set(WIIUSE_RUNTIME_LIBRARY "${WIIUSE_LIBRARY}")
++ set(WIIUSE_RUNTIME_LIBRARIES "${WIIUSE_RUNTIME_LIBRARY}")
++ get_filename_component(WIIUSE_RUNTIME_LIBRARY_DIRS
++ "${WIIUSE_LIBRARY}"
++ PATH)
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(WiiUse
++ DEFAULT_MSG
++ WIIUSE_LIBRARY
++ WIIUSE_INCLUDE_DIR
++ ${_deps_check})
++
++if(WIIUSE_FOUND)
++ set(WIIUSE_LIBRARIES "${WIIUSE_LIBRARY}")
++ set(WIIUSE_INCLUDE_DIRS "${WIIUSE_INCLUDE_DIR}")
++ mark_as_advanced(WIIUSE_ROOT_DIR)
++endif()
++
++mark_as_advanced(WIIUSE_INCLUDE_DIR
++ WIIUSE_LIBRARY
++ WIIUSE_RUNTIME_LIBRARY)
+--
+1.9.0
+
diff --git a/supertuxkart.spec b/supertuxkart.spec
index 281743b..e843650 100644
--- a/supertuxkart.spec
+++ b/supertuxkart.spec
@@ -1,6 +1,6 @@
Name: supertuxkart
Version: 0.8.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Kids 3D go-kart racing game featuring Tux
Group: Amusements/Games
License: GPLv2+ and GPLv3 and CC-BY-SA
@@ -9,14 +9,16 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.
Source1: %{name}.6
Source2: supertuxkart-0.7.3-license-clarification.txt
Patch0: supertuxkart-fhs.patch
-Patch1: supertuxkart-0.8.1-desktop.patch
-Patch2: supertuxkart-0.8.1-bullet.patch
-Patch3: supertuxkart-0.8.1-bundled.patch
+# tracked in github.com/ignatenkobrain/stk-code/ in fedora-0.8.1 branch
+Patch1: 0001-fix-.desktop-file-and-install-destinations.patch
+Patch2: 0002-fix-srcs-for-new-bullet-API.patch
+Patch3: 0003-unbundle-all-libs.patch
BuildRequires: cmake
BuildRequires: libvorbis-devel freeglut-devel desktop-file-utils
BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10 libtool
BuildRequires: libcurl-devel enet-devel bullet-devel fribidi-devel
BuildRequires: irrlicht-devel >= 1.8.1-2
+BuildRequires: wiiuse-devel bluez-libs-devel
Requires: hicolor-icon-theme opengl-games-utils
# Provide so that yum install tuxkart will work, obsolete for auto upgrade
Provides: tuxkart = 0.8.1-1
@@ -52,7 +54,7 @@ sed -i -e '/setAnimationStrength/s/^/\/\//' src/karts/kart_model.cpp
%build
mkdir -p build
cd build
-%cmake ../ -DUSE_WIIUSE=no
+%cmake ../
make %{?_smp_mflags}
%install
@@ -87,6 +89,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/%{name}
%changelog
+* Sun May 11 2014 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.8.1-4
+- enable wiimote support (asked in stk-owner@)
+
* Tue Apr 29 2014 Jon Ciesla <limburgher at gmail.com> - 0.8.1-3
- libenet rebuild.
More information about the scm-commits
mailing list