Update to supertuxkart 0.7.3.

This commit is contained in:
pascal 2012-11-22 11:54:06 +00:00
parent b96720bc4f
commit cccc3440b4
9 changed files with 851 additions and 374 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.7 2011/05/08 20:14:54 kili Exp $
# $OpenBSD: Makefile,v 1.8 2012/11/22 11:54:06 pascal Exp $
COMMENT = kart racing game with OSS mascots
BASENAME = supertuxkart-0.7
BASENAME = supertuxkart-0.7.3
DISTNAME = ${BASENAME}-src
PKGNAME = ${BASENAME}
@ -12,44 +12,31 @@ HOMEPAGE = http://supertuxkart.sourceforge.net
MAINTAINER = Pascal Stumpf <Pascal.Stumpf@cubes.de>
# GPLv3
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL GLU Irrlicht SDL X11 Xi Xmu c fribidi m ogg openal \
pthread stdc++ vorbis vorbisfile glut
WANTLIB += GL GLU ICE Irrlicht SM X11 Xext Xxf86vm c curl fribidi
WANTLIB += m ogg openal pthread stdc++ vorbis vorbisfile
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=supertuxkart/SuperTuxKart/}
EXTRACT_SUFX = .tar.bz2
MODULES = devel/gettext
MODULES = devel/cmake
CONFIGURE_ARGS += -DIRRLICHT_DIR="${LOCALBASE}" -DX11BASE="${X11BASE}"
RUN_DEPENDS = devel/desktop-file-utils
LIB_DEPENDS = devel/sdl \
graphics/freeglut \
audio/openal>=0.0.8p7 \
LIB_DEPENDS = audio/openal>=0.0.8p7 \
audio/libvorbis \
x11/irrlicht \
devel/fribidi
x11/irrlicht>=1.8 \
devel/fribidi \
net/curl
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --with-libintl-prefix=${LOCALBASE} \
--with-libiconv-prefix=${LOCALBASE} \
--with-irrlicht=${LOCALBASE}
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -liconv \
-lGL -lGLU -lIrrlicht -lSDL -lXi -lXmu -lX11 \
-lglut -lm -logg -pthread -lvorbis -lvorbisfile"
WRKDIST = ${WRKDIR}/${BASENAME}
pre-configure:
find ${WRKSRC} -name Makefile.in | xargs perl -pi \
-e 's,\$\(datadir\)/games,\$\(datadir\),g;' \
-e 's,\$\(prefix\)/games,\$\(prefix\)/bin,g'
.include <bsd.port.mk>

View File

@ -1,5 +1,2 @@
MD5 (supertuxkart-0.7-src.tar.bz2) = KAbyceTTf+5a2MoWbhrUiQ==
RMD160 (supertuxkart-0.7-src.tar.bz2) = rrLbeSC6EKQiGkwf6j/E6/PV714=
SHA1 (supertuxkart-0.7-src.tar.bz2) = DULD7CBBCRkTbSf2OfhT8/Zl07Y=
SHA256 (supertuxkart-0.7-src.tar.bz2) = GFQ8SwxIxJUu/gds+c2xO9/DgbwvJJ65tBthGXA1AAY=
SIZE (supertuxkart-0.7-src.tar.bz2) = 110770427
SHA256 (supertuxkart-0.7.3-src.tar.bz2) = B/tUY+ZxhZ2HmCHF4G6svEGLqAZdpon1ajgu6LHQWVo=
SIZE (supertuxkart-0.7.3-src.tar.bz2) = 109494448

View File

@ -0,0 +1,54 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2012/11/22 11:54:06 pascal Exp $
--- CMakeLists.txt.orig Tue Nov 15 00:52:19 2011
+++ CMakeLists.txt Fri Nov 9 19:47:21 2012
@@ -48,8 +48,11 @@ endif()
# Set lib paths
if(APPLE)
# nothing to add
-elseif(UNIX)
+elseif(LINUX)
link_directories("${IRRLICHT_DIR}/lib/Linux")
+elseif(UNIX)
+ link_directories("${X11BASE}/lib")
+ link_directories("${IRRLICHT_DIR}/lib")
elseif(MSVC)
link_directories("${IRRLICHT_DIR}/lib/Win32-visualstudio")
else()
@@ -682,7 +685,7 @@ if (APPLE)
else()
- add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/share/games/supertuxkart\")
+ add_definitions(-DSUPERTUXKART_DATADIR=\"${CMAKE_INSTALL_PREFIX}/share/supertuxkart\")
# Build the final executable
add_executable(supertuxkart ${SRCS})
@@ -696,7 +699,9 @@ else()
${CURL_LIBRARIES}
${OPENGL_LIBRARIES}
${OPENAL_LIBRARY}
- vorbisfile)
+ vorbisfile
+ vorbis
+ ogg)
endif()
if(USE_FRIBIDI)
@@ -751,7 +756,7 @@ MACRO(installfilemacro filepath)
if(source_path)
string(REGEX REPLACE "${source_regex}" "\\2" after_source "${source_path}")
get_filename_component(install_location ${after_source} PATH)
- install(FILES ${filepath} DESTINATION "share/games/supertuxkart/data/${install_location}")
+ install(FILES ${filepath} DESTINATION "share/supertuxkart/data/${install_location}")
endif(source_path)
endif()
ENDMACRO(installfilemacro)
@@ -762,7 +767,7 @@ foreach(curr ${datafiles})
endforeach()
-install(TARGETS supertuxkart RUNTIME DESTINATION games BUNDLE DESTINATION .)
+install(TARGETS supertuxkart RUNTIME DESTINATION bin BUNDLE DESTINATION .)
install(FILES data/supertuxkart.desktop DESTINATION share/applications)
install(FILES data/supertuxkart_32.xpm data/supertuxkart_64.xpm DESTINATION share/pixmaps)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_bullet_src_BulletDynamics_ConstraintSolver_btOdeQuickstepConstraintSolver_cpp,v 1.2 2011/05/08 20:14:54 kili Exp $
--- src/bullet/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp.orig Mon Dec 20 22:46:14 2010
+++ src/bullet/src/BulletDynamics/ConstraintSolver/btOdeQuickstepConstraintSolver.cpp Sat May 7 12:50:45 2011
@@ -45,7 +45,7 @@ subject to the following restrictions:
#if defined (WIN32)
#include <malloc.h>
#else
-#if defined (__FreeBSD__) || defined (__NetBSD__)
+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
#include <stdlib.h>
#else
#include <alloca.h>

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_bullet_src_BulletDynamics_ConstraintSolver_btSorLcp_cpp,v 1.2 2011/05/08 20:14:54 kili Exp $
--- src/bullet/src/BulletDynamics/ConstraintSolver/btSorLcp.cpp.orig Mon Dec 20 22:46:14 2010
+++ src/bullet/src/BulletDynamics/ConstraintSolver/btSorLcp.cpp Sat May 7 12:50:45 2011
@@ -36,7 +36,7 @@ subject to the following restrictions:
#if defined (WIN32)
#include <malloc.h>
#else
-#if defined (__FreeBSD__) || defined (__NetBSD__)
+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__)
#include <stdlib.h>
#else
#include <alloca.h>

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-src_graphics_material_cpp,v 1.1 2012/11/22 11:54:06 pascal Exp $
--- src/graphics/material.cpp.orig Fri Nov 9 13:36:08 2012
+++ src/graphics/material.cpp Fri Nov 9 13:36:29 2012
@@ -512,7 +512,7 @@ void Material::setMaterialProperties(video::SMaterial
// customizable EMT_ONETEXTURE_BLEND instead
m->MaterialType = video::EMT_ONETEXTURE_BLEND ;
m->MaterialTypeParam =
- pack_texureBlendFunc(video::EBF_SRC_ALPHA,
+ pack_textureBlendFunc(video::EBF_SRC_ALPHA,
video::EBF_ONE_MINUS_SRC_ALPHA,
video::EMFN_MODULATE_1X,
video::EAS_TEXTURE | video::EAS_VERTEX_COLOR);
@@ -539,7 +539,7 @@ void Material::setMaterialProperties(video::SMaterial
// account, which messes up fading in/out effects. So we use the
// more customizable EMT_ONETEXTURE_BLEND instead
m->MaterialType = video::EMT_ONETEXTURE_BLEND ;
- m->MaterialTypeParam = pack_texureBlendFunc(video::EBF_SRC_ALPHA,
+ m->MaterialTypeParam = pack_textureBlendFunc(video::EBF_SRC_ALPHA,
video::EBF_ONE,
video::EMFN_MODULATE_1X,
video::EAS_TEXTURE |

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_guiengine_widgets_CGUIEditBox_cpp,v 1.1 2012/11/22 11:54:06 pascal Exp $
http://supertuxkart.svn.sourceforge.net/viewvc/supertuxkart/main/trunk/src/guiengine/widgets/CGUIEditBox.cpp?r1=8315&r2=10229
--- src/guiengine/widgets/CGUIEditBox.cpp.orig Fri Nov 9 18:24:27 2012
+++ src/guiengine/widgets/CGUIEditBox.cpp Fri Nov 9 18:24:39 2012
@@ -115,7 +115,7 @@ void CGUIEditBox::setOverrideColor(video::SColor color
}
-video::SColor const& CGUIEditBox::getOverrideColor() const
+video::SColor CGUIEditBox::getOverrideColor() const
{
return OverrideColor;
}

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_guiengine_widgets_CGUIEditBox_h,v 1.1 2012/11/22 11:54:06 pascal Exp $
http://supertuxkart.svn.sourceforge.net/viewvc/supertuxkart/main/trunk/src/guiengine/widgets/CGUIEditBox.h?r1=9885&r2=10229
--- src/guiengine/widgets/CGUIEditBox.h.orig Fri Nov 9 13:51:50 2012
+++ src/guiengine/widgets/CGUIEditBox.h Fri Nov 9 13:51:57 2012
@@ -36,7 +36,7 @@ using namespace gui;
virtual void setOverrideColor(video::SColor color);
//! Gets the override color
- virtual video::SColor const & getOverrideColor() const;
+ virtual video::SColor getOverrideColor() const;
//! Sets if the text should use the overide color or the
//! color in the gui skin.

File diff suppressed because it is too large Load Diff