r15832 - in packages/trunk/supertuxkart/debian: . patches
Vincent Cheng
vcheng at moszumanska.debian.org
Fri Jul 8 06:48:52 UTC 2016
Author: vcheng
Date: 2016-07-08 06:48:52 +0000 (Fri, 08 Jul 2016)
New Revision: 15832
Removed:
packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
packages/trunk/supertuxkart/debian/patches/srgb_workaround.patch
Modified:
packages/trunk/supertuxkart/debian/changelog
packages/trunk/supertuxkart/debian/patches/series
Log:
supertuxkart: remove obsolete patches
Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog 2016-07-08 06:43:33 UTC (rev 15831)
+++ packages/trunk/supertuxkart/debian/changelog 2016-07-08 06:48:52 UTC (rev 15832)
@@ -2,6 +2,8 @@
* New upstream release.
- Fix FTBFS with gcc 6. (Closes: #811724)
+ - Drop patches fix_angelscript_build_on_non-x86_arches.patch and
+ srgb_workaround.patch; applied upstream.
-- Vincent Cheng <vcheng at debian.org> Thu, 07 Jul 2016 23:40:10 -0700
Deleted: 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 2016-07-08 06:43:33 UTC (rev 15831)
+++ packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch 2016-07-08 06:48:52 UTC (rev 15832)
@@ -1,157 +0,0 @@
-Description: Fix FTBFS when building angelscript on non-x86 arches
-Forwarded: https://github.com/supertuxkart/stk-code/pull/2211
-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-12-21
-
---- a/lib/angelscript/projects/cmake/CMakeLists.txt
-+++ b/lib/angelscript/projects/cmake/CMakeLists.txt
-@@ -102,12 +102,13 @@
- 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()
- endif()
-
---- a/lib/angelscript/source/as_config.h
-+++ b/lib/angelscript/source/as_config.h
-@@ -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
-@@ -845,7 +845,7 @@
- // STDCALL is not available on 64bit Linux
- #undef STDCALL
- #define STDCALL
-- #elif defined(__ARMEL__) || defined(__arm__)
-+ #elif (defined(__ARMEL__) || defined(__arm__)) && !(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__))
- #define AS_ARM
-
- // 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 @@
- bne stackargsloop
- mov sp, r12
- nomoreargs:
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+ mov lr, pc /* older ARM didn't support blx */
-+ mov pc, r4
-+#else
- blx r4
-+#endif
- add sp, sp, r8
- ldmia sp!, {r4-r8, pc}
-
-@@ -133,7 +138,12 @@
- bne stackargslooparmFuncObjLast
- mov sp, r12
- nomoreargsarmFuncObjLast:
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+ mov lr, pc /* older ARM didn't support blx */
-+ mov pc, r4
-+#else
- blx r4
-+#endif
- add sp, sp, r8
- ldmia sp!, {r4-r8, pc}
-
-@@ -180,7 +190,12 @@
- bne stackargslooparmFuncR0ObjLast
- mov sp, r12
- nomoreargsarmFuncR0ObjLast:
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+ mov lr, pc /* older ARM didn't support blx */
-+ mov pc, r4
-+#else
- blx r4
-+#endif
- add sp, sp, r8
- ldmia sp!, {r4-r8, pc}
-
-@@ -218,7 +233,12 @@
- bne stackargslooparmFuncR0
- mov sp, r12
- nomoreargsarmFuncR0:
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+ mov lr, pc /* older ARM didn't support blx */
-+ mov pc, r4
-+#else
- blx r4
-+#endif
- add sp, sp, r8
- ldmia sp!, {r4-r8, pc}
-
-@@ -255,7 +275,12 @@
- bne stackargslooparmFuncR0R1
- mov sp, r12
- nomoreargsarmFuncR0R1:
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+ mov lr, pc /* older ARM didn't support blx */
-+ mov pc, r4
-+#else
- blx r4
-+#endif
- add sp, sp, r8
- ldmia sp!, {r4-r8, pc}
-
-@@ -340,7 +365,7 @@
- mov sp, r12
-
- nomoreargs:
--#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
- mov lr, pc /* older ARM didn't support blx */
- mov pc, r4
- #else
-@@ -427,7 +452,7 @@
- mov sp, r12
-
- nomoreargsarmFuncObjLast:
--#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
- mov lr, pc
- mov pc, r4
- #else
-@@ -521,7 +546,7 @@
- mov sp, r12
-
- nomoreargsarmFuncR0ObjLast:
--#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
- mov lr, pc
- mov pc, r4
- #else
-@@ -597,7 +622,7 @@
- mov sp, r12
-
- nomoreargsarmFuncR0:
--#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
- mov lr, pc
- mov pc, r4
- #else
-@@ -677,7 +702,7 @@
- mov sp, r12
-
- nomoreargsarmFuncR0R1:
--#if defined (___ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
-+#if defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_4__)
- mov lr, pc
- mov pc, r4
- #else
Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series 2016-07-08 06:43:33 UTC (rev 15831)
+++ packages/trunk/supertuxkart/debian/patches/series 2016-07-08 06:48:52 UTC (rev 15832)
@@ -1,8 +1,6 @@
build_against_system_enet.patch
link_against_system_libs.patch
remove_irrlicht_embedded_libs.patch
-fix_angelscript_build_on_non-x86_arches.patch
-srgb_workaround.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/srgb_workaround.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/srgb_workaround.patch 2016-07-08 06:43:33 UTC (rev 15831)
+++ packages/trunk/supertuxkart/debian/patches/srgb_workaround.patch 2016-07-08 06:48:52 UTC (rev 15832)
@@ -1,168 +0,0 @@
-Description: Workaround for darker screen on Intel GPUs with mesa >= 10.6
-Origin: upstream, https://github.com/supertuxkart/stk-code/issues/2190
-Bug-Debian: https://bugs.debian.org/808857
-Last-Update: 2015-12-23
-
-diff --git a/data/graphical_restrictions.xml b/data/graphical_restrictions.xml
-index 16bb607..b2480dc 100644
---- a/data/graphical_restrictions.xml
-+++ b/data/graphical_restrictions.xml
-@@ -4,6 +4,7 @@
- <card is="Intel(R) HD Graphics 3000" os="windows" disable="AdvancedPipeline"/>
- <card is="Intel(R) HD Graphics 3000" os="windows" disable="FramebufferSRGBWorking"/>
- <card contains="Intel" os="osx" disable="GI"/>
-+ <card contains="Intel" os="linux" disable="FramebufferSRGBCapable"/>
- <card contains="Intel" disable="TextureCompressionS3TC"/>
- <card contains="Intel" os="windows" disable="HighDefinitionTextures"/>
- <card contains="NVIDIA" os="windows" version="<344.65" disable="BufferStorage"/>
-diff --git a/src/graphics/central_settings.cpp b/src/graphics/central_settings.cpp
-index 719e7f4..2eace45 100644
---- a/src/graphics/central_settings.cpp
-+++ b/src/graphics/central_settings.cpp
-@@ -46,10 +46,11 @@ void CentralVideoSettings::init()
- hasTextureCompression = false;
- hasUBO = false;
- hasGS = false;
-- m_GI_has_artifact = false;
-
-+ m_GI_has_artifact = false;
- m_need_rh_workaround = false;
- m_need_srgb_workaround = false;
-+ m_need_srgb_visual_workaround = false;
-
- // Call to glGetIntegerv should not be made if --no-graphics is used
- if (!ProfileWorld::isNoGraphics())
-@@ -179,6 +180,16 @@ void CentralVideoSettings::init()
- // Bindless textures are all treated RGB even sRGB one
- m_need_srgb_workaround = true;
- }
-+
-+ // Check if visual is sRGB-capable
-+ if (GraphicsRestrictions::isDisabled(GraphicsRestrictions::GR_FRAMEBUFFER_SRGB_CAPABLE) &&
-+ m_glsl == true)
-+ {
-+ GLint param = GL_SRGB;
-+ glGetFramebufferAttachmentParameteriv(GL_DRAW_FRAMEBUFFER, GL_BACK_LEFT,
-+ GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING, ¶m);
-+ m_need_srgb_visual_workaround = (param != GL_SRGB);
-+ }
- }
- }
-
-@@ -207,6 +218,11 @@ bool CentralVideoSettings::needsRGBBindlessWorkaround() const
- return m_need_srgb_workaround;
- }
-
-+bool CentralVideoSettings::needsSRGBCapableVisualWorkaround() const
-+{
-+ return m_need_srgb_visual_workaround;
-+}
-+
- bool CentralVideoSettings::isARBGeometryShader4Usable() const
- {
- return hasGS;
-diff --git a/src/graphics/central_settings.hpp b/src/graphics/central_settings.hpp
-index dbde9c6..c9a5bbe 100644
---- a/src/graphics/central_settings.hpp
-+++ b/src/graphics/central_settings.hpp
-@@ -43,6 +43,7 @@ private:
-
- bool m_need_rh_workaround;
- bool m_need_srgb_workaround;
-+ bool m_need_srgb_visual_workaround;
- bool m_GI_has_artifact;
- public:
- void init();
-@@ -52,6 +53,7 @@ public:
- // Needs special handle ?
- bool needRHWorkaround() const;
- bool needsRGBBindlessWorkaround() const;
-+ bool needsSRGBCapableVisualWorkaround() const;
-
- // Extension is available and safe to use
- bool isARBUniformBufferObjectUsable() const;
-diff --git a/src/graphics/graphics_restrictions.cpp b/src/graphics/graphics_restrictions.cpp
-index 7d132ea..83c6ded 100644
---- a/src/graphics/graphics_restrictions.cpp
-+++ b/src/graphics/graphics_restrictions.cpp
-@@ -59,6 +59,7 @@ namespace GraphicsRestrictions
- "HighDefinitionTextures",
- "AdvancedPipeline",
- "FramebufferSRGBWorking",
-+ "FramebufferSRGBCapable",
- "GI",
- };
- } // namespace Private
-diff --git a/src/graphics/graphics_restrictions.hpp b/src/graphics/graphics_restrictions.hpp
-index ab44ce9..faf5151 100644
---- a/src/graphics/graphics_restrictions.hpp
-+++ b/src/graphics/graphics_restrictions.hpp
-@@ -53,6 +53,7 @@ namespace GraphicsRestrictions
- GR_HIGHDEFINITION_TEXTURES,
- GR_ADVANCED_PIPELINE,
- GR_FRAMEBUFFER_SRGB_WORKING,
-+ GR_FRAMEBUFFER_SRGB_CAPABLE,
- GR_GI,
- GR_COUNT /** MUST be last entry. */
- } ;
-diff --git a/src/graphics/irr_driver.cpp b/src/graphics/irr_driver.cpp
-index e736293..8bbb3c3 100644
---- a/src/graphics/irr_driver.cpp
-+++ b/src/graphics/irr_driver.cpp
-@@ -344,6 +344,8 @@ void IrrDriver::createListOfVideoModes()
- */
- void IrrDriver::initDevice()
- {
-+ SIrrlichtCreationParameters params;
-+
- // If --no-graphics option was used, the null device can still be used.
- if (!ProfileWorld::isNoGraphics())
- {
-@@ -426,7 +428,6 @@ void IrrDriver::initDevice()
- m_device->drop();
- m_device = NULL;
-
-- SIrrlichtCreationParameters params;
- params.ForceLegacyDevice = (UserConfigParams::m_force_legacy_device ||
- UserConfigParams::m_gamepad_visualisation);
-
-@@ -505,6 +506,30 @@ void IrrDriver::initDevice()
- {
- Log::fatal("irr_driver", "Couldn't initialise irrlicht device. Quitting.\n");
- }
-+
-+ CVS->init();
-+
-+ // This is the ugly hack for intel driver on linux, which doesn't
-+ // use sRGB-capable visual, even if we request it. This causes
-+ // the screen to be darker than expected. It affects mesa 10.6 and newer.
-+ // Though we are able to force to use the proper format on mesa side by
-+ // setting WithAlphaChannel parameter.
-+ if (!ProfileWorld::isNoGraphics() && CVS->needsSRGBCapableVisualWorkaround())
-+ {
-+ Log::warn("irr_driver", "Created visual is not sRGB-capable. "
-+ "Re-creating device to workaround the issue.");
-+ m_device->closeDevice();
-+ m_device->drop();
-+
-+ params.WithAlphaChannel = true;
-+
-+ m_device = createDeviceEx(params);
-+
-+ if(!m_device)
-+ {
-+ Log::fatal("irr_driver", "Couldn't initialise irrlicht device. Quitting.\n");
-+ }
-+ }
-
- m_scene_manager = m_device->getSceneManager();
- m_gui_env = m_device->getGUIEnvironment();
-@@ -513,8 +538,6 @@ void IrrDriver::initDevice()
-
- m_actual_screen_size = m_video_driver->getCurrentRenderTargetSize();
-
-- CVS->init();
--
- m_spherical_harmonics = new SphericalHarmonics(m_scene_manager->getAmbientLight().toSColor());
-
- if (UserConfigParams::m_shadows_resolution != 0 &&
More information about the Pkg-games-commits
mailing list