Stephan Kulow 2015-04-25 07:52:31 +00:00 committed by Git OBS Bridge
commit 7cd3de37f3
8 changed files with 37 additions and 168 deletions

View File

@ -1,36 +0,0 @@
Index: SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
===================================================================
--- SuperTuxKart-0.8.1.orig/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
+++ SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
@@ -21,6 +21,7 @@
#endif
#include <GL/gl.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#endif
#include "wglext.h"
@@ -36,6 +37,7 @@
#endif
#include <OpenGL/gl.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#endif
#elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
@@ -49,6 +51,7 @@
#define NO_SDL_GLEXT
#include <SDL/SDL_video.h>
#include <SDL/SDL_opengl.h>
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#else
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
@@ -61,6 +64,7 @@
#include <GL/gl.h>
#include <GL/glx.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode);
#include "glext.h"
#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
#include "glxext.h"

View File

@ -1,46 +0,0 @@
Index: SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzlib.c
===================================================================
--- SuperTuxKart-0.8.1.orig/lib/irrlicht/source/Irrlicht/zlib/gzlib.c
+++ SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzlib.c
@@ -4,6 +4,10 @@
*/
#include "gzguts.h"
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/socket.h>
#if defined(_WIN32) && !defined(__BORLANDC__)
# define LSEEK _lseeki64
Index: SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzread.c
===================================================================
--- SuperTuxKart-0.8.1.orig/lib/irrlicht/source/Irrlicht/zlib/gzread.c
+++ SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzread.c
@@ -4,6 +4,10 @@
*/
#include "gzguts.h"
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/socket.h>
/* Local functions */
local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *));
Index: SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzwrite.c
===================================================================
--- SuperTuxKart-0.8.1.orig/lib/irrlicht/source/Irrlicht/zlib/gzwrite.c
+++ SuperTuxKart-0.8.1/lib/irrlicht/source/Irrlicht/zlib/gzwrite.c
@@ -5,6 +5,11 @@
#include "gzguts.h"
+#include <string.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/socket.h>
+
/* Local functions */
local int gz_init OF((gz_statep));
local int gz_comp OF((gz_statep, int));

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:335301ae61b0c177be68d5593c65e5b197dc807421f08a8a35740a254cacf8d6
size 229944480

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0eb24eb49e23ed6d03f4864feb43573e14971c8420bf60c3c654d4e05ff9aa6
size 385780604

View File

@ -1,33 +0,0 @@
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

View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2013 Dominique Leuenberger <dimstar@opensuse.org> -->
<application>
<id type="desktop">supertuxkart.desktop</id>
<licence>CC0</licence>
<name>SuperTuxKart</name>
<summary>3D Kart Racing Game</summary>
<description>
<p>SuperTuxKart is a Free 3d kart racing game.
The focus of the game is more to be fun than it is to be realistic.
You can play with up to 4 friends on one PC, racing against each other or just try to beat the computer.</p>
<p>See the great lighthouse or drive through the sand and visit the pyramids. Race underground or in space,
watching the stars passing by. Have some rest under the palms on the beach (watching the other karts
overtaking you :) ). But don't eat the bananas! Watch for bowling balls, plungers, bubble gum and cakes thrown by opponents.</p>
<p>You can do a single race against other karts, compete in one of several Grand Prix, try to beat the high score in time trials
on your own, play battle mode against your friends, and more!</p>
</description>
<screenshots>
<screenshot type="default" width="1280" height="768">http://supertuxkart.sourceforge.net/persistent/images/7/7a/Supertuxkart-0.8.1-screenshot-1.png</screenshot>
</screenshots>
<url type="homepage">http://supertuxkart.sourceforge.net</url>
<updatecontact> supertuxkart-devel@lists.sourceforge.net</updatecontact>
<project_group>SuperTuxKart</project_group>
</application>

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Apr 22 07:52:34 UTC 2015 - dimstar@opensuse.org
- Update to version 0.9:
+ An immense amount of work went into the big release. Most
noteworthy are:
- A new rendering engine. It is still based on irrlich, but now
uses a modern OpenGL shader based backend.
- This release contains two completely new designed
high-quality tracks.
- Drop supertuxkart.appdata.xml: it's now shipped by upstream.
- Drop upstream resolved patches:
+ 0001-fix_opengl_driver.patch
+ 0002-fix_implicit_definitions.patch
+ supertuxkart-cmake-3.2.patch
-------------------------------------------------------------------
Mon Mar 23 18:36:31 UTC 2015 - dimstar@opensuse.org

View File

@ -17,30 +17,27 @@
Name: supertuxkart
Version: 0.8.1
Version: 0.9
Release: 0
Summary: A 3D kart racing game
License: GPL-2.0+ and GPL-3.0+ and CC-BY-SA-3.0
Group: Amusements/Games/3D/Race
Url: http://supertuxkart.sourceforge.net/
Source: http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/%{version}/%{name}-%{version}-src.tar.bz2
Source: http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/%{version}/%{name}-%{version}-src.tar.xz
# Geeko kart add-on (CC-BY 3.0)
Source1: http://stkaddons.net/dl/14e6ba25b17f0d.zip
# appdata file, to show in gnome-software
Source2: supertuxkart.appdata.xml
# PATCH-FIX-UPSTREAM 0001-fix_opengl_driver.patch sfalken@opensuse.org -- Patch to fix building against Mesa >10.0
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
BuildRequires: fdupes
BuildRequires: fribidi-devel
BuildRequires: gcc-c++
BuildRequires: glu-devel
BuildRequires: hicolor-icon-theme
BuildRequires: libXrandr-devel
BuildRequires: libjpeg-devel
BuildRequires: libogg-devel
BuildRequires: libpng-devel
%if 0%{?suse_version} <= 1220
BuildRequires: libopenal1
%endif
@ -75,22 +72,12 @@ BuildArch: noarch
Data files for SuperTuxKart a Free 3d kart racing game.
%prep
%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/
fi
%setup -q
find -name '*~' -delete -print
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
# We need an internal version of Irrlicht...
pushd lib/irrlicht/source/Irrlicht
NDEBUG=1 make %{?_smp_mflags}
popd
mkdir cmake_build
cd cmake_build
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} ..
@ -102,19 +89,24 @@ make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_datadir}/supertuxkart/data/karts/geeko/
cd %{buildroot}%{_datadir}/supertuxkart/data/karts/geeko/
unzip %{SOURCE1}
mkdir -p %{buildroot}%{_datadir}/appdata/
cp %{S:2} %{buildroot}%{_datadir}/appdata/
%fdupes %{buildroot}%{_datadir}
%suse_update_desktop_file supertuxkart
%post
%icon_theme_cache_post
%postun
%icon_theme_cache_postun
%files
%defattr(-,root,root)
%doc AUTHORS COPYING README TODO ChangeLog
%doc AUTHORS COPYING README.md TODO.md CHANGELOG.md
%{_bindir}/supertuxkart
%dir %{_datadir}/appdata
%{_datadir}/appdata/supertuxkart.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}_*.png
%{_datadir}/icons/hicolor/
%files data
%defattr(-,root,root)