r15643 - in packages/trunk/supertuxkart/debian: . patches
Vincent Cheng
vcheng at moszumanska.debian.org
Mon Dec 21 22:23:38 UTC 2015
Author: vcheng
Date: 2015-12-21 22:23:38 +0000 (Mon, 21 Dec 2015)
New Revision: 15643
Removed:
packages/trunk/supertuxkart/debian/patches/support_windowed_mode_when_xrandr_not_available.patch
Modified:
packages/trunk/supertuxkart/debian/changelog
packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch
packages/trunk/supertuxkart/debian/patches/series
Log:
supertuxkart: refresh patches
Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog 2015-12-21 21:55:46 UTC (rev 15642)
+++ packages/trunk/supertuxkart/debian/changelog 2015-12-21 22:23:38 UTC (rev 15643)
@@ -1,6 +1,8 @@
-supertuxkart (0.9.1-1) UNRELEASED; urgency=medium
+supertuxkart (0.9.1-1) unstable; urgency=medium
* New upstream release. (Closes: #808355)
+ - Drop support_windowed_mode_when_xrandr_not_available.patch, applied
+ upstream; refresh remaining patches.
* Remove debian/menu file as per tech-ctte decision in #741573.
-- Vincent Cheng <vcheng at debian.org> Mon, 21 Dec 2015 13:51:09 -0800
Modified: packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch 2015-12-21 21:55:46 UTC (rev 15642)
+++ packages/trunk/supertuxkart/debian/patches/build_against_system_enet.patch 2015-12-21 22:23:38 UTC (rev 15643)
@@ -5,7 +5,7 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -60,9 +60,9 @@
+@@ -62,9 +62,9 @@
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/bullet")
include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src")
@@ -18,14 +18,14 @@
# Build glew library
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew")
-@@ -307,11 +307,11 @@
+@@ -331,11 +331,11 @@
bulletdynamics
bulletcollision
bulletmath
- enet
glew
stkirrlicht
- angelscript
+ ${Angelscript_LIBRARIES}
${CURL_LIBRARIES}
+ ${ENET_LIBRARIES}
${OGGVORBIS_LIBRARIES}
Modified: packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch 2015-12-21 21:55:46 UTC (rev 15642)
+++ packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch 2015-12-21 22:23:38 UTC (rev 15643)
@@ -3,47 +3,38 @@
Author: James Cowgill <james410 at cowgill.org.uk>,
Vincent Cheng <vcheng at debian.org>
Bug: https://github.com/supertuxkart/stk-code/issues/2194
-Last-Update: 2015-06-03
+Last-Update: 2015-12-21
--- a/lib/angelscript/projects/cmake/CMakeLists.txt
+++ b/lib/angelscript/projects/cmake/CMakeLists.txt
-@@ -45,12 +45,13 @@
- endif()
+@@ -102,12 +102,12 @@
+ endif()
endif()
-if(ANDROID)
+if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
- enable_language(ASM)
- if(CMAKE_ASM_COMPILER_WORKS)
- set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
-+ set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
- else()
-- message(FATAL ERROR "Android target requires a working assembler")
-+ message(FATAL ERROR "ARM target requires a working assembler")
- endif(CMAKE_ASM_COMPILER_WORKS)
+ enable_language(ASM)
+ if(CMAKE_ASM_COMPILER_WORKS)
+- set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
++ set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
+ else()
+- message(FATAL ERROR "Android target requires a working assembler")
++ message(FATAL ERROR "ARM target requires a working assembler")
+ endif()
endif()
--- a/lib/angelscript/source/as_config.h
+++ b/lib/angelscript/source/as_config.h
-@@ -555,7 +555,7 @@
- // Use the following command to determine predefined macros: echo . | g++ -dM -E -
- #if (defined(__GNUC__) && !defined(__SNC__)) || defined(EPPC) || defined(__CYGWIN__) // JWC -- use this instead for Wii
- #define GNU_STYLE_VIRTUAL_METHOD
--#if !defined( __amd64__ )
-+#if !defined(__LP64__)
- #define MULTI_BASE_OFFSET(x) (*((asDWORD*)(&x)+1))
- #else
- #define MULTI_BASE_OFFSET(x) (*((asQWORD*)(&x)+1))
-@@ -785,7 +785,7 @@
- // Support native calling conventions on Intel 32bit CPU
+@@ -835,7 +835,7 @@
#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
#define AS_X86
+ #undef AS_NO_THISCALL_FUNCTOR_METHOD
- #elif defined(__LP64__) && !defined(__arm64__)
+ #elif defined(__x86_64__)
#define AS_X64_GCC
+ #undef AS_NO_THISCALL_FUNCTOR_METHOD
#define HAS_128_BIT_PRIMITIVES
- #define SPLIT_OBJS_BY_MEMBER_TYPES
-@@ -794,7 +794,7 @@
+@@ -845,7 +845,7 @@
// STDCALL is not available on 64bit Linux
#undef STDCALL
#define STDCALL
@@ -51,7 +42,7 @@
+ #elif (defined(__ARMEL__) || defined(__arm__)) && !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__))
#define AS_ARM
- #undef STDCALL
+ // TODO: The stack unwind on exceptions currently fails due to the assembler code in as_callfunc_arm_gcc.S
--- a/lib/angelscript/source/as_callfunc_arm_gcc.S
+++ b/lib/angelscript/source/as_callfunc_arm_gcc.S
@@ -85,7 +85,12 @@
@@ -137,7 +128,7 @@
mov lr, pc
mov pc, r4
#else
-@@ -520,7 +545,7 @@
+@@ -521,7 +546,7 @@
mov sp, r12
nomoreargsarmFuncR0ObjLast:
@@ -146,7 +137,7 @@
mov lr, pc
mov pc, r4
#else
-@@ -596,7 +621,7 @@
+@@ -597,7 +622,7 @@
mov sp, r12
nomoreargsarmFuncR0:
@@ -155,7 +146,7 @@
mov lr, pc
mov pc, r4
#else
-@@ -676,7 +701,7 @@
+@@ -677,7 +702,7 @@
mov sp, r12
nomoreargsarmFuncR0R1:
Modified: packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch 2015-12-21 21:55:46 UTC (rev 15642)
+++ packages/trunk/supertuxkart/debian/patches/link_against_system_libs.patch 2015-12-21 22:23:38 UTC (rev 15643)
@@ -5,7 +5,7 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -315,6 +315,11 @@
+@@ -339,6 +339,11 @@
${OGGVORBIS_LIBRARIES}
${OPENAL_LIBRARY}
${OPENGL_LIBRARIES}
Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series 2015-12-21 21:55:46 UTC (rev 15642)
+++ packages/trunk/supertuxkart/debian/patches/series 2015-12-21 22:23:38 UTC (rev 15643)
@@ -2,7 +2,6 @@
link_against_system_libs.patch
remove_irrlicht_embedded_libs.patch
fix_angelscript_build_on_non-x86_arches.patch
-support_windowed_mode_when_xrandr_not_available.patch
# Irrlicht patches taken directly from irrlicht source package in Debian
irrlicht/arch-support.diff
irrlicht/use-system-libs.diff
Deleted: packages/trunk/supertuxkart/debian/patches/support_windowed_mode_when_xrandr_not_available.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/support_windowed_mode_when_xrandr_not_available.patch 2015-12-21 21:55:46 UTC (rev 15642)
+++ packages/trunk/supertuxkart/debian/patches/support_windowed_mode_when_xrandr_not_available.patch 2015-12-21 22:23:38 UTC (rev 15643)
@@ -1,98 +0,0 @@
-From f019f8622c93e57c12c0763dba44416c580f85a7 Mon Sep 17 00:00:00 2001
-From: deve <deveee at gmail.com>
-Date: Mon, 4 May 2015 11:09:53 +0200
-Subject: [PATCH] Make sure that window size is larger than 0
-
----
- src/graphics/irr_driver.cpp | 36 ++++++++++++++++++++++++------------
- 1 file changed, 24 insertions(+), 12 deletions(-)
-
-diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
-index 9260891..d3409f2 100644
---- a/src/graphics/irr_driver.cpp
-+++ b/src/graphics/irr_driver.cpp
-@@ -109,7 +109,7 @@ IrrDriver::IrrDriver()
- m_phase = SOLID_NORMAL_AND_DEPTH_PASS;
- m_device = createDevice(video::EDT_NULL,
- irr::core::dimension2d<u32>(640, 480),
-- /*bits*/16U, /**fullscreen*/ false,
-+ /*bits*/16U, /**fullscreen*/ false,
- /*stencilBuffer*/ false,
- /*vsync*/false,
- /*event receiver*/ NULL,
-@@ -349,8 +349,13 @@ void IrrDriver::initDevice()
-
- video::IVideoModeList* modes = m_device->getVideoModeList();
- const core::dimension2d<u32> ssize = modes->getDesktopResolution();
-- if (UserConfigParams::m_width > (int)ssize.Width ||
-- UserConfigParams::m_height > (int)ssize.Height)
-+
-+ if (ssize.Width < 1 || ssize.Height < 1)
-+ {
-+ Log::warn("irr_driver", "Unknown desktop resolution.");
-+ }
-+ else if (UserConfigParams::m_width > (int)ssize.Width ||
-+ UserConfigParams::m_height > (int)ssize.Height)
- {
- Log::warn("irr_driver", "The window size specified in "
- "user config is larger than your screen!");
-@@ -358,13 +363,13 @@ void IrrDriver::initDevice()
- UserConfigParams::m_height = (int)ssize.Height;
- }
-
-- core::dimension2d<u32> res = core::dimension2du(UserConfigParams::m_width,
-- UserConfigParams::m_height);
--
- if (UserConfigParams::m_fullscreen)
- {
- if (modes->getVideoModeCount() > 0)
- {
-+ core::dimension2d<u32> res = core::dimension2du(
-+ UserConfigParams::m_width,
-+ UserConfigParams::m_height);
- res = modes->getVideoModeResolution(res, res);
-
- UserConfigParams::m_width = res.Width;
-@@ -372,13 +377,20 @@ void IrrDriver::initDevice()
- }
- else
- {
-- Log::verbose("irr_driver", "Cannot get information about "
-- "resolutions. Try to use the default one.");
-- UserConfigParams::m_width = MIN_SUPPORTED_WIDTH;
-- UserConfigParams::m_height = MIN_SUPPORTED_HEIGHT;
-+ Log::warn("irr_driver", "Cannot get information about "
-+ "resolutions. Disable fullscreen.");
-+ UserConfigParams::m_fullscreen = false;
- }
- }
-
-+ if (UserConfigParams::m_width < 1 || UserConfigParams::m_height < 1)
-+ {
-+ Log::warn("irr_driver", "Invalid window size. "
-+ "Try to use the default one.");
-+ UserConfigParams::m_width = MIN_SUPPORTED_WIDTH;
-+ UserConfigParams::m_height = MIN_SUPPORTED_HEIGHT;
-+ }
-+
- m_device->closeDevice();
- m_video_driver = NULL;
- m_gui_env = NULL;
-@@ -703,7 +715,7 @@ bool IrrDriver::moveWindow(int x, int y)
- }
- #elif defined(__linux__) && !defined(ANDROID)
- const video::SExposedVideoData& videoData = m_video_driver->getExposedVideoData();
--
-+
- Display* display = (Display*)videoData.OpenGLLinux.X11Display;
- int screen = DefaultScreen(display);
- int screen_w = DisplayWidth(display, screen);
-@@ -713,7 +725,7 @@ bool IrrDriver::moveWindow(int x, int y)
- {
- x = screen_w - UserConfigParams::m_width;
- }
--
-+
- if (y + UserConfigParams::m_height > screen_h)
- {
- y = screen_h - UserConfigParams::m_height;
More information about the Pkg-games-commits
mailing list