From 13a2153349d078d1aa2f63d9c878ec5a31b4e4d9 Mon Sep 17 00:00:00 2001 From: Pete Walter Date: Jun 20 2016 16:12:33 +0000 Subject: Update to 0.9.2 RC1 --- diff --git a/.gitignore b/.gitignore index c7ba581..f18dfe4 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ addon0.6.1-1.zip /supertuxkart-0.9-src.tar.xz /stk-0.9.1-src.zip /supertuxkart-0.9.1-src.tar.xz +/supertuxkart-0.9.2-rc1-src.tar.xz diff --git a/sources b/sources index 84e2bbe..f3d41ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d87d943f2e746043aed87dc80004701 supertuxkart-0.9.1-src.tar.xz +2c537214e33b9a69a5a16b9be3c3f4a7 supertuxkart-0.9.2-rc1-src.tar.xz diff --git a/supertuxkart-gcc6.patch b/supertuxkart-gcc6.patch deleted file mode 100644 index 3689e61..0000000 --- a/supertuxkart-gcc6.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- lib/bullet/src/LinearMath/btSerializer.cpp~ 2015-10-18 17:03:42.000000000 -0400 -+++ lib/bullet/src/LinearMath/btSerializer.cpp 2016-02-25 10:56:18.720474143 -0500 -@@ -1,4 +1,4 @@ --unsigned char sBulletDNAstr[]= { -+signed char sBulletDNAstr[]= { - 83,68,78,65,78,65,77,69,42,1,0,0,109,95,115,105,122,101,0,109, - 95,99,97,112,97,99,105,116,121,0,42,109,95,100,97,116,97,0,109,95, - 99,111,108,108,105,115,105,111,110,83,104,97,112,101,115,0,109,95,99,111, -@@ -414,7 +414,7 @@ - 4,0,34,1,4,0,-1,0,4,0,35,1,4,0,36,1,4,0,37,1, - 4,0,38,1,4,0,39,1,4,0,40,1,67,0,41,1,}; - int sBulletDNAlen= sizeof(sBulletDNAstr); --unsigned char sBulletDNAstr64[]= { -+signed char sBulletDNAstr64[]= { - 83,68,78,65,78,65,77,69,42,1,0,0,109,95,115,105,122,101,0,109, - 95,99,97,112,97,99,105,116,121,0,42,109,95,100,97,116,97,0,109,95, - 99,111,108,108,105,115,105,111,110,83,104,97,112,101,115,0,109,95,99,111, diff --git a/supertuxkart-unbundle-enet.patch b/supertuxkart-unbundle-enet.patch index 9418f6c..6d5b426 100644 --- a/supertuxkart-unbundle-enet.patch +++ b/supertuxkart-unbundle-enet.patch @@ -1,6 +1,5 @@ -diff -uNr supertuxkart-0.9.1.wiiuse/cmake/FindENet.cmake supertuxkart-0.9.1/cmake/FindENet.cmake ---- supertuxkart-0.9.1.wiiuse/cmake/FindENet.cmake 1970-01-01 01:00:00.000000000 +0100 -+++ supertuxkart-0.9.1/cmake/FindENet.cmake 2015-10-19 20:09:36.174150131 +0200 +--- supertuxkart-0.9.2-rc1/cmake/FindENet.cmake.enet 2016-06-17 12:59:14.081049116 +0200 ++++ supertuxkart-0.9.2-rc1/cmake/FindENet.cmake 2016-06-17 12:59:14.081049116 +0200 @@ -0,0 +1,49 @@ +# - Try to find enet +# Once done this will define @@ -51,10 +50,9 @@ diff -uNr supertuxkart-0.9.1.wiiuse/cmake/FindENet.cmake supertuxkart-0.9.1/cmak + +MARK_AS_ADVANCED(ENet_LIBRARY ENet_LIBRARIES ENet_INCLUDE_DIRS) + -diff -uNr supertuxkart-0.9.1.wiiuse/CMakeLists.txt supertuxkart-0.9.1/CMakeLists.txt ---- supertuxkart-0.9.1.wiiuse/CMakeLists.txt 2015-10-19 20:08:21.035417630 +0200 -+++ supertuxkart-0.9.1/CMakeLists.txt 2015-10-19 20:09:36.177150839 +0200 -@@ -63,8 +63,8 @@ +--- supertuxkart-0.9.2-rc1/CMakeLists.txt.enet 2016-06-17 12:59:14.080049134 +0200 ++++ supertuxkart-0.9.2-rc1/CMakeLists.txt 2016-06-17 12:59:14.081049116 +0200 +@@ -64,8 +64,8 @@ include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src") # Build the ENet UDP network library @@ -64,8 +62,8 @@ diff -uNr supertuxkart-0.9.1.wiiuse/CMakeLists.txt supertuxkart-0.9.1/CMakeLists +include_directories(${ENet_INCLUDE_DIRS}) # Build glew library - add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew") -@@ -330,7 +330,7 @@ + add_definitions(-DGLEW_NO_GLU) +@@ -341,7 +341,7 @@ bulletdynamics bulletcollision bulletmath diff --git a/supertuxkart.spec b/supertuxkart.spec index 993092f..ff6b6cb 100644 --- a/supertuxkart.spec +++ b/supertuxkart.spec @@ -1,17 +1,17 @@ Name: supertuxkart -Version: 0.9.1 -Release: 5%{?dist} +Version: 0.9.2 +Release: 0.1.rc1%{?dist} Summary: Kids 3D go-kart racing game featuring Tux Group: Amusements/Games License: GPLv2+ and GPLv3 and CC-BY-SA URL: http://supertuxkart.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.xz +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-rc1-src.tar.xz Source1: %{name}.6 Source2: supertuxkart-0.7.3-license-clarification.txt Patch0: supertuxkart-unbundle-wiiuse.patch Patch1: supertuxkart-unbundle-enet.patch -Patch2: supertuxkart-gcc6.patch BuildRequires: cmake +BuildRequires: freetype-devel BuildRequires: libvorbis-devel freeglut-devel desktop-file-utils BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10 libtool BuildRequires: libcurl-devel enet-devel fribidi-devel @@ -25,10 +25,6 @@ Provides: tuxkart = %{version}-%{release} Obsoletes: tuxkart < 0.4.0-6 Requires: %{name}-data = %{version} -%global _privatelibs libstkirrlicht[.]so.* -%global __provides_exclude ^(%{_privatelibs})$ -%global __requires_exclude ^(%{_privatelibs})$ - %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 @@ -45,15 +41,17 @@ BuildArch: noarch This package contains the data files for SuperTuxKart. %prep -%setup -q +%setup -q -n %{name}-%{version}-rc1 cp -p %{SOURCE2} . %patch0 -p1 %patch1 -p1 -%patch2 -p0 # Delete bundled libs rm -rf lib/enet lib/wiiuse lib/angelscript #sed -i -e '/setAnimationStrength/s/^/\/\//' src/karts/kart_model.cpp +# work around build failure due to https://bugzilla.redhat.com/show_bug.cgi?id=304121 +sed -i -e '/^#include/ s/\/\//\//' src/network/protocols/server_lobby_room_protocol.cpp + %build mkdir -p build cd build @@ -70,8 +68,6 @@ ln -s opengl-game-wrapper.sh %{buildroot}%{_bindir}/%{name}-wrapper # add the manpage (courtesy of Debian) mkdir -p %{buildroot}%{_mandir}/man6 install -p -m 644 %{SOURCE1} %{buildroot}%{_mandir}/man6 -mkdir -p %{buildroot}%{_libdir} -install -m755 lib/irrlicht/libstkirrlicht.so %{buildroot}%{_libdir}/libstkirrlicht.so %post touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -98,12 +94,14 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*%{name}.desktop %{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/pixmaps/%{name}_*.png -%{_libdir}/libstkirrlicht.so %files data %{_datadir}/%{name} %changelog +* Mon Jun 20 2016 Pete Walter - 0.9.2-0.1.rc1 +- Update to 0.9.2 RC1 + * Thu Feb 25 2016 Jon Ciesla - 0.9.1-5 - Fix FTBFS.