Attachment 829851 Details for Bug 1035278 – 0001-Update-to-upstream-0.8.1-w-bundled-irrlicht.patch

[patch] 0001-Update-to-upstream-0.8.1-w-bundled-irrlicht.patch

0001-Update-to-upstream-0.8.1-w-bundled-irrlicht.patch (text/plain), 21.08 KB, created by Igor Gnatenko on 2013-11-27 17:53:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Igor Gnatenko

Created: 2013-11-27 17:53:18 UTC

Size: 21.08 KB

patch

obsolete

>From 1e3f37a2ff9b0fbfdba4244df5c7e2b79683160c Mon Sep 17 00:00:00 2001
>From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>Date: Wed, 27 Nov 2013 21:51:08 +0400
>Subject: [PATCH] Update to upstream 0.8.1 w/ bundled irrlicht
>
>Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
>---
> supertuxkart-0.8.1-bundled-irrlicht.patch | 187 ++++++++++++++++++++++++++++++
> supertuxkart-0.8.1-bundled.patch          |  96 +++++++++++++++
> supertuxkart-0.8.1-desktop.patch          |  51 ++++++++
> supertuxkart-0.8.1-new-bullet.patch       |  37 ++++++
> supertuxkart.spec                         |  83 +++++--------
> 5 files changed, 403 insertions(+), 51 deletions(-)
> create mode 100644 supertuxkart-0.8.1-bundled-irrlicht.patch
> create mode 100644 supertuxkart-0.8.1-bundled.patch
> create mode 100644 supertuxkart-0.8.1-desktop.patch
> create mode 100644 supertuxkart-0.8.1-new-bullet.patch
>
>diff --git a/supertuxkart-0.8.1-bundled-irrlicht.patch b/supertuxkart-0.8.1-bundled-irrlicht.patch
>new file mode 100644
>index 0000000..18a0e46
>--- /dev/null
>+++ b/supertuxkart-0.8.1-bundled-irrlicht.patch
>@@ -0,0 +1,187 @@
>+diff -uNr SuperTuxKart-0.8.1.orig/CMakeLists.txt SuperTuxKart-0.8.1/CMakeLists.txt
>+--- SuperTuxKart-0.8.1.orig/CMakeLists.txt	2013-11-27 20:18:41.814837203 +0400
>++++ SuperTuxKart-0.8.1/CMakeLists.txt	2013-11-27 21:10:55.266311093 +0400
>+@@ -219,12 +219,19 @@
>+     target_link_libraries(supertuxkart ${PTHREAD_LIBRARY})
>+ endif()
>+ 
>++# irrlicht dependencies
>++find_package(ZLIB REQUIRED)
>++find_package(PNG REQUIRED)
>++find_Package(JPEG REQUIRED)
>+ 
>+ # Common library dependencies
>+ target_link_libraries(supertuxkart
>+     stkirrlicht
>+     ${BULLET_LIBRARIES}
>+     ${ENet_LIBRARIES}
>++    ${ZLIB_LIBRARIES}
>++    ${PNG_LIBRARIES}
>++    ${JPEG_LIBRARIES}
>+     ${CURL_LIBRARIES}
>+     ${OGGVORBIS_LIBRARIES}
>+     ${IRRLICHT_XF86VM_LIBRARY}
>+Binary files SuperTuxKart-0.8.1.orig/.CMakeLists.txt.swp and SuperTuxKart-0.8.1/.CMakeLists.txt.swp differ
>+diff -uNr SuperTuxKart-0.8.1.orig/lib/irrlicht/CMakeLists.txt SuperTuxKart-0.8.1/lib/irrlicht/CMakeLists.txt
>+--- SuperTuxKart-0.8.1.orig/lib/irrlicht/CMakeLists.txt	2013-11-15 02:29:12.000000000 +0400
>++++ SuperTuxKart-0.8.1/lib/irrlicht/CMakeLists.txt	2013-11-27 21:27:01.079360383 +0400
>+@@ -1,10 +1,10 @@
>+ # CMakeLists.txt for Irrlicht in STK
>++find_package(ZLIB REQUIRED)
>++find_package(PNG REQUIRED)
>+ 
>+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/
>+-                    ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/jpeglib
>+-                    ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/libpng
>+-                    ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/zlib
>+-                    ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/bzip2)
>++                    ${ZLIB_INCLUDE_DIRS}
>++                    ${PNG_INCLUDE_DIRS})
>+ 
>+ if(APPLE)
>+     include_directories(${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht/MacOSX ${CMAKE_CURRENT_SOURCE_DIR}/source/Irrlicht)
>+@@ -651,107 +651,6 @@
>+ include/IShaderConstantSetCallBack.h
>+ include/ITexture.h
>+ 
>+-
>+-source/Irrlicht/zlib/infback.c
>+-source/Irrlicht/zlib/deflate.c
>+-source/Irrlicht/zlib/zutil.c
>+-source/Irrlicht/zlib/crc32.c
>+-source/Irrlicht/zlib/gzread.c
>+-source/Irrlicht/zlib/inffast.c
>+-source/Irrlicht/zlib/uncompr.c
>+-source/Irrlicht/zlib/inftrees.c
>+-source/Irrlicht/zlib/inflate.c
>+-source/Irrlicht/zlib/compress.c
>+-source/Irrlicht/zlib/adler32.c
>+-source/Irrlicht/zlib/gzwrite.c
>+-source/Irrlicht/zlib/trees.c
>+-source/Irrlicht/zlib/gzlib.c
>+-source/Irrlicht/zlib/gzclose.c
>+-source/Irrlicht/zlib/inffixed.h
>+-source/Irrlicht/zlib/inffast.h
>+-source/Irrlicht/zlib/zconf.h
>+-source/Irrlicht/zlib/zutil.h
>+-source/Irrlicht/zlib/inftrees.h
>+-source/Irrlicht/zlib/deflate.h
>+-source/Irrlicht/zlib/zlib.h
>+-source/Irrlicht/zlib/inflate.h
>+-source/Irrlicht/zlib/trees.h
>+-source/Irrlicht/zlib/gzguts.h
>+-source/Irrlicht/zlib/crc32.h
>+-
>+-
>+-source/Irrlicht/jpeglib/jaricom.c
>+-source/Irrlicht/jpeglib/jcapimin.c
>+-source/Irrlicht/jpeglib/jcapistd.c
>+-source/Irrlicht/jpeglib/jcarith.c
>+-source/Irrlicht/jpeglib/jccoefct.c
>+-source/Irrlicht/jpeglib/jccolor.c
>+-source/Irrlicht/jpeglib/jcdctmgr.c
>+-source/Irrlicht/jpeglib/jchuff.c
>+-source/Irrlicht/jpeglib/jcinit.c
>+-source/Irrlicht/jpeglib/jcmainct.c
>+-source/Irrlicht/jpeglib/jcmarker.c
>+-source/Irrlicht/jpeglib/jcmaster.c
>+-source/Irrlicht/jpeglib/jcomapi.c
>+-source/Irrlicht/jpeglib/jcparam.c
>+-source/Irrlicht/jpeglib/jcprepct.c
>+-source/Irrlicht/jpeglib/jcsample.c
>+-source/Irrlicht/jpeglib/jctrans.c
>+-source/Irrlicht/jpeglib/jdapimin.c
>+-source/Irrlicht/jpeglib/jdapistd.c
>+-source/Irrlicht/jpeglib/jdarith.c
>+-source/Irrlicht/jpeglib/jdatadst.c
>+-source/Irrlicht/jpeglib/jdatasrc.c
>+-source/Irrlicht/jpeglib/jdcoefct.c
>+-source/Irrlicht/jpeglib/jdcolor.c
>+-source/Irrlicht/jpeglib/jddctmgr.c
>+-source/Irrlicht/jpeglib/jdhuff.c
>+-source/Irrlicht/jpeglib/jdinput.c
>+-source/Irrlicht/jpeglib/jdmainct.c
>+-source/Irrlicht/jpeglib/jdmarker.c
>+-source/Irrlicht/jpeglib/jdmaster.c
>+-source/Irrlicht/jpeglib/jdmerge.c
>+-source/Irrlicht/jpeglib/jdpostct.c
>+-source/Irrlicht/jpeglib/jdsample.c
>+-source/Irrlicht/jpeglib/jdtrans.c
>+-source/Irrlicht/jpeglib/jerror.c
>+-source/Irrlicht/jpeglib/jfdctflt.c
>+-source/Irrlicht/jpeglib/jfdctfst.c
>+-source/Irrlicht/jpeglib/jfdctint.c
>+-source/Irrlicht/jpeglib/jidctflt.c
>+-source/Irrlicht/jpeglib/jidctfst.c
>+-source/Irrlicht/jpeglib/jidctint.c
>+-source/Irrlicht/jpeglib/jmemmgr.c
>+-source/Irrlicht/jpeglib/jmemnobs.c
>+-source/Irrlicht/jpeglib/jquant1.c
>+-source/Irrlicht/jpeglib/jquant2.c
>+-source/Irrlicht/jpeglib/jutils.c
>+-
>+-
>+-source/Irrlicht/libpng/pngwutil.c
>+-source/Irrlicht/libpng/pngget.c
>+-source/Irrlicht/libpng/pngrtran.c
>+-source/Irrlicht/libpng/pngrutil.c
>+-source/Irrlicht/libpng/pngerror.c
>+-source/Irrlicht/libpng/pngset.c
>+-source/Irrlicht/libpng/pngtest.c
>+-source/Irrlicht/libpng/pngmem.c
>+-source/Irrlicht/libpng/pngpread.c
>+-source/Irrlicht/libpng/png.c
>+-source/Irrlicht/libpng/pngread.c
>+-source/Irrlicht/libpng/pngwio.c
>+-source/Irrlicht/libpng/pngtrans.c
>+-source/Irrlicht/libpng/pngwrite.c
>+-source/Irrlicht/libpng/pngwtran.c
>+-source/Irrlicht/libpng/example.c
>+-source/Irrlicht/libpng/pngrio.c
>+-source/Irrlicht/libpng/png.h
>+-source/Irrlicht/libpng/pngdebug.h
>+-source/Irrlicht/libpng/pngconf.h
>+-source/Irrlicht/libpng/pngpriv.h
>+-source/Irrlicht/libpng/pnginfo.h
>+-source/Irrlicht/libpng/pnglibconf.h
>+-source/Irrlicht/libpng/pngstruct.h
>+ )
>+ 
>+ if(APPLE)
>+@@ -774,5 +673,5 @@
>+     set_source_files_properties(source/Irrlicht/MacOSX/OSXClipboard.mm PROPERTIES LANGUAGE C)
>+ endif()
>+ 
>+-add_library(stkirrlicht ${IRRLICHT_SOURCES})
>++add_library(stkirrlicht STATIC ${IRRLICHT_SOURCES})
>+ 
>+diff -uNr SuperTuxKart-0.8.1.orig/lib/irrlicht/include/IrrCompileConfig.h SuperTuxKart-0.8.1/lib/irrlicht/include/IrrCompileConfig.h
>+--- SuperTuxKart-0.8.1.orig/lib/irrlicht/include/IrrCompileConfig.h	2013-06-20 12:57:24.000000000 +0400
>++++ SuperTuxKart-0.8.1/lib/irrlicht/include/IrrCompileConfig.h	2013-11-27 20:31:07.631629688 +0400
>+@@ -245,7 +245,7 @@
>+ //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
>+ /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
>+ 	This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
>+-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
>++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
>+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
>+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
>+ #endif
>+@@ -261,7 +261,7 @@
>+ //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
>+ /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
>+ 	This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
>+-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
>++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
>+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
>+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
>+ #endif
>+@@ -598,7 +598,7 @@
>+ /** If this is commented out, Irrlicht will try to compile using the zlib
>+ installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
>+ defined. */
>+-#define _IRR_USE_NON_SYSTEM_ZLIB_
>++//#define _IRR_USE_NON_SYSTEM_ZLIB_
>+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
>+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
>+ #endif
>diff --git a/supertuxkart-0.8.1-bundled.patch b/supertuxkart-0.8.1-bundled.patch
>new file mode 100644
>index 0000000..0d664a2
>--- /dev/null
>+++ b/supertuxkart-0.8.1-bundled.patch
>@@ -0,0 +1,96 @@
>+diff -uNr SuperTuxKart-0.8.1.orig/cmake/FindENet.cmake SuperTuxKart-0.8.1/cmake/FindENet.cmake
>+--- SuperTuxKart-0.8.1.orig/cmake/FindENet.cmake	1970-01-01 03:00:00.000000000 +0300
>++++ SuperTuxKart-0.8.1/cmake/FindENet.cmake	2013-11-27 18:52:44.007020420 +0400
>+@@ -0,0 +1,49 @@
>++# - 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 -uNr SuperTuxKart-0.8.1.orig/CMakeLists.txt SuperTuxKart-0.8.1/CMakeLists.txt
>+--- SuperTuxKart-0.8.1.orig/CMakeLists.txt	2013-11-25 01:54:13.000000000 +0400
>++++ SuperTuxKart-0.8.1/CMakeLists.txt	2013-11-27 18:51:26.575168040 +0400
>+@@ -37,12 +37,13 @@
>+     STRING "Install data folder to this directory, absolute or relative to CMAKE_INSTALL_PREFIX")
>+ 
>+ # Build the Bullet physics library
>+-add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
>+-include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
>++INCLUDE (FindPkgConfig)
>++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)
>++include_directories(${ENet_INCLUDE_DIRS})
>+ 
>+ # Build the irrlicht library
>+ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/irrlicht")
>+@@ -59,7 +60,6 @@
>+     include_directories("${PROJECT_SOURCE_DIR}/lib/wiiuse")
>+ endif()
>+ 
>+-
>+ # Set include paths
>+ include_directories(${STK_SOURCE_DIR})
>+ 
>+@@ -222,11 +222,9 @@
>+ 
>+ # Common library dependencies
>+ target_link_libraries(supertuxkart
>+-    bulletdynamics
>+-    bulletcollision
>+-    bulletmath
>+-    enet
>+     stkirrlicht
>++    ${BULLET_LIBRARIES}
>++    ${ENet_LIBRARIES}
>+     ${CURL_LIBRARIES}
>+     ${OGGVORBIS_LIBRARIES}
>+     ${IRRLICHT_XF86VM_LIBRARY}
>diff --git a/supertuxkart-0.8.1-desktop.patch b/supertuxkart-0.8.1-desktop.patch
>new file mode 100644
>index 0000000..f5a1ee8
>--- /dev/null
>+++ b/supertuxkart-0.8.1-desktop.patch
>@@ -0,0 +1,51 @@
>+diff -uNr SuperTuxKart-0.8.1.orig/CMakeLists.txt SuperTuxKart-0.8.1/CMakeLists.txt
>+--- SuperTuxKart-0.8.1.orig/CMakeLists.txt	2013-11-27 21:37:19.557618278 +0400
>++++ SuperTuxKart-0.8.1/CMakeLists.txt	2013-11-27 21:41:02.891251870 +0400
>+@@ -297,9 +297,8 @@
>+ # ==== 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)
>+-install(FILES ${PROJECT_BINARY_DIR}/supertuxkart.desktop DESTINATION share/applications)
>+-install(FILES data/supertuxkart_32.png data/supertuxkart_128.png DESTINATION share/pixmaps)
>++install(FILES data/supertuxkart.desktop DESTINATION share/applications)
>++install(FILES data/supertuxkart_32.png DESTINATION share/icons/hicolor/32x32/apps RENAME supertuxkart.png)
>++install(FILES data/supertuxkart_128.png DESTINATION share/icons/hicolor/128x128/apps RENAME supertuxkart.png)
>+ 
>+ set(PREFIX ${CMAKE_INSTALL_PREFIX})
>+-configure_file(data/supertuxkart_desktop.template supertuxkart.desktop)
>+-add_dependencies(supertuxkart supertuxkart.desktop)
>+diff -uNr SuperTuxKart-0.8.1.orig/data/supertuxkart.desktop SuperTuxKart-0.8.1/data/supertuxkart.desktop
>+--- SuperTuxKart-0.8.1.orig/data/supertuxkart.desktop	1970-01-01 03:00:00.000000000 +0300
>++++ SuperTuxKart-0.8.1/data/supertuxkart.desktop	2013-11-27 21:37:53.320011620 +0400
>+@@ -0,0 +1,13 @@
>++[Desktop Entry]
>++Name=SuperTuxKart
>++Icon=supertuxkart
>++GenericName=A kart racing game
>++GenericName[de_DE]=Ein Kart-Rennspiel
>++GenericName[fr_FR]=Un jeu de karting
>++GenericName[gl]=Xogo de carreiras con karts
>++GenericName[ro_RO]=Un joc de curse cu carturi
>++Exec=supertuxkart --no-console
>++Terminal=false
>++StartupNotify=false
>++Type=Application
>++Categories=Game;ActionGame;ArcadeGame;
>+diff -uNr SuperTuxKart-0.8.1.orig/data/supertuxkart_desktop.template SuperTuxKart-0.8.1/data/supertuxkart_desktop.template
>+--- SuperTuxKart-0.8.1.orig/data/supertuxkart_desktop.template	2013-08-30 22:46:11.000000000 +0400
>++++ SuperTuxKart-0.8.1/data/supertuxkart_desktop.template	1970-01-01 03:00:00.000000000 +0300
>+@@ -1,14 +0,0 @@
>+-[Desktop Entry]
>+-Name=SuperTuxKart
>+-Icon=@PREFIX@/share/pixmaps/supertuxkart_128.png
>+-GenericName=A kart racing game
>+-GenericName[de_DE]=Ein Kart-Rennspiel
>+-GenericName[fr_FR]=Un jeu de karting
>+-GenericName[gl]=Xogo de carreiras con karts
>+-GenericName[ro_RO]=Un joc de curse cu carturi
>+-Exec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart --no-console
>+-Terminal=false
>+-StartupNotify=false
>+-Type=Application
>+-TryExec=@PREFIX@/@STK_INSTALL_BINARY_DIR@/supertuxkart
>+-Categories=Game;ArcadeGame;
>diff --git a/supertuxkart-0.8.1-new-bullet.patch b/supertuxkart-0.8.1-new-bullet.patch
>new file mode 100644
>index 0000000..8d4594b
>--- /dev/null
>+++ b/supertuxkart-0.8.1-new-bullet.patch
>@@ -0,0 +1,37 @@
>+diff -uNr SuperTuxKart-0.8.1.orig/src/physics/btKartRaycast.cpp SuperTuxKart-0.8.1/src/physics/btKartRaycast.cpp
>+--- SuperTuxKart-0.8.1.orig/src/physics/btKartRaycast.cpp	2013-11-15 16:52:39.000000000 +0400
>++++ SuperTuxKart-0.8.1/src/physics/btKartRaycast.cpp	2013-11-27 19:28:04.888482957 +0400
>+@@ -63,7 +63,7 @@
>+ 
>+     if (rayCallback.hasHit())
>+     {
>+-        btRigidBody* body = btRigidBody::upcast(rayCallback.m_collisionObject);
>++        const btRigidBody* body = btRigidBody::upcast(rayCallback.m_collisionObject);
>+         if (body && body->hasContactResponse())
>+         {
>+             result.m_hitPointInWorld = rayCallback.m_hitPointWorld;
>+@@ -88,7 +88,7 @@
>+                     result.m_hitNormalInWorld.getZ());
>+ #endif
>+             }
>+-            return body;
>++            return (void *) body;
>+         }
>+     }
>+     return 0;
>+diff -uNr SuperTuxKart-0.8.1.orig/src/physics/physics.cpp SuperTuxKart-0.8.1/src/physics/physics.cpp
>+--- SuperTuxKart-0.8.1.orig/src/physics/physics.cpp	2013-11-15 16:52:39.000000000 +0400
>++++ SuperTuxKart-0.8.1/src/physics/physics.cpp	2013-11-27 19:28:30.974770447 +0400
>+@@ -450,10 +450,8 @@
>+         btPersistentManifold* contact_manifold =
>+             m_dynamics_world->getDispatcher()->getManifoldByIndexInternal(i);
>+ 
>+-        btCollisionObject* objA =
>+-            static_cast<btCollisionObject*>(contact_manifold->getBody0());
>+-        btCollisionObject* objB =
>+-            static_cast<btCollisionObject*>(contact_manifold->getBody1());
>++        const btCollisionObject* objA = contact_manifold->getBody0();
>++        const btCollisionObject* objB = contact_manifold->getBody1();
>+ 
>+         unsigned int num_contacts = contact_manifold->getNumContacts();
>+         if(!num_contacts) continue;   // no real collision
>diff --git a/supertuxkart.spec b/supertuxkart.spec
>index a06414f..83c5941 100644
>--- a/supertuxkart.spec
>+++ b/supertuxkart.spec
>@@ -1,6 +1,6 @@
> Name:           supertuxkart
>-Version:        0.8
>-Release:        2%{?dist}
>+Version:        0.8.1
>+Release:        1%{?dist}
> Summary:        Kids 3D go-kart racing game featuring Tux
> Group:          Amusements/Games
> License:        GPLv2+ and GPLv3 and CC-BY-SA
>@@ -9,17 +9,25 @@ 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.7.3-desktop.patch
>-Patch2:         SuperTuxKart-0.8-new-bullet.patch
>+Patch1:         supertuxkart-0.8.1-bundled.patch
>+Patch2:         supertuxkart-0.8.1-new-bullet.patch
>+Patch3:         supertuxkart-0.8.1-bundled-irrlicht.patch
>+Patch4:         supertuxkart-0.8.1-desktop.patch
>+BuildRequires:  cmake
> BuildRequires:  libvorbis-devel freeglut-devel desktop-file-utils
> BuildRequires:  openal-soft-devel freealut-devel >= 1.1.0-10 libtool
>-BuildRequires:  irrlicht-devel libcurl-devel enet-devel bullet-devel
>+BuildRequires:  libcurl-devel enet-devel bullet-devel fribidi-devel
>+# irrlicht dependencies
>+BuildRequires:  zlib-devel libpng-devel libjpeg-turbo-devel
> Requires:       hicolor-icon-theme opengl-games-utils
> # Provide so that yum install tuxkart will work, obsolete for auto upgrade
>-Provides:       tuxkart = 0.4.0-6
>+Provides:       tuxkart = 0.8.1-1
> Obsoletes:      tuxkart < 0.4.0-6
> Requires:       %{name}-data = %{version}
> 
>+# TODO: There should be link to fpc thread
>+Provides:       bundled(irrlicht)
>+
> %description
> 3D go-kart racing game for kids with several famous OpenSource mascots
> participating. Race as Tux against 3 computer players in many different fun
>@@ -42,57 +50,29 @@ cp -p %{SOURCE2} .
> %patch0 -p1
> %patch1 -p1
> %patch2 -p1
>-# supertuxkart-0.8 does not ship pre-build configure scripts
>-autoreconf -i -f
>-
>+%patch3 -p1
>+%patch4 -p1
>+# Delete bundled libs w/o/ irrlicht
>+find ./lib/* -maxdepth 0 -type d -not -name irrlicht -exec rm -rf {} \;
>+# Delete bundled libs in irrlicht
>+rm -rf ./lib/irrlicht/source/Irrlicht/{zlib,jpeglib,lzma,libpng,bzip2}
> 
> %build
>-%configure
>-# kill all the bundled libs, needs to be done after configure
>-rm -rf lib
>-make %{?_smp_mflags} BULLETTREE= ENETTREE= \
>-  CPPFLAGS="-I/usr/include/irrlicht -I/usr/include/bullet" \
>-  irrlicht_LIBS="-lIrrlicht -lIrrXML -lX11 -lpthread" \
>-  bullet_LIBS="-lBulletCollision -lBulletDynamics -lLinearMath"
>-
>+mkdir -p build
>+cd build
>+%cmake ../ -DUSE_WIIUSE=no -DCMAKE_INSTALL_PREFIX=%{_prefix}
>+make %{?_smp_mflags}
> 
> %install
>-# make install is borken (lots of data files missing), lets DIY
>-mkdir -p $RPM_BUILD_ROOT%{_bindir}
>-mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
>-install -m 755 src/%{name} $RPM_BUILD_ROOT%{_bindir}
>-cp -pr data $RPM_BUILD_ROOT%{_datadir}/%{name}
>-rm `find $RPM_BUILD_ROOT%{_datadir}/%{name} -name "Makefile*"`
>-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/po/extract_strings_from_XML.py
>-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/po/gen-mo.sh
>-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/po/gui_strings.h
>-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/po/update_pot.sh
>-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/run_me.sh
>-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/supertuxkart*
>-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/data/tracks/greenvalley/.directory
>-
>-ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
>-
>-# below is the desktop file and icon stuff.
>-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
>-desktop-file-install \
>-%if 0%{?fedora} && 0%{?fedora} < 19
>-  --vendor fedora            \
>-%endif
>-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
>-  data/%{name}.desktop
>-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
>-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps
>-install -p -m 644 data/%{name}_32.xpm \
>-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/%{name}.xpm
>-install -p -m 644 data/%{name}_64.xpm \
>-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.xpm
>+cd build
>+%make_install
>+
>+#ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
> 
> # add the manpage (courtesy of Debian)
> mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
> install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
> 
>-
> %post
> touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
> 
>@@ -105,19 +85,20 @@ fi
> %posttrans
> gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
> 
>-
> %files
> %doc AUTHORS COPYING ChangeLog README TODO supertuxkart-0.7.3-license-clarification.txt
> %{_bindir}/%{name}*
> %{_mandir}/man6/%{name}.6.gz
> %{_datadir}/applications/*%{name}.desktop
>-%{_datadir}/icons/hicolor/*/apps/%{name}.xpm
>+%{_datadir}/icons/hicolor/*/apps/%{name}.png
> 
> %files data
> %{_datadir}/%{name}
> 
>-
> %changelog
>+* Wed Nov 27 2013 Igor Gnatenko <i.gnatenko.brain@gmail.com> - 0.8.1-1
>+- Update to upstream 0.8.1 w/ bundled irrlicht
>+
> * Mon Nov 25 2013 Hans de Goede <hdegoede@redhat.com> - 0.8-2
> - Drop no longer needed SDL and mikmod BuildRequires
> 
>-- 
>1.8.4.2
>

Flags:

ignatenko: review+

Actions: View | Diff

Attachments on bug 1035278: 829745 | 829851 | 830590