Update to 0.9.2, from David CARLIER, thanks!

This commit is contained in:
pascal 2016-08-05 23:27:27 +00:00
parent 35106b6285
commit c924d651c8
7 changed files with 498 additions and 210 deletions

View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.19 2016/05/07 12:40:57 pascal Exp $
# $OpenBSD: Makefile,v 1.20 2016/08/05 23:27:27 pascal Exp $
ONLY_FOR_ARCHS = amd64 i386 powerpc
COMMENT = kart racing game with OSS mascots
V = 0.9.1
V = 0.9.2
BASENAME = supertuxkart-${V}
DISTNAME = ${BASENAME}-src
PKGNAME = ${BASENAME}
REVISION = 0
CATEGORIES = games

View File

@ -1,2 +1,2 @@
SHA256 (supertuxkart-0.9.1-src.tar.xz) = xQ8Apx3xZfthPSDoa+otnV5R7T4n4dQ2+6w7B88uoUk=
SIZE (supertuxkart-0.9.1-src.tar.xz) = 425822808
SHA256 (supertuxkart-0.9.2-src.tar.xz) = CwgLsJiiattVLW/UiQW8trHoc+8VZ0V9cmjX06qkgoI=
SIZE (supertuxkart-0.9.2-src.tar.xz) = 501606188

View File

@ -1,21 +1,29 @@
$OpenBSD: patch-lib_angelscript_source_as_callfunc_x64_gcc_cpp,v 1.1 2015/11/29 07:46:29 pascal Exp $
--- lib/angelscript/source/as_callfunc_x64_gcc.cpp.orig Sat Nov 7 11:50:18 2015
+++ lib/angelscript/source/as_callfunc_x64_gcc.cpp Sat Nov 7 12:24:20 2015
@@ -79,8 +79,6 @@ static asQWORD __attribute__((noinline)) X64_CallFunct
$OpenBSD: patch-lib_angelscript_source_as_callfunc_x64_gcc_cpp,v 1.2 2016/08/05 23:27:27 pascal Exp $
--- lib/angelscript/source/as_callfunc_x64_gcc.cpp.orig Thu May 12 01:31:36 2016
+++ lib/angelscript/source/as_callfunc_x64_gcc.cpp Fri Jul 1 05:07:28 2016
@@ -79,12 +79,6 @@ static asQWORD __attribute__((noinline)) X64_CallFunct
// Backup stack pointer in R15 that is guaranteed to maintain its value over function calls
" movq %%rsp, %%r15 \n"
-#ifdef __OPTIMIZE__
- // Make sure the stack unwind logic knows we've backed up the stack pointer in register r15
- // This should only be done if any optimization is done. If no optimization (-O0) is used,
- // then the compiler already backups the rsp before entering the inline assembler code
- " .cfi_def_cfa_register r15 \n"
-#endif
// Skip the first 128 bytes on the stack frame, called "red zone",
// that might be used by the compiler to store temporary values
@@ -132,8 +130,6 @@ static asQWORD __attribute__((noinline)) X64_CallFunct
@@ -136,12 +130,6 @@ static asQWORD __attribute__((noinline)) X64_CallFunct
// Restore stack pointer
" mov %%r15, %%rsp \n"
-#ifdef __OPTIMIZE__
- // Inform the stack unwind logic that the stack pointer has been restored
- // This should only be done if any optimization is done. If no optimization (-O0) is used,
- // then the compiler already backups the rsp before entering the inline assembler code
- " .cfi_def_cfa_register rsp \n"
-#endif
// Put return value in retQW1 and retQW2, using either RAX:RDX or XMM0:XMM1 depending on type of return value
" movl %5, %%ecx \n"

View File

@ -1,18 +1,18 @@
$OpenBSD: patch-lib_irrlicht_CMakeLists_txt,v 1.2 2015/04/30 22:29:49 pascal Exp $
--- lib/irrlicht/CMakeLists.txt.orig Wed Apr 1 03:51:45 2015
+++ lib/irrlicht/CMakeLists.txt Mon Apr 6 21:41:20 2015
$OpenBSD: patch-lib_irrlicht_CMakeLists_txt,v 1.3 2016/08/05 23:27:27 pascal Exp $
--- lib/irrlicht/CMakeLists.txt.orig Thu May 12 01:31:36 2016
+++ lib/irrlicht/CMakeLists.txt Fri Jul 1 05:03:52 2016
@@ -25,8 +25,8 @@ elseif(MINGW)
add_definitions(-D_IRR_STATIC_LIB_)
add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
else()
- set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing -fexpensive-optimizations -I/usr/X11R6/include")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing -fexpensive-optimizations -I/usr/X11R6/include")
+ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -fno-exceptions -fstrict-aliasing -fexpensive-optimizations -I/usr/X11R6/include")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -fno-exceptions -fstrict-aliasing -fexpensive-optimizations -I/usr/X11R6/include")
endif()
# Xrandr
@@ -35,7 +35,7 @@ if(UNIX AND USE_XRANDR)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing -I/usr/X11R6/include")
- set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing -I/usr/X11R6/include")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -fno-exceptions -fstrict-aliasing -I/usr/X11R6/include")
+ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -fno-exceptions -fstrict-aliasing -I/usr/X11R6/include")
if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexpensive-optimizations")
endif()
@@ -41,7 +41,7 @@ if(UNIX AND USE_XRANDR)
add_definitions(-D_IRR_LINUX_X11_RANDR_)
endif()

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-lib_irrlicht_source_Irrlicht_COSOperator_cpp,v 1.2 2015/04/30 22:29:49 pascal Exp $
--- lib/irrlicht/source/Irrlicht/COSOperator.cpp.orig Wed Apr 1 03:51:46 2015
+++ lib/irrlicht/source/Irrlicht/COSOperator.cpp Mon Apr 6 21:37:59 2015
@@ -12,6 +12,7 @@
#include <string.h>
#include <unistd.h>
#if !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__CYGWIN__)
+#include <sys/param.h>
#include <sys/types.h>
#include <sys/sysctl.h>
#endif

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-lib_irrlicht_source_Irrlicht_os_cpp,v 1.2 2015/05/01 16:00:44 ajacoutot Exp $
--- lib/irrlicht/source/Irrlicht/os.cpp.orig Thu Dec 13 12:16:50 2012
+++ lib/irrlicht/source/Irrlicht/os.cpp Thu Dec 13 12:17:44 2012
@@ -22,10 +22,14 @@
#include <libkern/OSByteOrder.h>
#define bswap_16(X) OSReadSwapInt16(&X,0)
#define bswap_32(X) OSReadSwapInt32(&X,0)
-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
+#elif defined(__FreeBSD__)
#include <sys/endian.h>
#define bswap_16(X) bswap16(X)
#define bswap_32(X) bswap32(X)
+#elif defined(__OpenBSD__)
+ #include <endian.h>
+ #define bswap_16(x) letoh16(x)
+ #define bswap_32(x) letoh32(x)
#elif !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__PPC__) && !defined(_IRR_WINDOWS_API_)
#include <byteswap.h>
#else

File diff suppressed because it is too large Load Diff