[libsfml] 02/06: Merge tag 'upstream/2.4.2+dfsg'
James Cowgill
jcowgill at moszumanska.debian.org
Fri Feb 10 23:56:17 UTC 2017
This is an automated email from the git hooks/post-receive script.
jcowgill pushed a commit to branch master
in repository libsfml.
commit a9af6aec6689a8329515251af0279f8e5d75af47
Merge: c549501 31394fc
Author: James Cowgill <james410 at cowgill.org.uk>
Date: Fri Feb 10 23:18:52 2017 +0000
Merge tag 'upstream/2.4.2+dfsg'
Upstream version 2.4.2+dfsg
# gpg: Signature made Fri 10 Feb 2017 23:18:47 GMT
# gpg: using RSA key F88C6DE43699E8F3B3B54C10C7F1676DEA2D01EF
# gpg: issuer "james410 at cowgill.org.uk"
# gpg: Good signature from "James Cowgill <james410 at cowgill.org.uk>" [ultimate]
# gpg: aka "James Cowgill (Imagination Technologies) <James.Cowgill at imgtec.com>" [ultimate]
# gpg: aka "James Cowgill <jcowgill at debian.org>" [ultimate]
CMakeLists.txt | 2 +-
changelog.txt | 35 +++-
examples/cocoa/CocoaAppDelegate.h | 2 +-
examples/cocoa/CocoaAppDelegate.mm | 2 +-
examples/cocoa/NSString+stdstring.h | 2 +-
examples/cocoa/NSString+stdstring.mm | 2 +-
examples/cocoa/main.m | 2 +-
examples/cocoa/resources/Cocoa-Info.plist | 2 +-
include/SFML/Audio.hpp | 2 +-
include/SFML/Audio/AlResource.hpp | 2 +-
include/SFML/Audio/Export.hpp | 2 +-
include/SFML/Audio/InputSoundFile.hpp | 2 +-
include/SFML/Audio/Listener.hpp | 2 +-
include/SFML/Audio/Music.hpp | 2 +-
include/SFML/Audio/OutputSoundFile.hpp | 2 +-
include/SFML/Audio/Sound.hpp | 2 +-
include/SFML/Audio/SoundBuffer.hpp | 2 +-
include/SFML/Audio/SoundBufferRecorder.hpp | 2 +-
include/SFML/Audio/SoundFileFactory.hpp | 2 +-
include/SFML/Audio/SoundFileFactory.inl | 2 +-
include/SFML/Audio/SoundFileReader.hpp | 2 +-
include/SFML/Audio/SoundFileWriter.hpp | 2 +-
include/SFML/Audio/SoundRecorder.hpp | 2 +-
include/SFML/Audio/SoundSource.hpp | 2 +-
include/SFML/Audio/SoundStream.hpp | 2 +-
include/SFML/Config.hpp | 4 +-
include/SFML/Graphics.hpp | 2 +-
include/SFML/Graphics/BlendMode.hpp | 2 +-
include/SFML/Graphics/CircleShape.hpp | 2 +-
include/SFML/Graphics/Color.hpp | 2 +-
include/SFML/Graphics/ConvexShape.hpp | 2 +-
include/SFML/Graphics/Drawable.hpp | 2 +-
include/SFML/Graphics/Export.hpp | 2 +-
include/SFML/Graphics/Font.hpp | 2 +-
include/SFML/Graphics/Glsl.hpp | 2 +-
include/SFML/Graphics/Glsl.inl | 2 +-
include/SFML/Graphics/Glyph.hpp | 2 +-
include/SFML/Graphics/Image.hpp | 2 +-
include/SFML/Graphics/PrimitiveType.hpp | 2 +-
include/SFML/Graphics/Rect.hpp | 2 +-
include/SFML/Graphics/Rect.inl | 2 +-
include/SFML/Graphics/RectangleShape.hpp | 2 +-
include/SFML/Graphics/RenderStates.hpp | 2 +-
include/SFML/Graphics/RenderTarget.hpp | 2 +-
include/SFML/Graphics/RenderTexture.hpp | 2 +-
include/SFML/Graphics/RenderWindow.hpp | 2 +-
include/SFML/Graphics/Shader.hpp | 2 +-
include/SFML/Graphics/Shape.hpp | 2 +-
include/SFML/Graphics/Sprite.hpp | 2 +-
include/SFML/Graphics/Text.hpp | 2 +-
include/SFML/Graphics/Texture.hpp | 2 +-
include/SFML/Graphics/Transform.hpp | 2 +-
include/SFML/Graphics/Transformable.hpp | 2 +-
include/SFML/Graphics/Vertex.hpp | 2 +-
include/SFML/Graphics/VertexArray.hpp | 2 +-
include/SFML/Graphics/View.hpp | 2 +-
include/SFML/Main.hpp | 2 +-
include/SFML/Network.hpp | 2 +-
include/SFML/Network/Export.hpp | 2 +-
include/SFML/Network/Ftp.hpp | 2 +-
include/SFML/Network/Http.hpp | 2 +-
include/SFML/Network/IpAddress.hpp | 2 +-
include/SFML/Network/Packet.hpp | 2 +-
include/SFML/Network/Socket.hpp | 2 +-
include/SFML/Network/SocketHandle.hpp | 2 +-
include/SFML/Network/SocketSelector.hpp | 2 +-
include/SFML/Network/TcpListener.hpp | 2 +-
include/SFML/Network/TcpSocket.hpp | 2 +-
include/SFML/Network/UdpSocket.hpp | 2 +-
include/SFML/OpenGL.hpp | 2 +-
include/SFML/System.hpp | 2 +-
include/SFML/System/Clock.hpp | 2 +-
include/SFML/System/Err.hpp | 2 +-
include/SFML/System/Export.hpp | 2 +-
include/SFML/System/FileInputStream.hpp | 2 +-
include/SFML/System/InputStream.hpp | 2 +-
include/SFML/System/Lock.hpp | 2 +-
include/SFML/System/MemoryInputStream.hpp | 2 +-
include/SFML/System/Mutex.hpp | 2 +-
include/SFML/System/NativeActivity.hpp | 2 +-
include/SFML/System/NonCopyable.hpp | 2 +-
include/SFML/System/Sleep.hpp | 2 +-
include/SFML/System/String.hpp | 2 +-
include/SFML/System/String.inl | 2 +-
include/SFML/System/Thread.hpp | 2 +-
include/SFML/System/Thread.inl | 2 +-
include/SFML/System/ThreadLocal.hpp | 2 +-
include/SFML/System/ThreadLocalPtr.hpp | 2 +-
include/SFML/System/ThreadLocalPtr.inl | 2 +-
include/SFML/System/Time.hpp | 2 +-
include/SFML/System/Utf.hpp | 2 +-
include/SFML/System/Utf.inl | 2 +-
include/SFML/System/Vector2.hpp | 2 +-
include/SFML/System/Vector2.inl | 2 +-
include/SFML/System/Vector3.hpp | 2 +-
include/SFML/System/Vector3.inl | 2 +-
include/SFML/Window.hpp | 2 +-
include/SFML/Window/Context.hpp | 2 +-
include/SFML/Window/ContextSettings.hpp | 2 +-
include/SFML/Window/Event.hpp | 2 +-
include/SFML/Window/Export.hpp | 2 +-
include/SFML/Window/GlResource.hpp | 2 +-
include/SFML/Window/Joystick.hpp | 2 +-
include/SFML/Window/Keyboard.hpp | 2 +-
include/SFML/Window/Mouse.hpp | 2 +-
include/SFML/Window/Sensor.hpp | 2 +-
include/SFML/Window/Touch.hpp | 2 +-
include/SFML/Window/VideoMode.hpp | 2 +-
include/SFML/Window/Window.hpp | 2 +-
include/SFML/Window/WindowHandle.hpp | 2 +-
include/SFML/Window/WindowStyle.hpp | 2 +-
license.txt | 2 +-
src/SFML/Audio/ALCheck.cpp | 2 +-
src/SFML/Audio/ALCheck.hpp | 2 +-
src/SFML/Audio/AlResource.cpp | 2 +-
src/SFML/Audio/AudioDevice.cpp | 2 +-
src/SFML/Audio/AudioDevice.hpp | 2 +-
src/SFML/Audio/InputSoundFile.cpp | 2 +-
src/SFML/Audio/Listener.cpp | 2 +-
src/SFML/Audio/Music.cpp | 2 +-
src/SFML/Audio/OutputSoundFile.cpp | 2 +-
src/SFML/Audio/Sound.cpp | 2 +-
src/SFML/Audio/SoundBuffer.cpp | 2 +-
src/SFML/Audio/SoundBufferRecorder.cpp | 2 +-
src/SFML/Audio/SoundFileFactory.cpp | 2 +-
src/SFML/Audio/SoundFileReaderFlac.cpp | 2 +-
src/SFML/Audio/SoundFileReaderFlac.hpp | 2 +-
src/SFML/Audio/SoundFileReaderOgg.cpp | 2 +-
src/SFML/Audio/SoundFileReaderOgg.hpp | 2 +-
src/SFML/Audio/SoundFileReaderWav.cpp | 2 +-
src/SFML/Audio/SoundFileReaderWav.hpp | 2 +-
src/SFML/Audio/SoundFileWriterFlac.cpp | 2 +-
src/SFML/Audio/SoundFileWriterFlac.hpp | 2 +-
src/SFML/Audio/SoundFileWriterOgg.cpp | 2 +-
src/SFML/Audio/SoundFileWriterOgg.hpp | 2 +-
src/SFML/Audio/SoundFileWriterWav.cpp | 2 +-
src/SFML/Audio/SoundFileWriterWav.hpp | 2 +-
src/SFML/Audio/SoundRecorder.cpp | 2 +-
src/SFML/Audio/SoundSource.cpp | 2 +-
src/SFML/Audio/SoundStream.cpp | 2 +-
src/SFML/Graphics/BlendMode.cpp | 2 +-
src/SFML/Graphics/CircleShape.cpp | 2 +-
src/SFML/Graphics/Color.cpp | 2 +-
src/SFML/Graphics/ConvexShape.cpp | 2 +-
src/SFML/Graphics/Font.cpp | 2 +-
src/SFML/Graphics/GLCheck.cpp | 2 +-
src/SFML/Graphics/GLCheck.hpp | 2 +-
src/SFML/Graphics/GLExtensions.cpp | 2 +-
src/SFML/Graphics/GLExtensions.hpp | 2 +-
src/SFML/Graphics/GLLoader.cpp | 2 +-
src/SFML/Graphics/GLLoader.hpp | 2 +-
src/SFML/Graphics/Glsl.cpp | 2 +-
src/SFML/Graphics/Image.cpp | 46 ++---
src/SFML/Graphics/ImageLoader.cpp | 2 +-
src/SFML/Graphics/ImageLoader.hpp | 2 +-
src/SFML/Graphics/RectangleShape.cpp | 2 +-
src/SFML/Graphics/RenderStates.cpp | 2 +-
src/SFML/Graphics/RenderTarget.cpp | 2 +-
src/SFML/Graphics/RenderTexture.cpp | 2 +-
src/SFML/Graphics/RenderTextureImpl.cpp | 2 +-
src/SFML/Graphics/RenderTextureImpl.hpp | 2 +-
src/SFML/Graphics/RenderTextureImplDefault.cpp | 2 +-
src/SFML/Graphics/RenderTextureImplDefault.hpp | 2 +-
src/SFML/Graphics/RenderTextureImplFBO.cpp | 2 +-
src/SFML/Graphics/RenderTextureImplFBO.hpp | 2 +-
src/SFML/Graphics/RenderWindow.cpp | 2 +-
src/SFML/Graphics/Shader.cpp | 2 +-
src/SFML/Graphics/Shape.cpp | 2 +-
src/SFML/Graphics/Sprite.cpp | 2 +-
src/SFML/Graphics/Text.cpp | 2 +-
src/SFML/Graphics/Texture.cpp | 2 +-
src/SFML/Graphics/TextureSaver.cpp | 2 +-
src/SFML/Graphics/TextureSaver.hpp | 2 +-
src/SFML/Graphics/Transform.cpp | 2 +-
src/SFML/Graphics/Transformable.cpp | 2 +-
src/SFML/Graphics/Vertex.cpp | 2 +-
src/SFML/Graphics/VertexArray.cpp | 2 +-
src/SFML/Graphics/View.cpp | 2 +-
src/SFML/Main/MainAndroid.cpp | 2 +-
src/SFML/Main/MainWin32.cpp | 2 +-
src/SFML/Main/MainiOS.mm | 2 +-
src/SFML/Network/Ftp.cpp | 2 +-
src/SFML/Network/Http.cpp | 2 +-
src/SFML/Network/IpAddress.cpp | 2 +-
src/SFML/Network/Packet.cpp | 2 +-
src/SFML/Network/Socket.cpp | 2 +-
src/SFML/Network/SocketImpl.hpp | 2 +-
src/SFML/Network/SocketSelector.cpp | 2 +-
src/SFML/Network/TcpListener.cpp | 2 +-
src/SFML/Network/TcpSocket.cpp | 2 +-
src/SFML/Network/UdpSocket.cpp | 2 +-
src/SFML/Network/Unix/SocketImpl.cpp | 2 +-
src/SFML/Network/Unix/SocketImpl.hpp | 2 +-
src/SFML/Network/Win32/SocketImpl.cpp | 2 +-
src/SFML/Network/Win32/SocketImpl.hpp | 2 +-
src/SFML/System/Android/Activity.cpp | 2 +-
src/SFML/System/Android/NativeActivity.cpp | 2 +-
src/SFML/System/Clock.cpp | 2 +-
src/SFML/System/Err.cpp | 2 +-
src/SFML/System/FileInputStream.cpp | 2 +-
src/SFML/System/Lock.cpp | 2 +-
src/SFML/System/MemoryInputStream.cpp | 2 +-
src/SFML/System/Mutex.cpp | 2 +-
src/SFML/System/Sleep.cpp | 2 +-
src/SFML/System/String.cpp | 2 +-
src/SFML/System/Thread.cpp | 2 +-
src/SFML/System/ThreadLocal.cpp | 2 +-
src/SFML/System/Time.cpp | 2 +-
src/SFML/System/Unix/ClockImpl.cpp | 2 +-
src/SFML/System/Unix/ClockImpl.hpp | 2 +-
src/SFML/System/Unix/MutexImpl.cpp | 2 +-
src/SFML/System/Unix/MutexImpl.hpp | 2 +-
src/SFML/System/Unix/SleepImpl.cpp | 2 +-
src/SFML/System/Unix/SleepImpl.hpp | 2 +-
src/SFML/System/Unix/ThreadImpl.cpp | 2 +-
src/SFML/System/Unix/ThreadImpl.hpp | 2 +-
src/SFML/System/Unix/ThreadLocalImpl.cpp | 2 +-
src/SFML/System/Unix/ThreadLocalImpl.hpp | 2 +-
src/SFML/System/Win32/ClockImpl.cpp | 37 ++--
src/SFML/System/Win32/ClockImpl.hpp | 2 +-
src/SFML/System/Win32/MutexImpl.cpp | 2 +-
src/SFML/System/Win32/MutexImpl.hpp | 2 +-
src/SFML/System/Win32/SleepImpl.cpp | 2 +-
src/SFML/System/Win32/SleepImpl.hpp | 2 +-
src/SFML/System/Win32/ThreadImpl.cpp | 2 +-
src/SFML/System/Win32/ThreadImpl.hpp | 2 +-
src/SFML/System/Win32/ThreadLocalImpl.cpp | 2 +-
src/SFML/System/Win32/ThreadLocalImpl.hpp | 2 +-
src/SFML/Window/Android/SensorImpl.cpp | 2 +-
src/SFML/Window/Android/SensorImpl.hpp | 2 +-
src/SFML/Window/Context.cpp | 2 +-
src/SFML/Window/FreeBSD/JoystickImpl.cpp | 2 +-
src/SFML/Window/FreeBSD/JoystickImpl.hpp | 2 +-
src/SFML/Window/GlContext.cpp | 208 ++++++++++++++++-------
src/SFML/Window/GlContext.hpp | 27 ++-
src/SFML/Window/GlResource.cpp | 50 +-----
src/SFML/Window/InputImpl.hpp | 2 +-
src/SFML/Window/Joystick.cpp | 2 +-
src/SFML/Window/JoystickImpl.hpp | 2 +-
src/SFML/Window/JoystickManager.cpp | 2 +-
src/SFML/Window/JoystickManager.hpp | 2 +-
src/SFML/Window/Keyboard.cpp | 2 +-
src/SFML/Window/Mouse.cpp | 2 +-
src/SFML/Window/OSX/AutoreleasePoolWrapper.h | 2 +-
src/SFML/Window/OSX/AutoreleasePoolWrapper.mm | 2 +-
src/SFML/Window/OSX/HIDInputManager.hpp | 2 +-
src/SFML/Window/OSX/HIDInputManager.mm | 2 +-
src/SFML/Window/OSX/HIDJoystickManager.cpp | 2 +-
src/SFML/Window/OSX/HIDJoystickManager.hpp | 2 +-
src/SFML/Window/OSX/InputImpl.hpp | 2 +-
src/SFML/Window/OSX/InputImpl.mm | 2 +-
src/SFML/Window/OSX/JoystickImpl.cpp | 2 +-
src/SFML/Window/OSX/JoystickImpl.hpp | 2 +-
src/SFML/Window/OSX/NSImage+raw.h | 2 +-
src/SFML/Window/OSX/NSImage+raw.mm | 2 +-
src/SFML/Window/OSX/SFApplication.h | 2 +-
src/SFML/Window/OSX/SFApplication.m | 2 +-
src/SFML/Window/OSX/SFApplicationDelegate.h | 2 +-
src/SFML/Window/OSX/SFApplicationDelegate.m | 2 +-
src/SFML/Window/OSX/SFContext.hpp | 2 +-
src/SFML/Window/OSX/SFContext.mm | 2 +-
src/SFML/Window/OSX/SFKeyboardModifiersHelper.h | 2 +-
src/SFML/Window/OSX/SFKeyboardModifiersHelper.mm | 2 +-
src/SFML/Window/OSX/SFOpenGLView+keyboard.mm | 2 +-
src/SFML/Window/OSX/SFOpenGLView+keyboard_priv.h | 2 +-
src/SFML/Window/OSX/SFOpenGLView+mouse.mm | 2 +-
src/SFML/Window/OSX/SFOpenGLView+mouse_priv.h | 2 +-
src/SFML/Window/OSX/SFOpenGLView.h | 2 +-
src/SFML/Window/OSX/SFOpenGLView.mm | 2 +-
src/SFML/Window/OSX/SFSilentResponder.h | 2 +-
src/SFML/Window/OSX/SFSilentResponder.m | 2 +-
src/SFML/Window/OSX/SFViewController.h | 2 +-
src/SFML/Window/OSX/SFViewController.mm | 2 +-
src/SFML/Window/OSX/SFWindow.h | 2 +-
src/SFML/Window/OSX/SFWindow.m | 2 +-
src/SFML/Window/OSX/SFWindowController.h | 2 +-
src/SFML/Window/OSX/SFWindowController.mm | 2 +-
src/SFML/Window/OSX/Scaling.h | 2 +-
src/SFML/Window/OSX/SensorImpl.cpp | 2 +-
src/SFML/Window/OSX/SensorImpl.hpp | 2 +-
src/SFML/Window/OSX/VideoModeImpl.cpp | 2 +-
src/SFML/Window/OSX/WindowImplCocoa.hpp | 2 +-
src/SFML/Window/OSX/WindowImplCocoa.mm | 2 +-
src/SFML/Window/OSX/WindowImplDelegateProtocol.h | 2 +-
src/SFML/Window/OSX/cg_sf_conversion.hpp | 2 +-
src/SFML/Window/OSX/cg_sf_conversion.mm | 2 +-
src/SFML/Window/OSX/cpp_objc_conversion.h | 2 +-
src/SFML/Window/OSX/cpp_objc_conversion.mm | 2 +-
src/SFML/Window/Sensor.cpp | 2 +-
src/SFML/Window/SensorImpl.hpp | 2 +-
src/SFML/Window/SensorManager.cpp | 2 +-
src/SFML/Window/SensorManager.hpp | 2 +-
src/SFML/Window/Touch.cpp | 2 +-
src/SFML/Window/Unix/Display.cpp | 2 +-
src/SFML/Window/Unix/Display.hpp | 2 +-
src/SFML/Window/Unix/GlxContext.cpp | 39 +++--
src/SFML/Window/Unix/GlxContext.hpp | 2 +-
src/SFML/Window/Unix/GlxExtensions.cpp | 2 +-
src/SFML/Window/Unix/GlxExtensions.hpp | 2 +-
src/SFML/Window/Unix/InputImpl.cpp | 2 +-
src/SFML/Window/Unix/InputImpl.hpp | 2 +-
src/SFML/Window/Unix/JoystickImpl.cpp | 2 +-
src/SFML/Window/Unix/JoystickImpl.hpp | 2 +-
src/SFML/Window/Unix/SensorImpl.cpp | 2 +-
src/SFML/Window/Unix/SensorImpl.hpp | 2 +-
src/SFML/Window/Unix/VideoModeImpl.cpp | 2 +-
src/SFML/Window/Unix/WindowImplX11.cpp | 32 ++--
src/SFML/Window/Unix/WindowImplX11.hpp | 2 +-
src/SFML/Window/VideoMode.cpp | 2 +-
src/SFML/Window/VideoModeImpl.hpp | 2 +-
src/SFML/Window/Win32/InputImpl.cpp | 2 +-
src/SFML/Window/Win32/InputImpl.hpp | 2 +-
src/SFML/Window/Win32/JoystickImpl.cpp | 2 +-
src/SFML/Window/Win32/JoystickImpl.hpp | 2 +-
src/SFML/Window/Win32/SensorImpl.cpp | 2 +-
src/SFML/Window/Win32/SensorImpl.hpp | 2 +-
src/SFML/Window/Win32/VideoModeImpl.cpp | 2 +-
src/SFML/Window/Win32/WglContext.cpp | 100 ++++++++---
src/SFML/Window/Win32/WglContext.hpp | 2 +-
src/SFML/Window/Win32/WglExtensions.cpp | 2 +-
src/SFML/Window/Win32/WglExtensions.hpp | 4 +-
src/SFML/Window/Win32/WindowImplWin32.cpp | 2 +-
src/SFML/Window/Win32/WindowImplWin32.hpp | 2 +-
src/SFML/Window/Window.cpp | 2 +-
src/SFML/Window/WindowImpl.cpp | 2 +-
src/SFML/Window/WindowImpl.hpp | 2 +-
src/SFML/Window/iOS/EaglContext.hpp | 2 +-
src/SFML/Window/iOS/EaglContext.mm | 2 +-
src/SFML/Window/iOS/InputImpl.hpp | 2 +-
src/SFML/Window/iOS/InputImpl.mm | 2 +-
src/SFML/Window/iOS/JoystickImpl.hpp | 2 +-
src/SFML/Window/iOS/JoystickImpl.mm | 2 +-
src/SFML/Window/iOS/ObjCType.hpp | 2 +-
src/SFML/Window/iOS/SFAppDelegate.hpp | 2 +-
src/SFML/Window/iOS/SFAppDelegate.mm | 2 +-
src/SFML/Window/iOS/SFMain.hpp | 2 +-
src/SFML/Window/iOS/SFMain.mm | 2 +-
src/SFML/Window/iOS/SFView.hpp | 2 +-
src/SFML/Window/iOS/SFView.mm | 2 +-
src/SFML/Window/iOS/SFViewController.hpp | 2 +-
src/SFML/Window/iOS/SFViewController.mm | 2 +-
src/SFML/Window/iOS/SensorImpl.hpp | 2 +-
src/SFML/Window/iOS/SensorImpl.mm | 2 +-
src/SFML/Window/iOS/VideoModeImpl.mm | 2 +-
src/SFML/Window/iOS/WindowImplUIKit.hpp | 2 +-
src/SFML/Window/iOS/WindowImplUIKit.mm | 2 +-
346 files changed, 701 insertions(+), 551 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/libsfml.git
More information about the Pkg-games-commits
mailing list